LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,584 Commits 2 Branches 0 Tags
c0a6724976fccfed8990cdef4682143e358ca8e2
Commit Graph

21584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yin-Chia Yeh
c0a6724976 Merge "Camera: update NDK LSC header" am: 6d59728432 am: bc15a9e321 am: d7aeef17c7 
am: 172c188a6d

Change-Id: Id4e27f5a6dfba9a0fb80c7b8922bb6c2bc8a03ea
 2016-11-30 20:21:24 +00:00
Nasir Khan
fb9c333290 Merge "Update the Notepad sample app to: 1. Show that any application state should be saved in onStop() versus onPause(). 2. Remove the deprecated methods and start using CursorLoader instead of any managedQuery. 3. Remove deprecated LiveFolders usage. am: 3468e63e12 am: ed5495cdee am: 3c4b761ea9" into nyc-mr2-dev-plus-aosp 
am: 1fe92b554a

Change-Id: I640071428b9f82d3dbb8d402c7069e763c271085
 2016-11-30 20:16:36 +00:00
Nasir Khan
1d8e2c2c61 Update the Notepad sample app to: 1. Show that any application state should be saved in onStop() versus onPause(). 2. Remove the deprecated methods and start using CursorLoader instead of any managedQuery. 3. Remove deprecated LiveFolders usage. am: 3468e63e12 am: ed5495cdee am: 3c4b761ea9 
am: 5646fdbca5

Change-Id: Ifb56384cf798fc8ba0752adb19a48b86865983ec
 2016-11-30 20:16:34 +00:00
Yin-Chia Yeh
172c188a6d Merge "Camera: update NDK LSC header" am: 6d59728432 am: bc15a9e321 
am: d7aeef17c7

Change-Id: I5eddc2d7dea33f67fc1543665476646f9850c661
 2016-11-30 20:16:23 +00:00
Nasir Khan
3a746f6b2f Update the Notepad sample app to: 1. Show that any application state should be saved in onStop() versus onPause(). 2. Remove the deprecated methods and start using CursorLoader instead of any managedQuery. 3. Remove deprecated LiveFolders usage. am: 3468e63e12 am: ed5495cdee am: 8dc5ea8f13 
am: 2d693fd83b

Change-Id: I4fbbf382ff165eab2bbf9bef2c1678841eda01dc
 2016-11-30 20:16:21 +00:00
Android Build Merger (Role)
1fe92b554a Merge "Update the Notepad sample app to: 1. Show that any application state should be saved in onStop() versus onPause(). 2. Remove the deprecated methods and start using CursorLoader instead of any managedQuery. 3. Remove deprecated LiveFolders usage. am: 3468e63e12 am: ed5495cdee am: 3c4b761ea9" into nyc-mr2-dev-plus-aosp 2016-11-30 20:11:01 +00:00
Nasir Khan
5646fdbca5 Update the Notepad sample app to: 1. Show that any application state should be saved in onStop() versus onPause(). 2. Remove the deprecated methods and start using CursorLoader instead of any managedQuery. 3. Remove deprecated LiveFolders usage. am: 3468e63e12 am: ed5495cdee 
am: 3c4b761ea9

Change-Id: Ibd3e89aff7c57cfea31b0b8c2771601261b8c265
 2016-11-30 20:10:53 +00:00
Yin-Chia Yeh
d7aeef17c7 Merge "Camera: update NDK LSC header" am: 6d59728432 
am: bc15a9e321

Change-Id: I046afc32456c3cc4196aa2ff8bd19217b8a7be71
 2016-11-30 20:10:53 +00:00
Nasir Khan
2d693fd83b Update the Notepad sample app to: 1. Show that any application state should be saved in onStop() versus onPause(). 2. Remove the deprecated methods and start using CursorLoader instead of any managedQuery. 3. Remove deprecated LiveFolders usage. am: 3468e63e12 am: ed5495cdee 
am: 8dc5ea8f13

Change-Id: If51896cfc07aa9254dfaa76750756c06311eaae1
 2016-11-30 20:10:50 +00:00
Yin-Chia Yeh
bc15a9e321 Merge "Camera: update NDK LSC header" 
am: 6d59728432

Change-Id: I2a343edb2c23f9008ecc2fea18f3b229afd6df6a
 2016-11-30 20:05:24 +00:00
Nasir Khan
3c4b761ea9 Update the Notepad sample app to: 1. Show that any application state should be saved in onStop() versus onPause(). 2. Remove the deprecated methods and start using CursorLoader instead of any managedQuery. 3. Remove deprecated LiveFolders usage. am: 3468e63e12 
am: ed5495cdee

Change-Id: I9bc9b4b5a03abfcdba5011ec89dba4d235208070
 2016-11-30 20:05:21 +00:00
Nasir Khan
8dc5ea8f13 Update the Notepad sample app to: 1. Show that any application state should be saved in onStop() versus onPause(). 2. Remove the deprecated methods and start using CursorLoader instead of any managedQuery. 3. Remove deprecated LiveFolders usage. am: 3468e63e12 
am: ed5495cdee

Change-Id: Id3794178b8ded31df2cbb167c14224218a3b231f
 2016-11-30 20:05:21 +00:00
Nasir Khan
ed5495cdee Update the Notepad sample app to: 1. Show that any application state should be saved in onStop() versus onPause(). 2. Remove the deprecated methods and start using CursorLoader instead of any managedQuery. 3. Remove deprecated LiveFolders usage. 
am: 3468e63e12

Change-Id: If24749c61a5f30d47e730047a5c620fd9a7babdf
 2016-11-30 20:00:20 +00:00
Yin-Chia Yeh
6d59728432 Merge "Camera: update NDK LSC header" 2016-11-30 19:56:05 +00:00
Paul Duffin
750e4745a2 Merge "Use junit-host instead of junit" am: 06c7276db4 am: 189889b554 am: 445c41ff48 
am: 5f261085df

Change-Id: Ie9d535b17b8f395b886db9f48b156ccfd23300a9
 2016-11-29 11:37:36 +00:00
Paul Duffin
5f261085df Merge "Use junit-host instead of junit" am: 06c7276db4 am: 189889b554 
am: 445c41ff48

Change-Id: Ifaa9e7e5bc7ac1dc8cfe4d488670ee1b4dabe1de
 2016-11-29 11:32:35 +00:00
Paul Duffin
445c41ff48 Merge "Use junit-host instead of junit" am: 06c7276db4 
am: 189889b554

Change-Id: I349a99a8499a28a28a79846f53d1562ea72cf59a
 2016-11-29 11:27:37 +00:00
Paul Duffin
189889b554 Merge "Use junit-host instead of junit" 
am: 06c7276db4

Change-Id: Ie24435c4ee41174c00f5af3127d81779f47b8b5d
 2016-11-29 11:22:36 +00:00
Paul Duffin
06c7276db4 Merge "Use junit-host instead of junit" 2016-11-29 11:12:11 +00:00
Paul Duffin
f171d02a9b Use junit-host instead of junit 
Bug: 30188076
Test: make checkbuild
Change-Id: I81cbfc9d380576442d8877b61a25c4dc5ac62205
 2016-11-29 11:04:58 +00:00
Nasir Khan
3468e63e12 Update the Notepad sample app to: 
1. Show that any application state should be saved in onStop() versus
   onPause().
2. Remove the deprecated methods and start using CursorLoader instead
   of any managedQuery.
3. Remove deprecated LiveFolders usage.

Change-Id: I65be6b91ee1d4d0980494fb8455ce0906691dc21
 2016-11-28 15:03:26 -08:00
Andreas Gampe
c314a2fca5 Merge "SDK: Add missing tool dependencies" am: d405a14f22 am: 4e84f39c1d am: c68e6f0997 
am: 7ad7f11c67

Change-Id: If884eefb53dda56f9d0135993cea8dfbed6a592b
 2016-11-28 20:07:52 +00:00
Andreas Gampe
7ad7f11c67 Merge "SDK: Add missing tool dependencies" am: d405a14f22 am: 4e84f39c1d 
am: c68e6f0997

Change-Id: I558cc523ddf98906dc549642c6d71ed077f5abb1
 2016-11-28 20:03:22 +00:00
Andreas Gampe
c68e6f0997 Merge "SDK: Add missing tool dependencies" am: d405a14f22 
am: 4e84f39c1d

Change-Id: I572a85205bd39390aa5843e7c03b41244d0f1242
 2016-11-28 19:59:22 +00:00
Andreas Gampe
4e84f39c1d Merge "SDK: Add missing tool dependencies" 
am: d405a14f22

Change-Id: Icf62bb83b2d666a636364b0131170e158df4b864
 2016-11-28 19:54:22 +00:00
Treehugger Robot
d405a14f22 Merge "SDK: Add missing tool dependencies" 2016-11-28 19:48:09 +00:00
Aurimas Liutikas
68ddad34c1 Merge "Loosen up the checks for test class paths in Checkstyle." am: 2c1ef76cc6 am: 46d5e59b93 am: 8d7d47941d 
am: c2973bde08

Change-Id: Icf1b8527075cab901f65451123ebfd2893935c76
 2016-11-22 23:10:57 +00:00
Aurimas Liutikas
c2973bde08 Merge "Loosen up the checks for test class paths in Checkstyle." am: 2c1ef76cc6 am: 46d5e59b93 
am: 8d7d47941d

Change-Id: Ia5f9719eaf8266c6701c78f4b4f3145d0a0cf7df
 2016-11-22 23:07:40 +00:00
Aurimas Liutikas
8d7d47941d Merge "Loosen up the checks for test class paths in Checkstyle." am: 2c1ef76cc6 
am: 46d5e59b93

Change-Id: I8dd9c92571c9ad919874049d1fd1e37cefe7d955
 2016-11-22 23:04:39 +00:00
Aurimas Liutikas
46d5e59b93 Merge "Loosen up the checks for test class paths in Checkstyle." 
am: 2c1ef76cc6

Change-Id: Ifdd5747410d850e0598ed24c71a00dfffe89c572
 2016-11-22 23:02:39 +00:00
Aurimas Liutikas
2c1ef76cc6 Merge "Loosen up the checks for test class paths in Checkstyle." 2016-11-22 22:57:42 +00:00
Aurimas Liutikas
1253b5accf Loosen up the checks for test class paths in Checkstyle. 
This change allows us to skip javadoc checks for such test directories:
- cts/tests/tests/
- /test/src/

Test: none
Change-Id: I6a3bedaed816a3e764ca7e66ee364cd30e16c55b
 2016-11-22 14:51:02 -08:00
TreeHugger Robot
3d87989183 Merge "Add tooltip demo to ApiDemos" 2016-11-22 22:15:47 +00:00
Nagesh Susarla
670f1d1dde Merge "Add api-versions.xml back to sdk" 2016-11-21 23:01:27 +00:00
Aurimas Liutikas
17ddda9485 Merge "Reland allowing MockitoAnnotations.* as static import." am: 7a00bf40dc am: 6db2a96c03 am: 778e216faf 
am: 9ca82ecf26

Change-Id: Iaff2b3ce58f5be430154778827b5f83fc5ef2f71
 2016-11-21 18:08:35 +00:00
Aurimas Liutikas
9ca82ecf26 Merge "Reland allowing MockitoAnnotations.* as static import." am: 7a00bf40dc am: 6db2a96c03 
am: 778e216faf

Change-Id: Idf045c0e234d14a3ba402bd10e0542fcb94ab90d
 2016-11-21 18:03:36 +00:00
Aurimas Liutikas
778e216faf Merge "Reland allowing MockitoAnnotations.* as static import." am: 7a00bf40dc 
am: 6db2a96c03

Change-Id: I23c40d509dd884003da989d572b8c6df928ba559
 2016-11-21 17:59:04 +00:00
Aurimas Liutikas
6db2a96c03 Merge "Reland allowing MockitoAnnotations.* as static import." 
am: 7a00bf40dc

Change-Id: I7596362feebd22a724449bd98ccc34f3dbfaf629
 2016-11-21 17:53:34 +00:00
Aurimas Liutikas
7a00bf40dc Merge "Reland allowing MockitoAnnotations.* as static import." 2016-11-21 17:47:28 +00:00
Bill Yi
3267d8bf9b Import translations. DO NOT MERGE am: 76179cb428 -s ours am: fb31ee8fef -s ours 
am: 991b6df550  -s ours

Change-Id: I9326e5b80fb17827209513e9485bbfee5e6a07b7
 2016-11-21 01:31:34 +00:00
Bill Yi
991b6df550 Import translations. DO NOT MERGE am: 76179cb428 -s ours 
am: fb31ee8fef  -s ours

Change-Id: Ic649b7788ba28af246d1344eb8a067f715822f52
 2016-11-21 01:26:33 +00:00
Bill Yi
fb31ee8fef Import translations. DO NOT MERGE 
am: 76179cb428  -s ours

Change-Id: I39af293d2b7d254f4884b392e25d8c1ad74ec493
 2016-11-21 01:21:33 +00:00
Bill Yi
76179cb428 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 32177112
Change-Id: Ib7c37398d508c4229a582880ba0f9ede4a0b4c8f
 2016-11-20 16:34:10 -08:00
Aurimas Liutikas
0f2de36ee9 Reland allowing MockitoAnnotations.* as static import. 
It was originally added internally in ag/1085881, but then got
reverted via merge when android-styles.xml got split into multiple
files in r.android.com/305437

Bug: None
Test: None
Change-Id: I08bde16212c563a8d43995a97ffe47b2c43ed952
 2016-11-18 17:12:12 -08:00
Aurimas Liutikas
4f9d3ec337 Merge "Split android-style.xml into modules for checkstyle." am: 806abc2838 am: 36feb7056c am: bd219c8a33 
am: 1507173150

Change-Id: I4c2dbc5253be9f177322de272e8c7830103013ec
 2016-11-19 01:02:54 +00:00
Aurimas Liutikas
4b0b52c257 resolve merge conflicts of 69895b1 to master 
Change-Id: I8f35e5a9c549b8f486dbeca07fc32c0f2fdab296
 2016-11-18 17:00:30 -08:00
Aurimas Liutikas
1507173150 Merge "Split android-style.xml into modules for checkstyle." am: 806abc2838 am: 36feb7056c 
am: bd219c8a33

Change-Id: I71e9479f02951f54944ab0483435df8ce78cf462
 2016-11-19 00:08:13 +00:00
Aurimas Liutikas
69895b19d4 Split android-style.xml into modules for checkstyle. am: 36824c93ee am: 78df77ca74 
am: 4ed3f4a726

Change-Id: Ia45137c139898296b5bdf2eb74b51f610ef8d845
 2016-11-19 00:08:02 +00:00
Aurimas Liutikas
bd219c8a33 Merge "Split android-style.xml into modules for checkstyle." am: 806abc2838 
am: 36feb7056c

Change-Id: I7dfb3667b3666a3a1de7beb2adf9ad0afa9cca24
 2016-11-19 00:04:42 +00:00
Aurimas Liutikas
4ed3f4a726 Split android-style.xml into modules for checkstyle. am: 36824c93ee 
am: 78df77ca74

Change-Id: Id4e422206cb5eeea69c2ec83dc411850391535f3
 2016-11-19 00:04:30 +00:00