Jason Monk
f424ccf743
am 5c2de952: am 7fdb1478: RIP -night DO NOT MERGE
...
* commit '5c2de952e5e7f2501df7a5a94794e526902e47a3':
RIP -night DO NOT MERGE
2015-06-17 13:47:00 +00:00
Jason Monk
5c2de952e5
am 7fdb1478: RIP -night DO NOT MERGE
...
* commit '7fdb1478728ed7eaab956da476540b3e9c97b9b3':
RIP -night DO NOT MERGE
2015-06-17 13:37:31 +00:00
Jason Monk
7fdb147872
RIP -night DO NOT MERGE
...
Bug: 21854466
Change-Id: Ied1512cb1d8c80df9f6c990f8f91f82d7f140533
2015-06-17 09:17:31 -04:00
Jeff Sharkey
c162b354c2
am a39077c9: am 67832cc3: am 74c7f1fc: Merge "Actually gracefully finish this time around." into mnc-dev
...
* commit 'a39077c95bb51102e77e55a2d4e352f8027d5c24':
Actually gracefully finish this time around.
2015-06-17 03:54:31 +00:00
Jeff Sharkey
a39077c95b
am 67832cc3: am 74c7f1fc: Merge "Actually gracefully finish this time around." into mnc-dev
...
* commit '67832cc3984665cf55ac3d4afc5fdbb76326f1a0':
Actually gracefully finish this time around.
2015-06-17 03:45:06 +00:00
Jeff Sharkey
67832cc398
am 74c7f1fc: Merge "Actually gracefully finish this time around." into mnc-dev
...
* commit '74c7f1fcd3451bdb5b49f2b44b86fd4ec8eb6794':
Actually gracefully finish this time around.
2015-06-17 03:31:44 +00:00
Jeff Sharkey
74c7f1fcd3
Merge "Actually gracefully finish this time around." into mnc-dev
2015-06-17 03:23:59 +00:00
Jeff Sharkey
665094c9d2
Actually gracefully finish this time around.
...
Also fix tinting on front-door icon.
Bug: 21403958
Change-Id: I74f0372a41b92235abe10391f36d9f6a1e6a40c5
2015-06-16 20:21:12 -07:00
Jim Miller
de1d7db439
am 8b5943c2: am dd0d9854: am 4b60af78: Merge "Fix issue with german translation of lock times" into mnc-dev
...
* commit '8b5943c2fb4d069797df0c1a4b43f2d604eb6385':
Fix issue with german translation of lock times
2015-06-17 00:33:52 +00:00
Jim Miller
8b5943c2fb
am dd0d9854: am 4b60af78: Merge "Fix issue with german translation of lock times" into mnc-dev
...
* commit 'dd0d9854a5e4e946e8cb55a91148f17e4424836f':
Fix issue with german translation of lock times
2015-06-17 00:20:35 +00:00
Jim Miller
dd0d9854a5
am 4b60af78: Merge "Fix issue with german translation of lock times" into mnc-dev
...
* commit '4b60af78fa8b0c474c9aee0f03171867843d2838':
Fix issue with german translation of lock times
2015-06-17 00:09:52 +00:00
Jim Miller
4b60af78fa
Merge "Fix issue with german translation of lock times" into mnc-dev
2015-06-16 23:59:43 +00:00
Brian Carlstrom
8453e36188
am 99c1009a: am 49d73c03: am 94f4cb4e: Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev
...
* commit '99c1009a897834e8282a59c0dda8f29dd33234e4':
dex2oat should show something friendlier in Settings -> Battery
2015-06-16 23:25:53 +00:00
Jim Miller
50d7d19a73
Fix issue with german translation of lock times
...
The word "immediately" would go into a different place in the sentence
than a number so we have to break this into two strings.
Fixes bug 21602326
Change-Id: Ie07f1bc84d68bdea8d6f1264dfd18326c2e48df4
2015-06-16 16:21:27 -07:00
Brian Carlstrom
99c1009a89
am 49d73c03: am 94f4cb4e: Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev
...
* commit '49d73c03aa5b8b21c5e8a926b6a894245ffdf906':
dex2oat should show something friendlier in Settings -> Battery
2015-06-16 23:18:33 +00:00
Brian Carlstrom
49d73c03aa
am 94f4cb4e: Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev
...
* commit '94f4cb4e4660db823d268d14eb1199dbc11f8e86':
dex2oat should show something friendlier in Settings -> Battery
2015-06-16 23:07:52 +00:00
Jeff Sharkey
1a1a109936
am aa1e5f2f: am 5fafa130: am 95b891af: Merge "Finish storage wizard theming." into mnc-dev
...
* commit 'aa1e5f2f001aa7cc39ce4b0c5974bfc47a8d96fa':
Finish storage wizard theming.
2015-06-16 23:00:45 +00:00
Brian Carlstrom
94f4cb4e46
Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev
2015-06-16 22:59:04 +00:00
Jeff Sharkey
aa1e5f2f00
am 5fafa130: am 95b891af: Merge "Finish storage wizard theming." into mnc-dev
...
* commit '5fafa130ec8f031310e5372a89034057053fa634':
Finish storage wizard theming.
2015-06-16 22:49:20 +00:00
Jeff Sharkey
5fafa130ec
am 95b891af: Merge "Finish storage wizard theming." into mnc-dev
...
* commit '95b891af7c77d51f6284e01467bd6323d3749068':
Finish storage wizard theming.
2015-06-16 22:36:06 +00:00
Jeff Sharkey
8e987d9bfb
Finish storage wizard theming.
...
Storage wizard screens now have updated assets from UX, and various
assets are tinted consistently. We're using our own navigation bar
and wholesale replacing the layout from upstream.
Fix text colors in night mode. Tell SystemUI when we're finished
with the wizard flow.
Bug: 21830731
Change-Id: Ic8d09cc152bfb4dcc6089b5c61d28cbdd4be3ee9
2015-06-16 15:28:49 -07:00
Jason Monk
01e5945aca
am 23d6ab34: am fbebf8cf: am 254e8aea: Merge "Update for shortcuts" into mnc-dev
...
* commit '23d6ab342affc30fb101d2481aeb6d497b857d49':
Update for shortcuts
2015-06-16 21:42:56 +00:00
Sanket Padawe
bb9e422c6c
am 3c2f469b: am fc4e9cbd: am 7171d686: Merge "Add PBAP checkbox for BT pairing consent dialog." into mnc-dev
...
* commit '3c2f469bf9d804bdb60bd0fea618cbc883db5ab6':
Add PBAP checkbox for BT pairing consent dialog.
2015-06-16 21:42:47 +00:00
Jason Monk
5baa77ae5d
am 27fe38eb: am 4c1f455c: am 744f2adb: Merge "Layout refinement for app lists" into mnc-dev
...
* commit '27fe38eb2c3b10d28c570ae60221c7ae5c54dcbd':
Layout refinement for app lists
2015-06-16 21:42:43 +00:00
Jason Monk
24db3674af
am 283c469d: am e9ec307a: Merge "Remove theme setting DO NOT MERGE" into mnc-dev
...
* commit '283c469dc82841827d3dd2e7052f68c5e71f1425':
Remove theme setting DO NOT MERGE
2015-06-16 21:26:03 +00:00
Jason Monk
23d6ab342a
am fbebf8cf: am 254e8aea: Merge "Update for shortcuts" into mnc-dev
...
* commit 'fbebf8cfc4a612b6708d024ce71e8069e87cd310':
Update for shortcuts
2015-06-16 21:25:48 +00:00
Sanket Padawe
3c2f469bf9
am fc4e9cbd: am 7171d686: Merge "Add PBAP checkbox for BT pairing consent dialog." into mnc-dev
...
* commit 'fc4e9cbdf928b6b8bcbdd96a9940e0333a49193e':
Add PBAP checkbox for BT pairing consent dialog.
2015-06-16 21:23:09 +00:00
Jason Monk
27fe38eb2c
am 4c1f455c: am 744f2adb: Merge "Layout refinement for app lists" into mnc-dev
...
* commit '4c1f455cac4ed69a1dec0ce5c75323301d288e1b':
Layout refinement for app lists
2015-06-16 21:23:07 +00:00
Jason Monk
283c469dc8
am e9ec307a: Merge "Remove theme setting DO NOT MERGE" into mnc-dev
...
* commit 'e9ec307a057618ff40b9988684761a778f9301d4':
Remove theme setting DO NOT MERGE
2015-06-16 21:03:11 +00:00
Jason Monk
e9ec307a05
Merge "Remove theme setting DO NOT MERGE" into mnc-dev
2015-06-16 20:49:55 +00:00
Jason Monk
fbebf8cfc4
am 254e8aea: Merge "Update for shortcuts" into mnc-dev
...
* commit '254e8aea22f36c90587315a58aeefda9683581eb':
Update for shortcuts
2015-06-16 20:45:22 +00:00
Jason Monk
cf611f4695
Remove theme setting DO NOT MERGE
...
Because it's just too incredibly useful...
Bug: 21854466
Change-Id: I984cf709f484a220e9ba7738a8b9c166c28573b2
2015-06-16 20:45:22 +00:00
Jason Monk
254e8aea22
Merge "Update for shortcuts" into mnc-dev
2015-06-16 20:36:46 +00:00
Jason Monk
78b1715bcb
Update for shortcuts
...
Change-Id: If28d540fd9e300b9c26d5cb6869be3d475124e9e
2015-06-16 16:31:01 -04:00
Sanket Padawe
fc4e9cbdf9
am 7171d686: Merge "Add PBAP checkbox for BT pairing consent dialog." into mnc-dev
...
* commit '7171d6864fb4d8c1838b4ef1d65b6bb5274d3b53':
Add PBAP checkbox for BT pairing consent dialog.
2015-06-16 20:06:46 +00:00
Jason Monk
4c1f455cac
am 744f2adb: Merge "Layout refinement for app lists" into mnc-dev
...
* commit '744f2adb56ac0077a103c8e6e3b20f421eddc780':
Layout refinement for app lists
2015-06-16 20:06:29 +00:00
Sanket Padawe
7171d6864f
Merge "Add PBAP checkbox for BT pairing consent dialog." into mnc-dev
2015-06-16 15:24:05 +00:00
Jason Monk
744f2adb56
Merge "Layout refinement for app lists" into mnc-dev
2015-06-16 13:17:02 +00:00
Jason Monk
2cdafc6be3
Layout refinement for app lists
...
Make all app lists (or at least all current app lists) use the same
base layout for icon, label, and sizing/padding. This way they
should look the same.
Bug: 21727125
Bug: 21726922
Bug: 21853632
Change-Id: I3cffadb9e7b5184d4209deacd4ea70ec1d4f71b4
2015-06-16 09:15:39 -04:00
Jeff Sharkey
eb446accf3
am 96b09cf5: am 3538eb24: am 71c89a17: Merge "More storage UI updates." into mnc-dev
...
* commit '96b09cf59f7554b05004fa7f8ad6da1c73e8f545':
More storage UI updates.
2015-06-16 05:16:43 +00:00
Jeff Sharkey
96b09cf59f
am 3538eb24: am 71c89a17: Merge "More storage UI updates." into mnc-dev
...
* commit '3538eb2410808484b8110d83543d6c926fa870c4':
More storage UI updates.
2015-06-16 05:06:00 +00:00
Jeff Sharkey
3538eb2410
am 71c89a17: Merge "More storage UI updates." into mnc-dev
...
* commit '71c89a171acb1ddd63d10189c39c07134987bd2f':
More storage UI updates.
2015-06-16 04:57:43 +00:00
Jeff Sharkey
71c89a171a
Merge "More storage UI updates." into mnc-dev
2015-06-16 04:47:19 +00:00
Jeff Sharkey
2597625fd9
More storage UI updates.
...
Storage volumes now have headers with larger fonts and progress bars
to show used versus free space. Updated Memory to use new formatting
template, and Data Usage to use consistent display logic.
Allocate a unique color for each private volume, and yell when a
volume is running low on space. Update private volume details to
launch into MediaStore-backed storage backends in a management mode,
and only show detailed items when hosting emulated storage. Show
details dialog about "Other" and user storage items.
Shortcut into single private volume when it's the only device. Add
real eject icon.
Bug: 21756698, 20275574, 21326612
Change-Id: If3ecd1d912d3e709c09d3e4da24f368e04dd3f9d
2015-06-15 21:44:21 -07:00
Jim Miller
3a5c865292
am 861a64e8: am 6364e0a2: am a4f8aae4: Merge "Limit number of fingerprint templates that can be enrolled per device user" into mnc-dev
...
* commit '861a64e8bfb3b77709a50f2223c355f43bfb867a':
Limit number of fingerprint templates that can be enrolled per device user
2015-06-16 04:22:00 +00:00
Jim Miller
861a64e8bf
am 6364e0a2: am a4f8aae4: Merge "Limit number of fingerprint templates that can be enrolled per device user" into mnc-dev
...
* commit '6364e0a26a04cc048e8a0ff1dd9c0ed90cd45295':
Limit number of fingerprint templates that can be enrolled per device user
2015-06-16 04:10:57 +00:00
Jim Miller
6364e0a26a
am a4f8aae4: Merge "Limit number of fingerprint templates that can be enrolled per device user" into mnc-dev
...
* commit 'a4f8aae4be4040685f88c79006d2cfee42f96504':
Limit number of fingerprint templates that can be enrolled per device user
2015-06-16 04:00:37 +00:00
Jim Miller
5adada6083
Limit number of fingerprint templates that can be enrolled per device user
...
This change places an upper limit on the number of fingerprint templates that
can be enrolled per account. This is done primarily for performance reasons, but
may also be imposed by hardware and Trusted Execution Environment (TEE) reasons.
Fixes bug 20731847
Change-Id: I3975290fa8eb2106467493aab6102015697e012c
On branch max_fingerprint
2015-06-15 20:44:45 -07:00
John Spurlock
7daab48484
am f2903eda: am 3fdfabcd: am dddd589d: Merge "Settings: Remove unreachable "Battery Info" screen." into mnc-dev
...
* commit 'f2903edadcc785135fb07a26655bf80476da35ab':
Settings: Remove unreachable "Battery Info" screen.
2015-06-15 20:14:24 +00:00
John Spurlock
f2903edadc
am 3fdfabcd: am dddd589d: Merge "Settings: Remove unreachable "Battery Info" screen." into mnc-dev
...
* commit '3fdfabcd4576b27c37608656c277686d73833b57':
Settings: Remove unreachable "Battery Info" screen.
2015-06-15 20:01:55 +00:00