Commit Graph

8805 Commits

Author SHA1 Message Date
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
Jeff Sharkey
f322f66362 am 122b4d73: am 2ef947be: am 4e42cbdb: Merge "Gracefully finish when missing volume." into mnc-dev
* commit '122b4d735f2f83ead436f4d6067ad1718c701004':
  Gracefully finish when missing volume.
2015-06-17 00:20:02 +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
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
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
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
Makoto Onuki
bb2fdb5e92 am 3f507b2f: am abf80cb1: am d91ddfeb: Merge "Allow formatting when a partition is corrupt." into mnc-dev
* commit '3f507b2fbdbb8d1daac4703d365a740dbc4623f4':
  Allow formatting when a partition is corrupt.
2015-06-16 23:00:44 +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
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
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
Yorke Lee
cec33e9fec am c47e89a4: am 0d736b59: am 610413d3: Merge "Send broadcast when default dialer changes" into mnc-dev
* commit 'c47e89a44c388fa7cb650592878730e3e814a4ed':
  Send broadcast when default dialer changes
2015-06-16 21:42:54 +00:00
Jason Monk
d072a80de5 am 9afed461: am 20d32181: am d0eab40a: Merge "Don\'t show work apps in ignore optimizations list" into mnc-dev
* commit '9afed461061b7e07e0285df68ab587a0455cfe8f':
  Don't show work apps in ignore optimizations list
2015-06-16 21:42:52 +00:00
Jason Monk
00e9562589 am 18c5d20b: am 0af2586a: am 455cea62: Merge "Add warning for disabling usage access on prof owners" into mnc-dev
* commit '18c5d20bd3acc0048b08aba6ab0d03f882118a53':
  Add warning for disabling usage access on prof owners
2015-06-16 21:42:50 +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
29a099193e am 464ad14d: am 808f7826: am 6e613472: Start all help intents as startActivityForResult
* commit '464ad14d376358a8162854591f44071919c87a75':
  Start all help intents as startActivityForResult
2015-06-16 21:42:44 +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
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
e9ec307a05 Merge "Remove theme setting DO NOT MERGE" into mnc-dev 2015-06-16 20:49:55 +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
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
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
23ba5d357f am 57922a1e: am a26765c4: am 9a5550e9: Check new user restriction.
* commit '57922a1ed4caa8b062ad0781aa52c38a59b8d8a7':
  Check new user restriction.
2015-06-16 05:40:30 +00: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
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