drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
258,943 Commits 1 Branch 0 Tags
Commit Graph

258943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Salyzyn
862b2f5fae Merge \"Settings: add logpersist selection (strings)\" into nyc-dev-plus-aosp 
am: 606ce981c6

Change-Id: Ide3649402f80a9909cc8a9d9e69503ad93737c33
 2016-06-09 22:31:15 +00:00
Android Build Merger (Role)
f9a8262b03 Merge "Merge \\"Fix more of issue #28689719: Runtime restart\\" into nyc-dev am: 4781525399 am: a2cb7a0ef3" into nyc-mr1-dev-plus-aosp 2016-06-09 22:28:01 +00:00
Dianne Hackborn
34766c8c13 Merge \\"Fix more of issue #28689719: Runtime restart\\" into nyc-dev am: 4781525399 
am: a2cb7a0ef3

Change-Id: I6b4eddb9b11b2f49b34ab5e34fc25d7b5f9526ac
 2016-06-09 22:27:24 +00:00
Dianne Hackborn
773a45272b Merge \\"Fix more of issue #28689719: Runtime restart\\" into nyc-dev am: 4781525399 
am: 6d8e471072

Change-Id: I30ca001929011e28a4b5e3e97d313bcced22b47e
 2016-06-09 22:26:49 +00:00
TreeHugger Robot
606ce981c6 Merge "Settings: add logpersist selection (strings)" into nyc-dev-plus-aosp 2016-06-09 22:26:36 +00:00
Dianne Hackborn
a2cb7a0ef3 Merge \"Fix more of issue #28689719: Runtime restart\" into nyc-dev 
am: 4781525399

Change-Id: I03d781408ef7b0c7c6156d6b63ca0ab4ee457ae1
 2016-06-09 22:22:48 +00:00
Dianne Hackborn
6d8e471072 Merge \"Fix more of issue #28689719: Runtime restart\" into nyc-dev 
am: 4781525399

Change-Id: I554724ec2a8198dba1189972dd89ae9edc787162
 2016-06-09 22:22:00 +00:00
Chris Tate
2e2dbd10d6 Merge \\"Turn down factory-default lock wallpaper support\\" into nyc-dev am: 52e323bd38 
am: f252ef9ec1

Change-Id: I751179d53e94a5ac510735392020c2dab1f425bc
 2016-06-09 22:20:40 +00:00
Chris Tate
3b2e584686 Merge \\"Turn down factory-default lock wallpaper support\\" into nyc-dev am: 52e323bd38 
am: 4676cc96ac

Change-Id: I14d78f7d229c3691c11462c0e293219603f1ef2e
 2016-06-09 22:16:39 +00:00
Dianne Hackborn
4781525399 Merge "Fix more of issue #28689719: Runtime restart" into nyc-dev 2016-06-09 22:16:27 +00:00
Christopher Tate
f252ef9ec1 Merge \"Turn down factory-default lock wallpaper support\" into nyc-dev 
am: 52e323bd38

Change-Id: I71646e6fb8a6996c17a9d2760aca88d6927d33ec
 2016-06-09 22:13:43 +00:00
Christopher Tate
4676cc96ac Merge \"Turn down factory-default lock wallpaper support\" into nyc-dev 
am: 52e323bd38

Change-Id: I53421e5b2626029b3ddb9d987c553a5d42ca3162
 2016-06-09 22:13:32 +00:00
Chris Tate
52e323bd38 Merge "Turn down factory-default lock wallpaper support" into nyc-dev 2016-06-09 22:07:00 +00:00
Mark Salyzyn
514ecdf957 Settings: add logpersist selection (strings) 
(cherry picked from commit 954ed57091a6471f1873c9954fbb16a4f65a25b5)

Strings for selecting between Off, All and All minus radio to
store logs persistently on the local eMMC device. Strings for
warning button when erasing logpersist data.

Bug: 28936216
Change-Id: I3aaa59a6ebbe1a695490b4a72cad2c807c048985
 2016-06-09 15:06:28 -07:00
Stuart Scott
5cdb347384 Merge \"Add UCE Service Down protected broadcast\" into nyc-mr1-dev 
am: 3e03d02f76

Change-Id: I6b247ac27c370dcefeea2ec34edc36f58cbea9f1
 2016-06-09 21:44:11 +00:00
Doris Liu
09087eaac9 Merge \"Handle hidden RT VectorDrawable animators\" into nyc-mr1-dev 
am: 3f6a95283a

Change-Id: I909f3c33690fcb932f1b751def1837d82adb28f4
 2016-06-09 21:44:01 +00:00
Android Build Merger (Role)
e7d5a270b1 Merge "Merge \\"ResourcesManager: Apply ContextThemeWrapper config\\" into nyc-dev am: 9e9c78f8ce am: 836227b20b" into nyc-mr1-dev-plus-aosp 2016-06-09 21:33:10 +00:00
Adam Lesinski
f96dd32152 Merge \\"ResourcesManager: Apply ContextThemeWrapper config\\" into nyc-dev am: 9e9c78f8ce 
am: 836227b20b

Change-Id: Ifc3a94734f2786452d5f182ae9d587a93f2a02a0
 2016-06-09 21:32:43 +00:00
Adam Lesinski
7d7535d2e6 Merge \\"ResourcesManager: Apply ContextThemeWrapper config\\" into nyc-dev am: 9e9c78f8ce 
am: cdca6fe8a6

Change-Id: I376bb2b43e31cb6078290c7fff4838c46ee8d2ca
 2016-06-09 21:30:54 +00:00
TreeHugger Robot
3e03d02f76 Merge "Add UCE Service Down protected broadcast" into nyc-mr1-dev 2016-06-09 21:30:14 +00:00
Doris Liu
3f6a95283a Merge "Handle hidden RT VectorDrawable animators" into nyc-mr1-dev 2016-06-09 21:30:03 +00:00
Doris Liu
836227b20b Merge "Improve the property modification effiency of VectorDrawable animators" into nyc-mr1-dev 2016-06-09 21:30:03 +00:00
Android Build Merger (Role)
47883d1b27 Merge "Merge \\"ResourcesManager: Apply ContextThemeWrapper config\\" into nyc-dev am: 9e9c78f8ce am: 4b9a4a18f9" into nyc-mr1-dev-plus-aosp 2016-06-09 21:28:29 +00:00
Adam Lesinski
7cdd96ec10 Merge \\"ResourcesManager: Apply ContextThemeWrapper config\\" into nyc-dev am: 9e9c78f8ce 
am: 4b9a4a18f9

Change-Id: Ibac064cbafdfffb0078e32027e789be98e9e1358
 2016-06-09 21:28:00 +00:00
Pavlin Radoslavov
4bdecfb9ff Merge \\\"Unlock mBluetoothLock.readLock() instead of double-locking it\\\" am: 4467c845c0 am: 2df165b8db 
am: e144575a7f

Change-Id: Ia828146b8ab13047373dd345bee56fbe9683bbef
 2016-06-09 21:27:17 +00:00
Adam Lesinski
cdca6fe8a6 Merge \"ResourcesManager: Apply ContextThemeWrapper config\" into nyc-dev 
am: 9e9c78f8ce

Change-Id: Id216a87548da2cb2fbc3d4b5dfa7511aa293ccd9
 2016-06-09 21:24:09 +00:00
Adam Lesinski
4b9a4a18f9 Merge \"ResourcesManager: Apply ContextThemeWrapper config\" into nyc-dev 
am: 9e9c78f8ce

Change-Id: I71250c58f237135d156c64bdc08caafbe5b4a59e
 2016-06-09 21:22:34 +00:00
Pavlin Radoslavov
e144575a7f Merge \\"Unlock mBluetoothLock.readLock() instead of double-locking it\\" am: 4467c845c0 
am: 2df165b8db

Change-Id: I89b60a4b78ea3221e7a880c558cd6fd591298d76
 2016-06-09 21:19:29 +00:00
Pavlin Radoslavov
2df165b8db Merge \"Unlock mBluetoothLock.readLock() instead of double-locking it\" 
am: 4467c845c0

Change-Id: I4f5a7486c2f946c9f1d646278b6cdf5a26fc49c4
 2016-06-09 21:16:32 +00:00
TreeHugger Robot
9e9c78f8ce Merge "ResourcesManager: Apply ContextThemeWrapper config" into nyc-dev 2016-06-09 21:16:03 +00:00
Treehugger Robot
4467c845c0 Merge "Unlock mBluetoothLock.readLock() instead of double-locking it" 2016-06-09 21:10:29 +00:00
Android Build Merger (Role)
83bbb161fa Merge "Merge \\"Make Activity.getReferrer tolerate custom Parcelables in intents\\" into nyc-dev am: 7a37f8945f am: fb310f6a2f" into nyc-mr1-dev-plus-aosp 2016-06-09 21:10:06 +00:00
Adam Powell
149d6a63ca Merge \\"Make Activity.getReferrer tolerate custom Parcelables in intents\\" into nyc-dev am: 7a37f8945f 
am: fb310f6a2f

Change-Id: I6b4120fcda293d0b4edae7ada60946c839675780
 2016-06-09 21:09:38 +00:00
Adam Powell
948b94ff2f Merge \\"Make Activity.getReferrer tolerate custom Parcelables in intents\\" into nyc-dev am: 7a37f8945f 
am: 64e3a6d760

Change-Id: I7167b5f8112fff8c1e47c2cc954742f1f368d01c
 2016-06-09 21:08:50 +00:00
Adam Powell
fb310f6a2f Merge \"Make Activity.getReferrer tolerate custom Parcelables in intents\" into nyc-dev 
am: 7a37f8945f

Change-Id: I7f1b3f03d9e18fbfa732f2a96242f5f5966828ea
 2016-06-09 21:05:23 +00:00
Adam Powell
64e3a6d760 Merge \"Make Activity.getReferrer tolerate custom Parcelables in intents\" into nyc-dev 
am: 7a37f8945f

Change-Id: I8e14173836f153d75b9c9f29f3493335af5f2763
 2016-06-09 21:05:05 +00:00
TreeHugger Robot
7a37f8945f Merge "Make Activity.getReferrer tolerate custom Parcelables in intents" into nyc-dev 2016-06-09 20:57:53 +00:00
Android Build Merger (Role)
219e11ef9d Merge "Merge \\"Cache resources needed to sort media sizes.\\" into nyc-dev am: 142fc425c4 am: c6bddb8261" into nyc-mr1-dev-plus-aosp 2016-06-09 20:48:47 +00:00
Philip P. Moltmann
45be6ad1df Merge \\"Cache resources needed to sort media sizes.\\" into nyc-dev am: 142fc425c4 
am: c6bddb8261

Change-Id: I49a856f9e635c21efe39a670c5f8a329a79858b3
 2016-06-09 20:48:18 +00:00
Philip P. Moltmann
bf49a7de0d Merge \\"Cache resources needed to sort media sizes.\\" into nyc-dev am: 142fc425c4 
am: 5fe5dcdfd6

Change-Id: I85b82318d836df3721fd31e0f8bd029db3dc06bb
 2016-06-09 20:48:09 +00:00
Christopher Tate
36cb2a7a91 Turn down factory-default lock wallpaper support 
The infrastructure is here but not yet fully plumbed, so gracefully
provide the historical behavior until the rest is in place.

Bug 29220492

Change-Id: I36feaf68099d85e4ae11a5262002ee85346703ed
 2016-06-09 13:47:19 -07:00
Philip P. Moltmann
5fe5dcdfd6 Merge \"Cache resources needed to sort media sizes.\" into nyc-dev 
am: 142fc425c4

Change-Id: I5142e0a5c495933b87399cc0b62f1b881b04330e
 2016-06-09 20:43:28 +00:00
Philip P. Moltmann
c6bddb8261 Merge \"Cache resources needed to sort media sizes.\" into nyc-dev 
am: 142fc425c4

Change-Id: I368ffa5269029801ed191351fb1fff9bde72778a
 2016-06-09 20:43:18 +00:00
Android Build Merger (Role)
4a884e6884 Merge "Merge \\"Don\\'t update mTaskToReturnTo when task is cleared\\" into nyc-dev am: 1a77efe9ba am: 84db67cb71" into nyc-mr1-dev-plus-aosp 2016-06-09 20:38:29 +00:00
Andrii Kulian
f47f073e77 Merge \\"Don\\'t update mTaskToReturnTo when task is cleared\\" into nyc-dev am: 1a77efe9ba 
am: bf914699d5

Change-Id: Ic2bea67bf8657d49ae71e3c50be15c22274da426
 2016-06-09 20:38:01 +00:00
Andrii Kulian
310410b444 Merge \\"Don\\'t update mTaskToReturnTo when task is cleared\\" into nyc-dev am: 1a77efe9ba 
am: 84db67cb71

Change-Id: I876b22511c4f5fa9c981af394c90fdf9321e4550
 2016-06-09 20:37:55 +00:00
Philip P. Moltmann
142fc425c4 Merge "Cache resources needed to sort media sizes." into nyc-dev 2016-06-09 20:35:59 +00:00
Andrii Kulian
bf914699d5 Merge \"Don\'t update mTaskToReturnTo when task is cleared\" into nyc-dev 
am: 1a77efe9ba

Change-Id: Idb9aad2fb3161552b699f271bed940cb47fd98ad
 2016-06-09 20:33:57 +00:00
Andrii Kulian
84db67cb71 Merge \"Don\'t update mTaskToReturnTo when task is cleared\" into nyc-dev 
am: 1a77efe9ba

Change-Id: I2b8b3f6dca4b545c770e4221f36f651fd9ca8d21
 2016-06-09 20:33:52 +00:00
Andrii Kulian
1a77efe9ba Merge "Don't update mTaskToReturnTo when task is cleared" into nyc-dev 2016-06-09 20:27:29 +00:00