Jason Monk
6db9b1c276
am 0a424ef6: am 0e8c7a0d: am eb9daa91: Merge "Switch exiting screen pinning to recents+back" into lmp-dev
...
* commit '0a424ef6e9c2cca5e0779e4c916b0d11c835bc25':
Switch exiting screen pinning to recents+back
2014-08-15 11:43:57 +00:00
RoboErik
e0d866b278
am c92a770d: am 866ae744: am bc0d11a6: Merge "Pipe caller\'s identity through volume methods" into lmp-dev
...
* commit 'c92a770de89fae371d51600c8d06ac175244ef5a':
Pipe caller's identity through volume methods
2014-08-15 11:43:07 +00:00
Jason Monk
21616def11
am 0e8c7a0d: am eb9daa91: Merge "Switch exiting screen pinning to recents+back" into lmp-dev
...
* commit '0e8c7a0d216f74d89113398d7f9f6c8ff8432e37':
Switch exiting screen pinning to recents+back
2014-08-15 11:35:09 +00:00
RoboErik
f1dbc6bffb
am 866ae744: am bc0d11a6: Merge "Pipe caller\'s identity through volume methods" into lmp-dev
...
* commit '866ae74437ca37109a328c70696c7ee92e4d045c':
Pipe caller's identity through volume methods
2014-08-15 11:33:33 +00:00
Jae Seo
38a9bcf240
am 810e043b: am 85d40b29: am 8b6c899b: Merge "TIF: fix IOException at PersistentDataStore.save()" into lmp-dev
...
* commit '810e043b77888e196c24c81978ad48bfe010d562':
TIF: fix IOException at PersistentDataStore.save()
2014-08-15 05:07:23 +00:00
RoboErik
0016b5f6a7
am 2dea60c8: am 1e553dc7: am b11490fb: Merge "Add an onSessionDestroyed callback to MediaController.Callback" into lmp-dev
...
* commit '2dea60c8390ab4c2c12bc865819be983d5d6b3e0':
Add an onSessionDestroyed callback to MediaController.Callback
2014-08-15 05:06:50 +00:00
Jae Seo
5cb7a38455
am 85d40b29: am 8b6c899b: Merge "TIF: fix IOException at PersistentDataStore.save()" into lmp-dev
...
* commit '85d40b296f55d1a66a23304ee48f1f33de144ea6':
TIF: fix IOException at PersistentDataStore.save()
2014-08-15 04:00:31 +00:00
RoboErik
57bed67820
am 1e553dc7: am b11490fb: Merge "Add an onSessionDestroyed callback to MediaController.Callback" into lmp-dev
...
* commit '1e553dc76fe4722b838af3721ee33edce04b68ee':
Add an onSessionDestroyed callback to MediaController.Callback
2014-08-15 03:56:10 +00:00
Jorim Jaggi
02fb6dc882
am 0bd7f533: am ddf03adb: am 8cadb460: Use different unlock animation when going to full shade
...
* commit '0bd7f533c128f6c0586f56bc8a29cd266b23fa29':
Use different unlock animation when going to full shade
2014-08-14 23:42:53 +00:00
Jorim Jaggi
8f188d32b0
am ddf03adb: am 8cadb460: Use different unlock animation when going to full shade
...
* commit 'ddf03adb2e4150168dfe6e27338ca18e264f5f8d':
Use different unlock animation when going to full shade
2014-08-14 23:34:08 +00:00
Jason Monk
815e057b9b
Switch exiting screen pinning to recents+back
...
When accessibility is on, still use just recents.
While here fix strings to be less wrong. Still need finalization.
Bug: 16649417
Change-Id: I94debe9471d5132f1f662543cc98cbde638c758d
2014-08-14 20:06:41 +00:00
Jose Lima
698dcf6b77
am 438d6300: am 06804518: am d361d4f9: Made AlarmClockInfo a nested class in AlarmManager
...
* commit '438d630058336fb5afed72db34e75cf4898298a8':
Made AlarmClockInfo a nested class in AlarmManager
2014-08-14 17:56:59 +00:00
Jose Lima
9c9e325980
am ed60a1e1: am b991fd6e: am ec8834a3: Renamed "media playing" APIs to "visible behind"
...
* commit 'ed60a1e131918adba2777a577ebabd9866728d57':
Renamed "media playing" APIs to "visible behind"
2014-08-14 17:56:47 +00:00
Jeff Brown
f431a9fc43
am 31012592: am f281eea3: am 79bdc4d1: Log who is calling goToSleep().
...
* commit '310125927fa5afd965f613d535db52343f0f5427':
Log who is calling goToSleep().
2014-08-14 17:56:42 +00:00
Dianne Hackborn
e5db479fd3
am c958468b: am 9f886b5d: am b344c188: Merge "Fix singleInstance usage when singleTop intended" into lmp-dev
...
* commit 'c958468b7824478a5465a303cec6fed3293652ca':
Fix singleInstance usage when singleTop intended
2014-08-14 17:56:32 +00:00
Wonsik Kim
74763e7dc6
am 5be2b3b2: am a4f76c98: am 21cdf598: Merge "TIF: handle HDMI CEC power status change" into lmp-dev
...
* commit '5be2b3b21ee2a723c2317eb8f4108d1cb08e2d76':
TIF: handle HDMI CEC power status change
2014-08-14 17:56:22 +00:00
Robert Greenwalt
58cd1df978
am 1cffe07a: am 9249840f: am eb2f9858: Merge "Don\'t send NetworkMonitor bcast until systemReady" into lmp-dev
...
* commit '1cffe07a5c30c197344943ed3948109ddec01070':
Don't send NetworkMonitor bcast until systemReady
2014-08-14 17:56:00 +00:00
Winson Chung
21cbc935b8
am 17bec566: am e53ad496: am 11d62d14: Merge "Adding scrim to task views. (Bug 15704955)" into lmp-dev
...
* commit '17bec5669075f028e66ec09ffeacbacac5db1e06':
Adding scrim to task views. (Bug 15704955)
2014-08-14 17:55:55 +00:00
Jose Lima
95f3c34848
am 06804518: am d361d4f9: Made AlarmClockInfo a nested class in AlarmManager
...
* commit '068045187ef2b6011633b3a0bf273030ecb6d664':
Made AlarmClockInfo a nested class in AlarmManager
2014-08-14 17:47:08 +00:00
Jose Lima
f082842f2b
am b991fd6e: am ec8834a3: Renamed "media playing" APIs to "visible behind"
...
* commit 'b991fd6ec57b0f59e20f85a9cb9c63ac9d0ab98a':
Renamed "media playing" APIs to "visible behind"
2014-08-14 17:47:02 +00:00
Jeff Brown
d1ee11da70
am f281eea3: am 79bdc4d1: Log who is calling goToSleep().
...
* commit 'f281eea327ed9020333746cc77e48636662231b6':
Log who is calling goToSleep().
2014-08-14 17:46:57 +00:00
Dianne Hackborn
fc9eebe397
am 9f886b5d: am b344c188: Merge "Fix singleInstance usage when singleTop intended" into lmp-dev
...
* commit '9f886b5d24b02978f56abe777819665d4eea4fbc':
Fix singleInstance usage when singleTop intended
2014-08-14 17:46:46 +00:00
Wonsik Kim
2c8d0d15fb
am a4f76c98: am 21cdf598: Merge "TIF: handle HDMI CEC power status change" into lmp-dev
...
* commit 'a4f76c98e66b1d1d45a57f88fffc75e63c3774c3':
TIF: handle HDMI CEC power status change
2014-08-14 17:46:37 +00:00
Robert Greenwalt
2f0faca669
am 9249840f: am eb2f9858: Merge "Don\'t send NetworkMonitor bcast until systemReady" into lmp-dev
...
* commit '9249840f7f5939d7f5efa233c1ef9f8ee57a57f7':
Don't send NetworkMonitor bcast until systemReady
2014-08-14 17:45:31 +00:00
Winson Chung
110d2ccdb8
am e53ad496: am 11d62d14: Merge "Adding scrim to task views. (Bug 15704955)" into lmp-dev
...
* commit 'e53ad496018d28cfb625eaec8c7ccbc1edae0581':
Adding scrim to task views. (Bug 15704955)
2014-08-14 17:45:23 +00:00
Jae Seo
82324ec662
Merge "TIF: fix IOException at PersistentDataStore.save()" into lmp-dev
2014-08-14 16:46:52 +00:00
Wonsik Kim
7ed8901f12
TIF: fix IOException at PersistentDataStore.save()
...
Bug: 17018435
Change-Id: Ic999aaf59ae942ee8279576ec1e2ce2fa62bd6e0
2014-08-14 10:06:12 -07:00
RoboErik
b05ea7bb28
Merge "Add an onSessionDestroyed callback to MediaController.Callback" into lmp-dev
2014-08-14 16:10:21 +00:00
Jorim Jaggi
84a3e7aacf
Use different unlock animation when going to full shade
...
Also fixes a bug that the notify flag was not reset, and fix the
transition for the phone/camera affordance (in these cases, no
animation is needed).
Bug: 15991916
Change-Id: Idbb4fa40f86bda597cd66cc38da838ef4f75514d
2014-08-14 12:29:25 +00:00
Jose Lima
235510e672
Made AlarmClockInfo a nested class in AlarmManager
...
Bug: 16959028
Change-Id: I150eaaff765d1e214c3621c1bf50162ec0dac8ec
2014-08-14 02:10:41 +00:00
Jose Lima
4b6c6697da
Renamed "media playing" APIs to "visible behind"
...
- Request from API Review: rename the media playing APIs to a more
generic name, reflecting the background visibility feature these
methods actually control.
- Made the new isActivityVisibleBehind().
- Changed convertFromTranslucent() and convertToTranslucent() to be
SystemApi.
Bug: 16959028
Change-Id: I526eac22f44273b3254dd6201f89194d13e597e2
2014-08-14 02:00:04 +00:00
Jeff Brown
c12035cd40
Log who is calling goToSleep().
...
Change-Id: Ibae61c90ee115735835e878bb3bf79eedaa0ae44
2014-08-14 01:56:48 +00:00
Dianne Hackborn
5b1500a7dc
Merge "Fix singleInstance usage when singleTop intended" into lmp-dev
2014-08-14 00:12:29 +00:00
Craig Mautner
ad400af809
Fix singleInstance usage when singleTop intended
...
In ag/499591 launchSingleInstance was mistakenly used to replace
r.launchMode==ActivityInfo.LAUNCH_SINGLE_TOP. This fixes that
and...
fixes bug 16898764.
Change-Id: I0c0cc3b67eda69276dbe1dd5da4f17556651b1ff
2014-08-13 17:17:21 -07:00
Robert Greenwalt
57e383b1cc
Merge "Don't send NetworkMonitor bcast until systemReady" into lmp-dev
2014-08-13 23:16:37 +00:00
RoboErik
24762bffc3
Add an onSessionDestroyed callback to MediaController.Callback
...
Callbacks on the controller need to know when the session ceases
to exist.
bug:17009030
Change-Id: I0f1c1cfc51f7dd2203955287cc269667d3765ee4
2014-08-13 15:00:21 -07:00
Robert Greenwalt
fb68f8fbe0
Don't send NetworkMonitor bcast until systemReady
...
bug:16913951
Change-Id: I26c5c3353c2d8821452f81765875958d5b9d385b
2014-08-13 13:43:32 -07:00
Jae Seo
8e19370aac
am 97508a38: am 930ab23a: am 7d206d9b: Merge "TIF: Create TvInputState only once per each input" into lmp-dev
...
* commit '97508a38bde74b00d6e9f252ff5a86de38c9998e':
TIF: Create TvInputState only once per each input
2014-08-13 20:29:58 +00:00
Amith Yamasani
e8d12b6440
am b2c95e74: am 6648994f: am 5884bca0: Decouple user limit from guest creation
...
* commit 'b2c95e74187539d78a9df70ae3361a67b5e72de9':
Decouple user limit from guest creation
2014-08-13 20:25:40 +00:00
Jae Seo
6b8ea6e56d
am 930ab23a: am 7d206d9b: Merge "TIF: Create TvInputState only once per each input" into lmp-dev
...
* commit '930ab23aaf41163f09a83a3060e1f1b78cb5af0c':
TIF: Create TvInputState only once per each input
2014-08-13 20:24:16 +00:00
Amith Yamasani
b0dd621ef3
am 6648994f: am 5884bca0: Decouple user limit from guest creation
...
* commit '6648994f02769f957a197deef011291d11a390b8':
Decouple user limit from guest creation
2014-08-13 20:18:50 +00:00
Amith Yamasani
95ab784944
Decouple user limit from guest creation
...
Allow Guest to be created even if there are N users.
Allow N users to be created even if there are N-1 users
and a Guest.
Limit number of guests and managed profiles that can
be added.
Added unit tests.
Bug: 15934700
Change-Id: I1a8f0fa38a91d71ef7b2980e05c974244dfc337a
2014-08-13 20:09:20 +00:00
keunyoung
28ba176957
am 14a3d969: am a90c8cba: am 64c0b0b6: Merge "rename UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK to ENABLE_CAR_MODE_ALLOW_SLEEP" into lmp-dev
...
* commit '14a3d9696ae79fa774b9787fd4e658b1018886f0':
rename UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK to ENABLE_CAR_MODE_ALLOW_SLEEP
2014-08-13 20:06:00 +00:00
keunyoung
fa4c60cf63
am a90c8cba: am 64c0b0b6: Merge "rename UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK to ENABLE_CAR_MODE_ALLOW_SLEEP" into lmp-dev
...
* commit 'a90c8cba81ab4721e4d440d4ddd0a9710bf62def':
rename UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK to ENABLE_CAR_MODE_ALLOW_SLEEP
2014-08-13 20:00:50 +00:00
Adrian Roos
d4070b70dd
am 20abcf55: am df08e58a: am d63b258c: Trust: Insecure unlock also removes disable-trust-on-boot restriction
...
* commit '20abcf55452371381fd8191f121022406347d935':
Trust: Insecure unlock also removes disable-trust-on-boot restriction
2014-08-13 19:44:56 +00:00
Adrian Roos
02bb98b3b2
am df08e58a: am d63b258c: Trust: Insecure unlock also removes disable-trust-on-boot restriction
...
* commit 'df08e58a28a604e29ad4e0cb81d0d7f2aadaa048':
Trust: Insecure unlock also removes disable-trust-on-boot restriction
2014-08-13 19:40:49 +00:00
Adrian Roos
9dbe190099
Trust: Insecure unlock also removes disable-trust-on-boot restriction
...
Bug: 16485702
Change-Id: I437f619eb680fa9461a5e0d854db2d9f84dc602c
2014-08-13 19:31:29 +00:00
Craig Mautner
8549816f6c
am 3e8ebfe9: am 72115915: am 3e8ccb9c: Clean up app following death when creating service
...
* commit '3e8ebfe950a1ab1eee37521fa98841d6ceaf75e1':
Clean up app following death when creating service
2014-08-13 18:33:16 +00:00
Craig Mautner
c5d3d85c0b
am 75734cc3: am 3f4a10a5: am 8844c75a: Merge "Disassociate system windows from apps" into lmp-dev
...
* commit '75734cc34745c15d98da7327b17b8644f6fe42b5':
Disassociate system windows from apps
2014-08-13 18:33:12 +00:00
Craig Mautner
fb16732623
am 72115915: am 3e8ccb9c: Clean up app following death when creating service
...
* commit '721159159f1c0e100150512c392141830eaebba2':
Clean up app following death when creating service
2014-08-13 18:27:54 +00:00