OSDN Git Service

android-x86/packages-apps-Settings.git
9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 17 Jun 2015 14:29:22 +0000 (14:29 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 17 Jun 2015 14:27:41 +0000 (07:27 -0700)]
Import translations. DO NOT MERGE

Change-Id: I74442ac6e0aab88878469be16d6518bd1af75861
Auto-generated-cl: translation import

9 years agoam f424ccf7: (-s ours) am 5c2de952: am 7fdb1478: RIP -night DO NOT MERGE
Jason Monk [Wed, 17 Jun 2015 13:58:35 +0000 (13:58 +0000)]
am f424ccf7: (-s ours) am 5c2de952: am 7fdb1478: RIP -night DO NOT MERGE

* commit 'f424ccf7433be32c9bf9c29d388beb0e6fe94267':
  RIP -night DO NOT MERGE

9 years agoam 5c2de952: am 7fdb1478: RIP -night DO NOT MERGE
Jason Monk [Wed, 17 Jun 2015 13:47:00 +0000 (13:47 +0000)]
am 5c2de952: am 7fdb1478: RIP -night DO NOT MERGE

* commit '5c2de952e5e7f2501df7a5a94794e526902e47a3':
  RIP -night DO NOT MERGE

9 years agoam 7fdb1478: RIP -night DO NOT MERGE
Jason Monk [Wed, 17 Jun 2015 13:37:31 +0000 (13:37 +0000)]
am 7fdb1478: RIP -night DO NOT MERGE

* commit '7fdb1478728ed7eaab956da476540b3e9c97b9b3':
  RIP -night DO NOT MERGE

9 years agoam 840164a2: am 2abd5be3: am 7a5cb3b9: Merge "Guard against callbacks when no list...
Jason Monk [Wed, 17 Jun 2015 13:32:58 +0000 (13:32 +0000)]
am 840164a2: am 2abd5be3: am 7a5cb3b9: Merge "Guard against callbacks when no list view created" into mnc-dev

* commit '840164a21ce2fa6638e4e2175bb1e36d4335f4a1':
  Guard against callbacks when no list view created

9 years agoam 2abd5be3: am 7a5cb3b9: Merge "Guard against callbacks when no list view created...
Jason Monk [Wed, 17 Jun 2015 13:23:09 +0000 (13:23 +0000)]
am 2abd5be3: am 7a5cb3b9: Merge "Guard against callbacks when no list view created" into mnc-dev

* commit '2abd5be388fe29e0a70a4e69f95d6dcc56004a58':
  Guard against callbacks when no list view created

9 years agoRIP -night DO NOT MERGE
Jason Monk [Wed, 17 Jun 2015 13:17:31 +0000 (09:17 -0400)]
RIP -night DO NOT MERGE

Bug: 21854466
Change-Id: Ied1512cb1d8c80df9f6c990f8f91f82d7f140533

9 years agoam 7a5cb3b9: Merge "Guard against callbacks when no list view created" into mnc-dev
Jason Monk [Wed, 17 Jun 2015 13:09:18 +0000 (13:09 +0000)]
am 7a5cb3b9: Merge "Guard against callbacks when no list view created" into mnc-dev

* commit '7a5cb3b9c34af2215bdaaddba976f04bbafd06eb':
  Guard against callbacks when no list view created

9 years agoMerge "Guard against callbacks when no list view created" into mnc-dev
Jason Monk [Wed, 17 Jun 2015 13:01:27 +0000 (13:01 +0000)]
Merge "Guard against callbacks when no list view created" into mnc-dev

9 years agoam a39077c9: am 67832cc3: am 74c7f1fc: Merge "Actually gracefully finish this time...
Jeff Sharkey [Wed, 17 Jun 2015 03:54:31 +0000 (03:54 +0000)]
am a39077c9: am 67832cc3: am 74c7f1fc: Merge "Actually gracefully finish this time around." into mnc-dev

* commit 'a39077c95bb51102e77e55a2d4e352f8027d5c24':
  Actually gracefully finish this time around.

9 years agoam 67832cc3: am 74c7f1fc: Merge "Actually gracefully finish this time around." into...
Jeff Sharkey [Wed, 17 Jun 2015 03:45:06 +0000 (03:45 +0000)]
am 67832cc3: am 74c7f1fc: Merge "Actually gracefully finish this time around." into mnc-dev

* commit '67832cc3984665cf55ac3d4afc5fdbb76326f1a0':
  Actually gracefully finish this time around.

9 years agoam 74c7f1fc: Merge "Actually gracefully finish this time around." into mnc-dev
Jeff Sharkey [Wed, 17 Jun 2015 03:31:44 +0000 (03:31 +0000)]
am 74c7f1fc: Merge "Actually gracefully finish this time around." into mnc-dev

* commit '74c7f1fcd3451bdb5b49f2b44b86fd4ec8eb6794':
  Actually gracefully finish this time around.

9 years agoMerge "Actually gracefully finish this time around." into mnc-dev
Jeff Sharkey [Wed, 17 Jun 2015 03:23:58 +0000 (03:23 +0000)]
Merge "Actually gracefully finish this time around." into mnc-dev

9 years agoActually gracefully finish this time around.
Jeff Sharkey [Wed, 17 Jun 2015 03:11:44 +0000 (20:11 -0700)]
Actually gracefully finish this time around.

Also fix tinting on front-door icon.

Bug: 21403958
Change-Id: I74f0372a41b92235abe10391f36d9f6a1e6a40c5

9 years agoam 8b5943c2: am dd0d9854: am 4b60af78: Merge "Fix issue with german translation of...
Jim Miller [Wed, 17 Jun 2015 00:33:52 +0000 (00:33 +0000)]
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

9 years agoam dd0d9854: am 4b60af78: Merge "Fix issue with german translation of lock times...
Jim Miller [Wed, 17 Jun 2015 00:20:35 +0000 (00:20 +0000)]
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

9 years agoam 122b4d73: am 2ef947be: am 4e42cbdb: Merge "Gracefully finish when missing volume...
Jeff Sharkey [Wed, 17 Jun 2015 00:20:02 +0000 (00:20 +0000)]
am 122b4d73: am 2ef947be: am 4e42cbdb: Merge "Gracefully finish when missing volume." into mnc-dev

* commit '122b4d735f2f83ead436f4d6067ad1718c701004':
  Gracefully finish when missing volume.

9 years agoam 4b60af78: Merge "Fix issue with german translation of lock times" into mnc-dev
Jim Miller [Wed, 17 Jun 2015 00:09:52 +0000 (00:09 +0000)]
am 4b60af78: Merge "Fix issue with german translation of lock times" into mnc-dev

* commit '4b60af78fa8b0c474c9aee0f03171867843d2838':
  Fix issue with german translation of lock times

9 years agoam 2ef947be: am 4e42cbdb: Merge "Gracefully finish when missing volume." into mnc-dev
Jeff Sharkey [Wed, 17 Jun 2015 00:09:43 +0000 (00:09 +0000)]
am 2ef947be: am 4e42cbdb: Merge "Gracefully finish when missing volume." into mnc-dev

* commit '2ef947be79e6ecf5d5e8acfb054247a8902d7993':
  Gracefully finish when missing volume.

9 years agoMerge "Fix issue with german translation of lock times" into mnc-dev
Jim Miller [Tue, 16 Jun 2015 23:59:36 +0000 (23:59 +0000)]
Merge "Fix issue with german translation of lock times" into mnc-dev

9 years agoam 4e42cbdb: Merge "Gracefully finish when missing volume." into mnc-dev
Jeff Sharkey [Tue, 16 Jun 2015 23:56:37 +0000 (23:56 +0000)]
am 4e42cbdb: Merge "Gracefully finish when missing volume." into mnc-dev

* commit '4e42cbdba386a742b01871010ec8747e07471e29':
  Gracefully finish when missing volume.

9 years agoMerge "Gracefully finish when missing volume." into mnc-dev
Jeff Sharkey [Tue, 16 Jun 2015 23:48:06 +0000 (23:48 +0000)]
Merge "Gracefully finish when missing volume." into mnc-dev

9 years agoGracefully finish when missing volume.
Jeff Sharkey [Tue, 16 Jun 2015 23:46:03 +0000 (16:46 -0700)]
Gracefully finish when missing volume.

Bug: 21403958
Change-Id: Icb78bb633842571c4df696c9db72a5b97ece0655

9 years agoam 99c1009a: am 49d73c03: am 94f4cb4e: Merge "dex2oat should show something friendlie...
Brian Carlstrom [Tue, 16 Jun 2015 23:25:53 +0000 (23:25 +0000)]
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

9 years agoFix issue with german translation of lock times
Jim Miller [Tue, 16 Jun 2015 23:21:27 +0000 (16:21 -0700)]
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

9 years agoam 49d73c03: am 94f4cb4e: Merge "dex2oat should show something friendlier in Settings...
Brian Carlstrom [Tue, 16 Jun 2015 23:18:33 +0000 (23:18 +0000)]
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

9 years agoam 94f4cb4e: Merge "dex2oat should show something friendlier in Settings -> Battery...
Brian Carlstrom [Tue, 16 Jun 2015 23:07:52 +0000 (23:07 +0000)]
am 94f4cb4e: Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev

* commit '94f4cb4e4660db823d268d14eb1199dbc11f8e86':
  dex2oat should show something friendlier in Settings -> Battery

9 years agoam aa1e5f2f: am 5fafa130: am 95b891af: Merge "Finish storage wizard theming." into...
Jeff Sharkey [Tue, 16 Jun 2015 23:00:45 +0000 (23:00 +0000)]
am aa1e5f2f: am 5fafa130: am 95b891af: Merge "Finish storage wizard theming." into mnc-dev

* commit 'aa1e5f2f001aa7cc39ce4b0c5974bfc47a8d96fa':
  Finish storage wizard theming.

9 years agoam 3f507b2f: am abf80cb1: am d91ddfeb: Merge "Allow formatting when a partition is...
Makoto Onuki [Tue, 16 Jun 2015 23:00:44 +0000 (23:00 +0000)]
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.

9 years agoMerge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev
Brian Carlstrom [Tue, 16 Jun 2015 22:59:03 +0000 (22:59 +0000)]
Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev

9 years agoam 5fafa130: am 95b891af: Merge "Finish storage wizard theming." into mnc-dev
Jeff Sharkey [Tue, 16 Jun 2015 22:49:20 +0000 (22:49 +0000)]
am 5fafa130: am 95b891af: Merge "Finish storage wizard theming." into mnc-dev

* commit '5fafa130ec8f031310e5372a89034057053fa634':
  Finish storage wizard theming.

9 years agoam abf80cb1: am d91ddfeb: Merge "Allow formatting when a partition is corrupt." into...
Makoto Onuki [Tue, 16 Jun 2015 22:49:19 +0000 (22:49 +0000)]
am abf80cb1: am d91ddfeb: Merge "Allow formatting when a partition is corrupt." into mnc-dev

* commit 'abf80cb1d058aa96abd29a329a6f79b6e62acad9':
  Allow formatting when a partition is corrupt.

9 years agoam 95b891af: Merge "Finish storage wizard theming." into mnc-dev
Jeff Sharkey [Tue, 16 Jun 2015 22:36:06 +0000 (22:36 +0000)]
am 95b891af: Merge "Finish storage wizard theming." into mnc-dev

* commit '95b891af7c77d51f6284e01467bd6323d3749068':
  Finish storage wizard theming.

9 years agoam d91ddfeb: Merge "Allow formatting when a partition is corrupt." into mnc-dev
Makoto Onuki [Tue, 16 Jun 2015 22:36:05 +0000 (22:36 +0000)]
am d91ddfeb: Merge "Allow formatting when a partition is corrupt." into mnc-dev

* commit 'd91ddfeb16f3019807e2d0146f774975acef36bd':
  Allow formatting when a partition is corrupt.

9 years agoMerge "Finish storage wizard theming." into mnc-dev
Jeff Sharkey [Tue, 16 Jun 2015 22:31:27 +0000 (22:31 +0000)]
Merge "Finish storage wizard theming." into mnc-dev

9 years agoFinish storage wizard theming.
Jeff Sharkey [Tue, 16 Jun 2015 20:52:10 +0000 (13:52 -0700)]
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

9 years agoMerge "Allow formatting when a partition is corrupt." into mnc-dev
Makoto Onuki [Tue, 16 Jun 2015 22:27:08 +0000 (22:27 +0000)]
Merge "Allow formatting when a partition is corrupt." into mnc-dev

9 years agoam 24db3674: (-s ours) am 283c469d: am e9ec307a: Merge "Remove theme setting DO NOT...
Jason Monk [Tue, 16 Jun 2015 21:42:57 +0000 (21:42 +0000)]
am 24db3674: (-s ours) am 283c469d: am e9ec307a: Merge "Remove theme setting DO NOT MERGE" into mnc-dev

* commit '24db3674afa127756252c0220a431722a0d362f7':
  Remove theme setting DO NOT MERGE

9 years agoam 23d6ab34: am fbebf8cf: am 254e8aea: Merge "Update for shortcuts" into mnc-dev
Jason Monk [Tue, 16 Jun 2015 21:42:56 +0000 (21:42 +0000)]
am 23d6ab34: am fbebf8cf: am 254e8aea: Merge "Update for shortcuts" into mnc-dev

* commit '23d6ab342affc30fb101d2481aeb6d497b857d49':
  Update for shortcuts

9 years agoam c47e89a4: am 0d736b59: am 610413d3: Merge "Send broadcast when default dialer...
Yorke Lee [Tue, 16 Jun 2015 21:42:54 +0000 (21:42 +0000)]
am c47e89a4: am 0d736b59: am 610413d3: Merge "Send broadcast when default dialer changes" into mnc-dev

* commit 'c47e89a44c388fa7cb650592878730e3e814a4ed':
  Send broadcast when default dialer changes

9 years agoam 9afed461: am 20d32181: am d0eab40a: Merge "Don\'t show work apps in ignore optimiz...
Jason Monk [Tue, 16 Jun 2015 21:42:52 +0000 (21:42 +0000)]
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

9 years agoam 18c5d20b: am 0af2586a: am 455cea62: Merge "Add warning for disabling usage access...
Jason Monk [Tue, 16 Jun 2015 21:42:50 +0000 (21:42 +0000)]
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

9 years agoam 3c2f469b: am fc4e9cbd: am 7171d686: Merge "Add PBAP checkbox for BT pairing consen...
Sanket Padawe [Tue, 16 Jun 2015 21:42:47 +0000 (21:42 +0000)]
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.

9 years agoam 464ad14d: am 808f7826: am 6e613472: Start all help intents as startActivityForResult
Jason Monk [Tue, 16 Jun 2015 21:42:44 +0000 (21:42 +0000)]
am 464ad14d: am 808f7826: am 6e613472: Start all help intents as startActivityForResult

* commit '464ad14d376358a8162854591f44071919c87a75':
  Start all help intents as startActivityForResult

9 years agoam 27fe38eb: am 4c1f455c: am 744f2adb: Merge "Layout refinement for app lists" into...
Jason Monk [Tue, 16 Jun 2015 21:42:43 +0000 (21:42 +0000)]
am 27fe38eb: am 4c1f455c: am 744f2adb: Merge "Layout refinement for app lists" into mnc-dev

* commit '27fe38eb2c3b10d28c570ae60221c7ae5c54dcbd':
  Layout refinement for app lists

9 years agoam 283c469d: am e9ec307a: Merge "Remove theme setting DO NOT MERGE" into mnc-dev
Jason Monk [Tue, 16 Jun 2015 21:26:03 +0000 (21:26 +0000)]
am 283c469d: am e9ec307a: Merge "Remove theme setting DO NOT MERGE" into mnc-dev

* commit '283c469dc82841827d3dd2e7052f68c5e71f1425':
  Remove theme setting DO NOT MERGE

9 years agoam fbebf8cf: am 254e8aea: Merge "Update for shortcuts" into mnc-dev
Jason Monk [Tue, 16 Jun 2015 21:25:48 +0000 (21:25 +0000)]
am fbebf8cf: am 254e8aea: Merge "Update for shortcuts" into mnc-dev

* commit 'fbebf8cfc4a612b6708d024ce71e8069e87cd310':
  Update for shortcuts

9 years agoam 0d736b59: am 610413d3: Merge "Send broadcast when default dialer changes" into...
Yorke Lee [Tue, 16 Jun 2015 21:23:13 +0000 (21:23 +0000)]
am 0d736b59: am 610413d3: Merge "Send broadcast when default dialer changes" into mnc-dev

* commit '0d736b59d88ffd7dd5ea7c823669d69dcf14737e':
  Send broadcast when default dialer changes

9 years agoam 20d32181: am d0eab40a: Merge "Don\'t show work apps in ignore optimizations list...
Jason Monk [Tue, 16 Jun 2015 21:23:12 +0000 (21:23 +0000)]
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

9 years agoam 0af2586a: am 455cea62: Merge "Add warning for disabling usage access on prof owner...
Jason Monk [Tue, 16 Jun 2015 21:23:10 +0000 (21:23 +0000)]
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

9 years agoam fc4e9cbd: am 7171d686: Merge "Add PBAP checkbox for BT pairing consent dialog...
Sanket Padawe [Tue, 16 Jun 2015 21:23:09 +0000 (21:23 +0000)]
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.

9 years agoam 808f7826: am 6e613472: Start all help intents as startActivityForResult
Jason Monk [Tue, 16 Jun 2015 21:23:08 +0000 (21:23 +0000)]
am 808f7826: am 6e613472: Start all help intents as startActivityForResult

* commit '808f7826b1259c6f0344d5273b7855c93cfe44f7':
  Start all help intents as startActivityForResult

9 years agoam 4c1f455c: am 744f2adb: Merge "Layout refinement for app lists" into mnc-dev
Jason Monk [Tue, 16 Jun 2015 21:23:07 +0000 (21:23 +0000)]
am 4c1f455c: am 744f2adb: Merge "Layout refinement for app lists" into mnc-dev

* commit '4c1f455cac4ed69a1dec0ce5c75323301d288e1b':
  Layout refinement for app lists

9 years agoAllow formatting when a partition is corrupt.
Makoto Onuki [Tue, 16 Jun 2015 17:40:44 +0000 (10:40 -0700)]
Allow formatting when a partition is corrupt.

Bug 21848166

Change-Id: Ied8efaa1320c49a01ae08f19461bf125b3ffa97f

9 years agoam e9ec307a: Merge "Remove theme setting DO NOT MERGE" into mnc-dev
Jason Monk [Tue, 16 Jun 2015 21:03:11 +0000 (21:03 +0000)]
am e9ec307a: Merge "Remove theme setting DO NOT MERGE" into mnc-dev

* commit 'e9ec307a057618ff40b9988684761a778f9301d4':
  Remove theme setting DO NOT MERGE

9 years agoMerge "Remove theme setting DO NOT MERGE" into mnc-dev
Jason Monk [Tue, 16 Jun 2015 20:49:54 +0000 (20:49 +0000)]
Merge "Remove theme setting DO NOT MERGE" into mnc-dev

9 years agoam 254e8aea: Merge "Update for shortcuts" into mnc-dev
Jason Monk [Tue, 16 Jun 2015 20:45:22 +0000 (20:45 +0000)]
am 254e8aea: Merge "Update for shortcuts" into mnc-dev

* commit '254e8aea22f36c90587315a58aeefda9683581eb':
  Update for shortcuts

9 years agoRemove theme setting DO NOT MERGE
Jason Monk [Tue, 16 Jun 2015 20:40:50 +0000 (16:40 -0400)]
Remove theme setting DO NOT MERGE

Because it's just too incredibly useful...

Bug: 21854466
Change-Id: I984cf709f484a220e9ba7738a8b9c166c28573b2

9 years agoMerge "Update for shortcuts" into mnc-dev
Jason Monk [Tue, 16 Jun 2015 20:36:45 +0000 (20:36 +0000)]
Merge "Update for shortcuts" into mnc-dev

9 years agoUpdate for shortcuts
Jason Monk [Tue, 16 Jun 2015 19:00:41 +0000 (15:00 -0400)]
Update for shortcuts

Change-Id: If28d540fd9e300b9c26d5cb6869be3d475124e9e

9 years agoam 610413d3: Merge "Send broadcast when default dialer changes" into mnc-dev
Yorke Lee [Tue, 16 Jun 2015 20:08:30 +0000 (20:08 +0000)]
am 610413d3: Merge "Send broadcast when default dialer changes" into mnc-dev

* commit '610413d307f0a65b26d2ffb04f8389c1fe568029':
  Send broadcast when default dialer changes

9 years agoam d0eab40a: Merge "Don\'t show work apps in ignore optimizations list" into mnc-dev
Jason Monk [Tue, 16 Jun 2015 20:08:28 +0000 (20:08 +0000)]
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

9 years agoam 455cea62: Merge "Add warning for disabling usage access on prof owners" into mnc-dev
Jason Monk [Tue, 16 Jun 2015 20:07:07 +0000 (20:07 +0000)]
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

9 years agoam 7171d686: Merge "Add PBAP checkbox for BT pairing consent dialog." into mnc-dev
Sanket Padawe [Tue, 16 Jun 2015 20:06:46 +0000 (20:06 +0000)]
am 7171d686: Merge "Add PBAP checkbox for BT pairing consent dialog." into mnc-dev

* commit '7171d6864fb4d8c1838b4ef1d65b6bb5274d3b53':
  Add PBAP checkbox for BT pairing consent dialog.

9 years agoam 6e613472: Start all help intents as startActivityForResult
Jason Monk [Tue, 16 Jun 2015 20:06:44 +0000 (20:06 +0000)]
am 6e613472: Start all help intents as startActivityForResult

* commit '6e61347242ea8d9ac0645b2669f222696c65eec6':
  Start all help intents as startActivityForResult

9 years agoam 744f2adb: Merge "Layout refinement for app lists" into mnc-dev
Jason Monk [Tue, 16 Jun 2015 20:06:29 +0000 (20:06 +0000)]
am 744f2adb: Merge "Layout refinement for app lists" into mnc-dev

* commit '744f2adb56ac0077a103c8e6e3b20f421eddc780':
  Layout refinement for app lists

9 years agoMerge "Send broadcast when default dialer changes" into mnc-dev
Yorke Lee [Tue, 16 Jun 2015 19:30:13 +0000 (19:30 +0000)]
Merge "Send broadcast when default dialer changes" into mnc-dev

9 years agoMerge "Don't show work apps in ignore optimizations list" into mnc-dev
Jason Monk [Tue, 16 Jun 2015 19:26:40 +0000 (19:26 +0000)]
Merge "Don't show work apps in ignore optimizations list" into mnc-dev

9 years agoGuard against callbacks when no list view created
Jason Monk [Tue, 16 Jun 2015 19:11:41 +0000 (15:11 -0400)]
Guard against callbacks when no list view created

Bug: 21762925
Change-Id: If4bdaa6cf107c4b890a8ebeb56ba4ef222a340ad

9 years agoDon't show work apps in ignore optimizations list
Jason Monk [Tue, 16 Jun 2015 18:18:26 +0000 (14:18 -0400)]
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

9 years agoMerge "Add warning for disabling usage access on prof owners" into mnc-dev
Jason Monk [Tue, 16 Jun 2015 16:46:46 +0000 (16:46 +0000)]
Merge "Add warning for disabling usage access on prof owners" into mnc-dev

9 years agoAdd warning for disabling usage access on prof owners
Jason Monk [Tue, 16 Jun 2015 13:10:00 +0000 (09:10 -0400)]
Add warning for disabling usage access on prof owners

Bug: 20751702
Change-Id: Id0f54f06c3bf05c32a973ad805c116cbae96028a

9 years agoMerge "Add PBAP checkbox for BT pairing consent dialog." into mnc-dev
Sanket Padawe [Tue, 16 Jun 2015 15:24:04 +0000 (15:24 +0000)]
Merge "Add PBAP checkbox for BT pairing consent dialog." into mnc-dev

9 years agoStart all help intents as startActivityForResult
Jason Monk [Tue, 16 Jun 2015 14:31:38 +0000 (10:31 -0400)]
Start all help intents as startActivityForResult

So that the receiver may verify identity if they so desire...

Bug: 21849741
Change-Id: I2e2c3f674a8be88f22e051e2affb54df2f1c3eed

9 years agoMerge "Layout refinement for app lists" into mnc-dev
Jason Monk [Tue, 16 Jun 2015 13:17:01 +0000 (13:17 +0000)]
Merge "Layout refinement for app lists" into mnc-dev

9 years agoLayout refinement for app lists
Jason Monk [Fri, 12 Jun 2015 16:32:50 +0000 (12:32 -0400)]
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

9 years agoam 57922a1e: am a26765c4: am 9a5550e9: Check new user restriction.
Jeff Sharkey [Tue, 16 Jun 2015 05:40:30 +0000 (05:40 +0000)]
am 57922a1e: am a26765c4: am 9a5550e9: Check new user restriction.

* commit '57922a1ed4caa8b062ad0781aa52c38a59b8d8a7':
  Check new user restriction.

9 years agoam a26765c4: am 9a5550e9: Check new user restriction.
Jeff Sharkey [Tue, 16 Jun 2015 05:28:40 +0000 (05:28 +0000)]
am a26765c4: am 9a5550e9: Check new user restriction.

* commit 'a26765c461168f745913d505d6e993181e896a19':
  Check new user restriction.

9 years agoam 9a5550e9: Check new user restriction.
Jeff Sharkey [Tue, 16 Jun 2015 05:16:50 +0000 (05:16 +0000)]
am 9a5550e9: Check new user restriction.

* commit '9a5550e9e6efe211b03d067eae2689f6ef5eb2d1':
  Check new user restriction.

9 years agoam 96b09cf5: am 3538eb24: am 71c89a17: Merge "More storage UI updates." into mnc-dev
Jeff Sharkey [Tue, 16 Jun 2015 05:16:43 +0000 (05:16 +0000)]
am 96b09cf5: am 3538eb24: am 71c89a17: Merge "More storage UI updates." into mnc-dev

* commit '96b09cf59f7554b05004fa7f8ad6da1c73e8f545':
  More storage UI updates.

9 years agoam 3538eb24: am 71c89a17: Merge "More storage UI updates." into mnc-dev
Jeff Sharkey [Tue, 16 Jun 2015 05:06:00 +0000 (05:06 +0000)]
am 3538eb24: am 71c89a17: Merge "More storage UI updates." into mnc-dev

* commit '3538eb2410808484b8110d83543d6c926fa870c4':
  More storage UI updates.

9 years agoam 71c89a17: Merge "More storage UI updates." into mnc-dev
Jeff Sharkey [Tue, 16 Jun 2015 04:57:43 +0000 (04:57 +0000)]
am 71c89a17: Merge "More storage UI updates." into mnc-dev

* commit '71c89a171acb1ddd63d10189c39c07134987bd2f':
  More storage UI updates.

9 years agoCheck new user restriction.
Jeff Sharkey [Fri, 20 Mar 2015 18:25:22 +0000 (11:25 -0700)]
Check new user restriction.

Change-Id: I8891a4347478c243a3f1a14cf8cdf9b4784c9fab

9 years agoMerge "More storage UI updates." into mnc-dev
Jeff Sharkey [Tue, 16 Jun 2015 04:47:16 +0000 (04:47 +0000)]
Merge "More storage UI updates." into mnc-dev

9 years agoMore storage UI updates.
Jeff Sharkey [Tue, 16 Jun 2015 04:08:56 +0000 (21:08 -0700)]
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: 217566982027557421326612
Change-Id: If3ecd1d912d3e709c09d3e4da24f368e04dd3f9d

9 years agoam 861a64e8: am 6364e0a2: am a4f8aae4: Merge "Limit number of fingerprint templates...
Jim Miller [Tue, 16 Jun 2015 04:22:00 +0000 (04:22 +0000)]
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

9 years agoam 6364e0a2: am a4f8aae4: Merge "Limit number of fingerprint templates that can be...
Jim Miller [Tue, 16 Jun 2015 04:10:57 +0000 (04:10 +0000)]
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

9 years agoam a4f8aae4: Merge "Limit number of fingerprint templates that can be enrolled per...
Jim Miller [Tue, 16 Jun 2015 04:00:37 +0000 (04:00 +0000)]
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

9 years agoMerge "Limit number of fingerprint templates that can be enrolled per device user...
Jim Miller [Tue, 16 Jun 2015 03:48:55 +0000 (03:48 +0000)]
Merge "Limit number of fingerprint templates that can be enrolled per device user" into mnc-dev

9 years agoLimit number of fingerprint templates that can be enrolled per device user
Jim Miller [Tue, 16 Jun 2015 03:41:02 +0000 (20:41 -0700)]
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

9 years agoam af02ae0f: am d1f4be21: am c44d0ef1: show old legal text in backup settings if...
Sean Francis-Lyon [Tue, 16 Jun 2015 01:49:46 +0000 (01:49 +0000)]
am af02ae0f: am d1f4be21: am c44d0ef1: show old legal text in backup settings if full data backup is disabled

* commit 'af02ae0fb7d41435531d185031a2e27952c113a4':
  show old legal text in backup settings if full data backup is disabled

9 years agoam d1f4be21: am c44d0ef1: show old legal text in backup settings if full data backup...
Sean Francis-Lyon [Tue, 16 Jun 2015 01:42:58 +0000 (01:42 +0000)]
am d1f4be21: am c44d0ef1: show old legal text in backup settings if full data backup is disabled

* commit 'd1f4be219d68179c0aea245e7b66d393444688a7':
  show old legal text in backup settings if full data backup is disabled

9 years agoam c44d0ef1: show old legal text in backup settings if full data backup is disabled
Sean Francis-Lyon [Tue, 16 Jun 2015 01:32:02 +0000 (01:32 +0000)]
am c44d0ef1: show old legal text in backup settings if full data backup is disabled

* commit 'c44d0ef1dc67466fe59c1a26a657c2f9043c948b':
  show old legal text in backup settings if full data backup is disabled

9 years agoshow old legal text in backup settings if full data backup is disabled
Sean Francis-Lyon [Sat, 13 Jun 2015 00:46:41 +0000 (17:46 -0700)]
show old legal text in backup settings if full data backup is disabled

Change-Id: Ifc4fa5c4a6180fd4ceb41ca66dc2dd6a58f4f086

9 years agoam b57ca0ac: am 5d912c35: am bada978e: Merge "Use AssistUtils.getAssistInfo" into...
Adrian Roos [Tue, 16 Jun 2015 00:18:16 +0000 (00:18 +0000)]
am b57ca0ac: am 5d912c35: am bada978e: Merge "Use AssistUtils.getAssistInfo" into mnc-dev

* commit 'b57ca0aceaed55b67b91e3fc6d610503c2a1ac0b':
  Use AssistUtils.getAssistInfo

9 years agoam 5d912c35: am bada978e: Merge "Use AssistUtils.getAssistInfo" into mnc-dev
Adrian Roos [Tue, 16 Jun 2015 00:05:17 +0000 (00:05 +0000)]
am 5d912c35: am bada978e: Merge "Use AssistUtils.getAssistInfo" into mnc-dev

* commit '5d912c353145b893f4175fdff1ab488b0265cd4b':
  Use AssistUtils.getAssistInfo

9 years agoam bada978e: Merge "Use AssistUtils.getAssistInfo" into mnc-dev
Adrian Roos [Mon, 15 Jun 2015 23:56:53 +0000 (23:56 +0000)]
am bada978e: Merge "Use AssistUtils.getAssistInfo" into mnc-dev

* commit 'bada978ec3eab48564c29eb4f8169e88975a2da0':
  Use AssistUtils.getAssistInfo

9 years agoMerge "Use AssistUtils.getAssistInfo" into mnc-dev
Adrian Roos [Mon, 15 Jun 2015 23:49:17 +0000 (23:49 +0000)]
Merge "Use AssistUtils.getAssistInfo" into mnc-dev

9 years agoUse AssistUtils.getAssistInfo
Adrian Roos [Mon, 15 Jun 2015 20:32:58 +0000 (13:32 -0700)]
Use AssistUtils.getAssistInfo

Use consistent logic with SystemUI for determining
default assist component.

Bug: 21780590
Change-Id: I1313b79ce3bb75944889e3ceccb4a2e6bb23e824