Craig Mautner
ea3b4f84bd
am 7e587f00: am dbbb7951: Merge "Update API per council requests" into lmp-dev
...
* commit '7e587f00bda01bd0cc814385c863b56e641f0670':
Update API per council requests
2014-08-26 04:56:25 +00:00
Alan Viverette
d7abe68c9b
am 77cc46f2: am 20862a7f: Merge "Update material colors" into lmp-dev
...
* commit '77cc46f22e56de424a5f4150ed2b72a771f4be23':
Update material colors
2014-08-26 04:55:51 +00:00
Alan Viverette
5b01c4b7ba
am 282d886f: am 14c8a3b4: Merge "Revert "Update shadow parameters for television."" into lmp-dev
...
* commit '282d886f8daab5f8443055e1643c23f9dafc67ce':
Revert "Update shadow parameters for television."
2014-08-26 04:55:42 +00:00
Amith Yamasani
ccecc75c94
am 3c4eb7de: am c4079557: Merge "Improve user switching interstitial" into lmp-dev
...
* commit '3c4eb7de1f7bfbbc6de0e98e1fbe68cad738f6ff':
Improve user switching interstitial
2014-08-26 04:53:57 +00:00
Craig Mautner
5bfbd28155
am dbbb7951: Merge "Update API per council requests" into lmp-dev
...
* commit 'dbbb79515dd2a5a4a22cf9b7e138c4669fe06224':
Update API per council requests
2014-08-26 00:09:56 +00:00
Craig Mautner
1adbf22861
Merge "Update API per council requests" into lmp-dev
2014-08-26 00:00:18 +00:00
Alan Viverette
042a0cee90
am 20862a7f: Merge "Update material colors" into lmp-dev
...
* commit '20862a7fe43f05b12a6f95515ab08ae0bffb1bae':
Update material colors
2014-08-25 23:23:33 +00:00
Alan Viverette
83a82983eb
Merge "Update material colors" into lmp-dev
2014-08-25 23:18:16 +00:00
Alan Viverette
a1fe772bd7
Update material colors
...
BUG: 17212898
Change-Id: Ic0806db57e88d5143b4241e419970ffeb2468d50
2014-08-25 16:15:06 -07:00
Alan Viverette
ff4ef85cf2
am 14c8a3b4: Merge "Revert "Update shadow parameters for television."" into lmp-dev
...
* commit '14c8a3b4e41511a25b3088739ff0305b3a88b1b3':
Revert "Update shadow parameters for television."
2014-08-25 23:06:44 +00:00
Alan Viverette
9e05f91cee
Merge "Revert "Update shadow parameters for television."" into lmp-dev
2014-08-25 22:55:05 +00:00
Alan Viverette
f707774ae1
Revert "Update shadow parameters for television."
...
Missing several important values, plus we're changing the
styling attributes so this would break anyway.
This reverts commit 97fe804398a3c6c3f7bd888f7c0129f1c130bb00.
BUG: 17221975
Change-Id: I3b4a712ca21f3821ecadfc6c9d91b604f7154f0e
2014-08-25 22:32:14 +00:00
Amith Yamasani
b301589654
am c4079557: Merge "Improve user switching interstitial" into lmp-dev
...
* commit 'c40795579d27568267e8e0450bb3651f377c3f59':
Improve user switching interstitial
2014-08-25 21:52:18 +00:00
Craig Mautner
3b2cd1d59f
Update API per council requests
...
launchTaskBehindBackgroundAnimation => launchTaskBehindTargetAnimation
visibilityMode => transitionVisiblityMode
makeLaunchTaskBehindAnimation => makeTaskLaunchBehind
launch_task_behind_background = launch_task_behind_target
Fixes bug 16958544.
Change-Id: I3b7c791fc0671b8071a5377cf6fa878bd5861f70
2014-08-25 14:25:54 -07:00
Amith Yamasani
c2a8d151dc
Improve user switching interstitial
...
Layout and string changes.
Bug: 16661752
Change-Id: Ie24fe4683b91923ff357be054b7440fd1fc86ebb
2014-08-25 14:20:20 -07:00
Jorim Jaggi
05f17b2fce
am 72ca0ecb: am cfef67fc: Merge "Fix password unlock method" into lmp-dev
...
* commit '72ca0ecb133b38f7caa4737461e49d12a123e914':
Fix password unlock method
2014-08-25 16:38:52 +00:00
Jorim Jaggi
d120520c4c
am cfef67fc: Merge "Fix password unlock method" into lmp-dev
...
* commit 'cfef67fc9ab05d59910b467409a6d82e918f91cd':
Fix password unlock method
2014-08-25 16:22:45 +00:00
Baligh Uddin
25143d58a8
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-08-25 16:16:06 +00:00
Jorim Jaggi
20060091e2
Merge "Fix password unlock method" into lmp-dev
2014-08-25 16:09:23 +00:00
Jorim Jaggi
e070018b3e
Fix password unlock method
...
- Update layouts/assets to material
- Fix that the virtual keyboard didn't always come up
- Fix window layout of status bar window, so it's above the IME when
on Keyguard
Bug: 16957208
Change-Id: I1785af9ac73103abe6cd9968ed27582fbfc9a1d9
2014-08-25 17:21:05 +02:00
John Spurlock
2436e0260a
am d9cd4e82: am 91441c89: Battery saver: Add period to last sentence of disclosure.
...
* commit 'd9cd4e82cab3c20b3c2e6b5919ebe6b411fe3907':
Battery saver: Add period to last sentence of disclosure.
2014-08-25 13:28:32 +00:00
John Spurlock
6ddab10fef
am 91441c89: Battery saver: Add period to last sentence of disclosure.
...
* commit '91441c890e1e8c304e6c041286e2819b02029ed7':
Battery saver: Add period to last sentence of disclosure.
2014-08-25 13:19:12 +00:00
John Spurlock
6adf1588fd
Battery saver: Add period to last sentence of disclosure.
...
Bug:17166240
Change-Id: I254bc3e396a0d072c379f9b6305ac7c0ef132f6a
2014-08-25 09:03:29 -04:00
Baligh Uddin
602774cd7c
Import translations. DO NOT MERGE
...
Change-Id: I537b8e3ff4b341b93d807253fbc5cb3c7c7fb561
Auto-generated-cl: translation import
2014-08-24 11:09:10 -07:00
Sandeep Siddhartha
173db08cce
am a8d8e4c4: am e829259d: Merge "Fix the Locale story in the hotword API" into lmp-dev
...
* commit 'a8d8e4c439da6a3b9292335d631c6ec65ff45b01':
Fix the Locale story in the hotword API
2014-08-23 06:19:01 +00:00
Sandeep Siddhartha
960c98e2aa
am e829259d: Merge "Fix the Locale story in the hotword API" into lmp-dev
...
* commit 'e829259d46d4dc6a5c579c0ddfefbe6d11849c8a':
Fix the Locale story in the hotword API
2014-08-23 01:21:31 +00:00
Sandeep Siddhartha
a434963fad
Merge "Fix the Locale story in the hotword API" into lmp-dev
2014-08-23 01:08:18 +00:00
Jeff Brown
a988347120
am cd4d217a: am d8b20d39: Merge changes I9bd3a235,I9c4dbdef into lmp-dev
...
* commit 'cd4d217abfa6199eef19c003d03b29ff0a1e33db':
Improve adaptive brightness in very dark rooms.
Hide PowerManager methods that third-party apps can't use.
2014-08-23 00:41:09 +00:00
Jeff Brown
27355a01f1
am fdfd79f2: am 6a276cec: Merge "Poke interactive hint from userActivity and add @SystemApi." into lmp-dev
...
* commit 'fdfd79f218144a9a7865e9523c29e0d97080152d':
Poke interactive hint from userActivity and add @SystemApi.
2014-08-23 00:41:04 +00:00
Jeff Brown
a136c7e068
am d8b20d39: Merge changes I9bd3a235,I9c4dbdef into lmp-dev
...
* commit 'd8b20d399e1834910fcc3fb502ecbe0d15412510':
Improve adaptive brightness in very dark rooms.
Hide PowerManager methods that third-party apps can't use.
2014-08-23 00:34:18 +00:00
Jeff Brown
92b506fa17
am 6a276cec: Merge "Poke interactive hint from userActivity and add @SystemApi." into lmp-dev
...
* commit '6a276cec09dd175d175dfc96f7a703b05300f8c9':
Poke interactive hint from userActivity and add @SystemApi.
2014-08-23 00:34:13 +00:00
Jeff Brown
a96a3c1b65
Merge changes I9bd3a235,I9c4dbdef into lmp-dev
...
* changes:
Improve adaptive brightness in very dark rooms.
Hide PowerManager methods that third-party apps can't use.
2014-08-23 00:23:45 +00:00
Jeff Brown
d7761be23d
Merge "Poke interactive hint from userActivity and add @SystemApi." into lmp-dev
2014-08-23 00:23:41 +00:00
Sandeep Siddhartha
dcf3068fcb
Fix the Locale story in the hotword API
...
Tighten the API by taking in a locale rather than a string tag.
Tighten the checks when reading the enrollment metadata, bail out if any
attribute is missing or invalid.
Add missing recycle call for a TypedArray
Stop recognition when sound model(s) change. This is needed during
un-enrollment/re-enrollment.
Bug: 17187528
Bug: 17205230
Change-Id: Idb00b51ef8c4ea0a8f8993decea582223181fa3d
2014-08-22 17:23:13 -07:00
Tim Kilbourn
321db6f3a4
am 597973c9: am 442bb8f6: Merge "Update shadow parameters for television." into lmp-dev
...
* commit '597973c999773f8e42b0b891b0d51e69fe798606':
Update shadow parameters for television.
2014-08-23 00:00:05 +00:00
Tim Kilbourn
4af6348435
am 442bb8f6: Merge "Update shadow parameters for television." into lmp-dev
...
* commit '442bb8f66804cfb9894176e6d4ac5b6c455a4caf':
Update shadow parameters for television.
2014-08-22 23:55:47 +00:00
Tim Kilbourn
aa6215a0d2
Merge "Update shadow parameters for television." into lmp-dev
2014-08-22 23:45:40 +00:00
Tim Kilbourn
fbc1931d6a
Update shadow parameters for television.
...
Bug: 15859361
Change-Id: If22767a6aa81f897c0705fa0618c314df27b7dcd
2014-08-22 16:44:53 -07:00
Elliott Hughes
49e927ecd6
am 8f038952: am fff90ffb: Merge "Use CLDR narrow am/pm markers." into lmp-dev
...
* commit '8f0389527241cb5b8adada12b9084b5c7f38bb84':
Use CLDR narrow am/pm markers.
2014-08-22 23:23:52 +00:00
Elliott Hughes
8821122225
am fff90ffb: Merge "Use CLDR narrow am/pm markers." into lmp-dev
...
* commit 'fff90ffb6bb113bea6297a7edf97679f4c835763':
Use CLDR narrow am/pm markers.
2014-08-22 23:10:04 +00:00
Elliott Hughes
ed40256670
Merge "Use CLDR narrow am/pm markers." into lmp-dev
2014-08-22 23:02:14 +00:00
Robert Greenwalt
8fee69be0c
am 6aaa0bc2: am 0c9bb058: Merge "Add config settings for ethernet/wifi tcp buffers" into lmp-dev
...
* commit '6aaa0bc22b2bd8d6fac750dd4a46322d66804d61':
Add config settings for ethernet/wifi tcp buffers
2014-08-22 21:45:35 +00:00
Amith Yamasani
61b7dff862
am 0c581229: am 654d72fd: Merge "Show a user switching dialog before starting the user switch" into lmp-dev
...
* commit '0c581229cd4986c07bb877f8211a8c5471633efb':
Show a user switching dialog before starting the user switch
2014-08-22 21:24:20 +00:00
Robert Greenwalt
9712405ed8
am 0c9bb058: Merge "Add config settings for ethernet/wifi tcp buffers" into lmp-dev
...
* commit '0c9bb058dbb6b615c729d945a7d3547b3e99b39d':
Add config settings for ethernet/wifi tcp buffers
2014-08-22 21:23:15 +00:00
Robert Greenwalt
acb570cd84
Merge "Add config settings for ethernet/wifi tcp buffers" into lmp-dev
2014-08-22 21:14:34 +00:00
Amith Yamasani
dbca3c3121
am 654d72fd: Merge "Show a user switching dialog before starting the user switch" into lmp-dev
...
* commit '654d72fd3c12bf0470e88debb0701a949914607e':
Show a user switching dialog before starting the user switch
2014-08-22 21:14:10 +00:00
Amith Yamasani
6dd08fdd91
Merge "Show a user switching dialog before starting the user switch" into lmp-dev
2014-08-22 21:08:15 +00:00
Christian Robertson
4a7c5b33f3
am 7889aae3: am abf664ec: Merge "Changed the color of buttonBarButtonStyle in the Material theme" into lmp-dev
...
* commit '7889aae3939e8474b8de75d50f9412e4f39e3e32':
Changed the color of buttonBarButtonStyle in the Material theme
2014-08-22 20:08:08 +00:00
Amith Yamasani
7805a10c86
Show a user switching dialog before starting the user switch
...
switchUser() now first shows a dialog and the dialog calls
startUserInForeground to do the actual switch.
Bug: 16661752
Change-Id: Ie4e2e9eec8bf7c2116694072ea8555b8254a0e13
2014-08-22 13:00:22 -07:00
Christian Robertson
f2088d7e81
am abf664ec: Merge "Changed the color of buttonBarButtonStyle in the Material theme" into lmp-dev
...
* commit 'abf664eca01fcae8d01f0ae1dec6b8aac2c602dc':
Changed the color of buttonBarButtonStyle in the Material theme
2014-08-22 19:57:35 +00:00