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
Jeff Sharkey
122b4d735f
am 2ef947be
: am 4e42cbdb
: Merge "Gracefully finish when missing volume." into mnc-dev
...
* commit '2ef947be79e6ecf5d5e8acfb054247a8902d7993':
Gracefully finish when missing volume.
2015-06-17 00:09:43 +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
Jeff Sharkey
2ef947be79
am 4e42cbdb
: Merge "Gracefully finish when missing volume." into mnc-dev
...
* commit '4e42cbdba386a742b01871010ec8747e07471e29':
Gracefully finish when missing volume.
2015-06-16 23:56:37 +00:00
Jeff Sharkey
4e42cbdba3
Merge "Gracefully finish when missing volume." into mnc-dev
2015-06-16 23:48:07 +00:00
Jeff Sharkey
e79ff145f3
Gracefully finish when missing volume.
...
Bug: 21403958
Change-Id: Icb78bb633842571c4df696c9db72a5b97ece0655
2015-06-16 16:46:03 -07: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
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
Makoto Onuki
3f507b2fbd
am abf80cb1
: am d91ddfeb
: Merge "Allow formatting when a partition is corrupt." into mnc-dev
...
* commit 'abf80cb1d058aa96abd29a329a6f79b6e62acad9':
Allow formatting when a partition is corrupt.
2015-06-16 22:49:19 +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
Makoto Onuki
abf80cb1d0
am d91ddfeb
: Merge "Allow formatting when a partition is corrupt." into mnc-dev
...
* commit 'd91ddfeb16f3019807e2d0146f774975acef36bd':
Allow formatting when a partition is corrupt.
2015-06-16 22:36:05 +00:00
Jeff Sharkey
95b891af7c
Merge "Finish storage wizard theming." into mnc-dev
2015-06-16 22:31:29 +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
Makoto Onuki
d91ddfeb16
Merge "Allow formatting when a partition is corrupt." into mnc-dev
2015-06-16 22:27:09 +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
Yorke Lee
c47e89a44c
am 0d736b59
: am 610413d3
: Merge "Send broadcast when default dialer changes" into mnc-dev
...
* commit '0d736b59d88ffd7dd5ea7c823669d69dcf14737e':
Send broadcast when default dialer changes
2015-06-16 21:23:13 +00:00
Jason Monk
9afed46106
am 20d32181
: am d0eab40a
: Merge "Don\'t show work apps in ignore optimizations list" into mnc-dev
...
* commit '20d3218182fa24dfba48adab8002af383cfe2ae7':
Don't show work apps in ignore optimizations list
2015-06-16 21:23:12 +00:00
Jason Monk
18c5d20bd3
am 0af2586a
: am 455cea62
: Merge "Add warning for disabling usage access on prof owners" into mnc-dev
...
* commit '0af2586ad75e64f3c8bc12dccbad2d64ef208159':
Add warning for disabling usage access on prof owners
2015-06-16 21:23:10 +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
464ad14d37
am 808f7826
: am 6e613472
: Start all help intents as startActivityForResult
...
* commit '808f7826b1259c6f0344d5273b7855c93cfe44f7':
Start all help intents as startActivityForResult
2015-06-16 21:23:08 +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
Makoto Onuki
7ccea2f19a
Allow formatting when a partition is corrupt.
...
Bug 21848166
Change-Id: Ied8efaa1320c49a01ae08f19461bf125b3ffa97f
2015-06-16 14:22:33 -07: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
Jason Monk
77537b697b
Support disabled until used apps
...
Bug: 21782239
Change-Id: I59bef6689a9efb74f64827026add0cbddc18cf53
2015-06-16 16:18:30 -04:00
Yorke Lee
0d736b59d8
am 610413d3
: Merge "Send broadcast when default dialer changes" into mnc-dev
...
* commit '610413d307f0a65b26d2ffb04f8389c1fe568029':
Send broadcast when default dialer changes
2015-06-16 20:08:30 +00:00
Jason Monk
20d3218182
am d0eab40a
: Merge "Don\'t show work apps in ignore optimizations list" into mnc-dev
...
* commit 'd0eab40a573bd03aec558615c9f8806848ef11c8':
Don't show work apps in ignore optimizations list
2015-06-16 20:08:28 +00:00
Jason Monk
0af2586ad7
am 455cea62
: Merge "Add warning for disabling usage access on prof owners" into mnc-dev
...
* commit '455cea62ebd137dc1a2089709aa701715fdfe395':
Add warning for disabling usage access on prof owners
2015-06-16 20:07:07 +00: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
808f7826b1
am 6e613472
: Start all help intents as startActivityForResult
...
* commit '6e61347242ea8d9ac0645b2669f222696c65eec6':
Start all help intents as startActivityForResult
2015-06-16 20:06:44 +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
Yorke Lee
610413d307
Merge "Send broadcast when default dialer changes" into mnc-dev
2015-06-16 19:30:14 +00:00
Jason Monk
d0eab40a57
Merge "Don't show work apps in ignore optimizations list" into mnc-dev
2015-06-16 19:26:41 +00:00
Jason Monk
7c866c51cd
Guard against callbacks when no list view created
...
Bug: 21762925
Change-Id: If4bdaa6cf107c4b890a8ebeb56ba4ef222a340ad
2015-06-16 15:11:41 -04:00
Jason Monk
6ecca51254
Don't show work apps in ignore optimizations list
...
The setting is global, so we only ever need one of each app.
Bug: 21847753
Change-Id: Ib04061d87b9deb81a579ad110451f2f55ec7aeff
2015-06-16 14:18:26 -04:00
Jason Monk
455cea62eb
Merge "Add warning for disabling usage access on prof owners" into mnc-dev
2015-06-16 16:46:48 +00:00
Jason Monk
ec1c45c25d
Add warning for disabling usage access on prof owners
...
Bug: 20751702
Change-Id: Id0f54f06c3bf05c32a973ad805c116cbae96028a
2015-06-16 11:26:26 -04: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
6e61347242
Start all help intents as startActivityForResult
...
So that the receiver may verify identity if they so desire...
Bug: 21849741
Change-Id: I2e2c3f674a8be88f22e051e2affb54df2f1c3eed
2015-06-16 10:31:38 -04: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
57922a1ed4
am a26765c4
: am 9a5550e9
: Check new user restriction.
...
* commit 'a26765c461168f745913d505d6e993181e896a19':
Check new user restriction.
2015-06-16 05:28:40 +00:00