OSDN Git Service

android-x86/packages-apps-Settings.git
9 years agoam beaae836: am 6c5b27e0: Merge "Fix opening secured networks from QS" into mnc-dev
Jason Monk [Thu, 18 Jun 2015 19:37:34 +0000 (19:37 +0000)]
am beaae836: am 6c5b27e0: Merge "Fix opening secured networks from QS" into mnc-dev

* commit 'beaae8367ad41ff20ada95e621e488384b1730e3':
  Fix opening secured networks from QS

9 years agoam 6c5b27e0: Merge "Fix opening secured networks from QS" into mnc-dev
Jason Monk [Thu, 18 Jun 2015 19:29:48 +0000 (19:29 +0000)]
am 6c5b27e0: Merge "Fix opening secured networks from QS" into mnc-dev

* commit '6c5b27e042b5d36f404f11da85145a287a6f1df4':
  Fix opening secured networks from QS

9 years agoMerge "Fix opening secured networks from QS" into mnc-dev
Jason Monk [Thu, 18 Jun 2015 19:19:08 +0000 (19:19 +0000)]
Merge "Fix opening secured networks from QS" into mnc-dev

9 years agoam 1e24271a: am cd0da9c1: Merge "Enforce Keyguard policy in Notification Settings...
Alex Chau [Thu, 18 Jun 2015 17:35:55 +0000 (17:35 +0000)]
am 1e24271a: am cd0da9c1: Merge "Enforce Keyguard policy in Notification Settings" into mnc-dev

* commit '1e24271a9bee773911b630637c7096613d825a27':
  Enforce Keyguard policy in Notification Settings

9 years agoam cd0da9c1: Merge "Enforce Keyguard policy in Notification Settings" into mnc-dev
Alex Chau [Thu, 18 Jun 2015 17:22:23 +0000 (17:22 +0000)]
am cd0da9c1: Merge "Enforce Keyguard policy in Notification Settings" into mnc-dev

* commit 'cd0da9c14ef11bdaca1a470fb1d87042d51f9ae7':
  Enforce Keyguard policy in Notification Settings

9 years agoMerge "Enforce Keyguard policy in Notification Settings" into mnc-dev
Alex Chau [Thu, 18 Jun 2015 17:10:34 +0000 (17:10 +0000)]
Merge "Enforce Keyguard policy in Notification Settings" into mnc-dev

9 years agoFix opening secured networks from QS
Jason Monk [Thu, 18 Jun 2015 16:36:34 +0000 (12:36 -0400)]
Fix opening secured networks from QS

Bug: 21908788
Change-Id: I09b1d22ae8b1815e720bd8c05fa1e38d66d1dcfd

9 years agoam 6afa2a51: am ed672cfc: Merge "Revert "Accounts -> Account sync"" into mnc-dev
Jason Monk [Thu, 18 Jun 2015 16:20:26 +0000 (16:20 +0000)]
am 6afa2a51: am ed672cfc: Merge "Revert "Accounts -> Account sync"" into mnc-dev

* commit '6afa2a51245cf026ba1606098d65db6d958da1c6':
  Revert "Accounts -> Account sync"

9 years agoam ed672cfc: Merge "Revert "Accounts -> Account sync"" into mnc-dev
Jason Monk [Thu, 18 Jun 2015 16:11:49 +0000 (16:11 +0000)]
am ed672cfc: Merge "Revert "Accounts -> Account sync"" into mnc-dev

* commit 'ed672cfc8c3acb8b5d3fe932e1b31e20b32594c8':
  Revert "Accounts -> Account sync"

9 years agoMerge "Revert "Accounts -> Account sync"" into mnc-dev
Jason Monk [Thu, 18 Jun 2015 15:54:55 +0000 (15:54 +0000)]
Merge "Revert "Accounts -> Account sync"" into mnc-dev

9 years agoam a0336eb4: am 1a129e0f: Merge "Remove battery history graph from details screen...
Jason Monk [Thu, 18 Jun 2015 15:49:19 +0000 (15:49 +0000)]
am a0336eb4: am 1a129e0f: Merge "Remove battery history graph from details screen" into mnc-dev

* commit 'a0336eb47f6256af21fb4b8e3597e04281839d1d':
  Remove battery history graph from details screen

9 years agoam eddd983d: am 58f6728e: Allow give/take in app version/disabled fields
Jason Monk [Thu, 18 Jun 2015 15:49:16 +0000 (15:49 +0000)]
am eddd983d: am 58f6728e: Allow give/take in app version/disabled fields

* commit 'eddd983de58b0fc5499e06591fa3750ff3d7292b':
  Allow give/take in app version/disabled fields

9 years agoam 3d9ccb0f: am 2c55f738: Merge "Don\'t show SIM lock Setting if carrier config hides...
Junda Liu [Thu, 18 Jun 2015 15:49:13 +0000 (15:49 +0000)]
am 3d9ccb0f: am 2c55f738: Merge "Don\'t show SIM lock Setting if carrier config hides it." into mnc-dev

* commit '3d9ccb0ff45a981a784a8807410c8a8bc1842cf2':
  Don't show SIM lock Setting if carrier config hides it.

9 years agoRevert "Accounts -> Account sync"
Jason Monk [Thu, 18 Jun 2015 15:44:25 +0000 (15:44 +0000)]
Revert "Accounts -> Account sync"

This reverts commit 43db745ea0bdb3f8cb2737e74ffcad1d381b4a2b.

Bug: 21726868
Change-Id: I72fd09c493f71a607b9df8eaa8e42047a60303e8

9 years agoam 1a129e0f: Merge "Remove battery history graph from details screen" into mnc-dev
Jason Monk [Thu, 18 Jun 2015 15:41:36 +0000 (15:41 +0000)]
am 1a129e0f: Merge "Remove battery history graph from details screen" into mnc-dev

* commit '1a129e0fbb2fdfc4f5b7bda82a457e907a4aeb4f':
  Remove battery history graph from details screen

9 years agoam 58f6728e: Allow give/take in app version/disabled fields
Jason Monk [Thu, 18 Jun 2015 15:41:35 +0000 (15:41 +0000)]
am 58f6728e: Allow give/take in app version/disabled fields

* commit '58f6728e6ef8c89d9b88d78b19b2d0f24135564d':
  Allow give/take in app version/disabled fields

9 years agoam 2c55f738: Merge "Don\'t show SIM lock Setting if carrier config hides it." into...
Junda Liu [Thu, 18 Jun 2015 15:41:33 +0000 (15:41 +0000)]
am 2c55f738: Merge "Don\'t show SIM lock Setting if carrier config hides it." into mnc-dev

* commit '2c55f738c4336a3f379f94f4142c20a473ae3a9a':
  Don't show SIM lock Setting if carrier config hides it.

9 years agoMerge "Remove battery history graph from details screen" into mnc-dev
Jason Monk [Thu, 18 Jun 2015 15:31:22 +0000 (15:31 +0000)]
Merge "Remove battery history graph from details screen" into mnc-dev

9 years agoRemove battery history graph from details screen
Jason Monk [Thu, 18 Jun 2015 15:06:18 +0000 (11:06 -0400)]
Remove battery history graph from details screen

Bug: 21854416
Change-Id: I3172106c8b1adbe19179adddcec2848d14d04588

9 years agoEnforce Keyguard policy in Notification Settings
Alex Chau [Fri, 12 Jun 2015 10:45:08 +0000 (11:45 +0100)]
Enforce Keyguard policy in Notification Settings

- Applied getKeyguardDisabledFeatures for notification settings and
    notification setup page (after settings a screenlock)
- If a notification settings is disabled, the next least secure setting
    will be chosen
- Although KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS can be set be
    profile, it will not be reflected in both settings page. This is
    because it does not affect the owner (user 0), as mentioned in
    DevicePolicyManagerService.PROFILE_KEYGUARD_FEATURES_AFFECT_OWNER
- Skip RedactionInterstitial if there is <= 1 options for the user
- Tested with both Setup wizard and settings case, both pattern and
    password, as well as toggling the policy on and off

Bug: 19307118
Bug: 17099898

Change-Id: If640d5576caa0163e9942569f7b4643a30bbfe0a

9 years agoAllow give/take in app version/disabled fields
Jason Monk [Thu, 18 Jun 2015 14:36:39 +0000 (10:36 -0400)]
Allow give/take in app version/disabled fields

Switch to wrap_content so if one view is smaller, the other
can use its space.

Bug: 21901206
Change-Id: Ic69d2577c3291e6ed171caa0fa361ccc43eaf180

9 years agoMerge "Don't show SIM lock Setting if carrier config hides it." into mnc-dev
Junda Liu [Wed, 17 Jun 2015 22:50:59 +0000 (22:50 +0000)]
Merge "Don't show SIM lock Setting if carrier config hides it." into mnc-dev

9 years agoDon't show SIM lock Setting if carrier config hides it.
Junda Liu [Wed, 17 Jun 2015 17:15:34 +0000 (10:15 -0700)]
Don't show SIM lock Setting if carrier config hides it.

Bug: b/19623656
Change-Id: Ic7420fe3579815a8c2c884a78b13112affb00787

9 years agoam a82961f1: am f8577c68: Merge "Support disabled until used apps" into mnc-dev
Jason Monk [Wed, 17 Jun 2015 20:53:32 +0000 (20:53 +0000)]
am a82961f1: am f8577c68: Merge "Support disabled until used apps" into mnc-dev

* commit 'a82961f108e18eaefb836f83fe1508c706a563b1':
  Support disabled until used apps

9 years agoam c3570166: am 2ab42701: Merge "Fix accessibility for empty list on notification...
Jason Monk [Wed, 17 Jun 2015 20:53:31 +0000 (20:53 +0000)]
am c3570166: am 2ab42701: Merge "Fix accessibility for empty list on notification access" into mnc-dev

* commit 'c3570166c2484f76e73e76eecdf8cd2870d1a0ac':
  Fix accessibility for empty list on notification access

9 years agoam f8577c68: Merge "Support disabled until used apps" into mnc-dev
Jason Monk [Wed, 17 Jun 2015 20:41:36 +0000 (20:41 +0000)]
am f8577c68: Merge "Support disabled until used apps" into mnc-dev

* commit 'f8577c68afbf4965211ca99233f7c5e40560e566':
  Support disabled until used apps

9 years agoam 2ab42701: Merge "Fix accessibility for empty list on notification access" into...
Jason Monk [Wed, 17 Jun 2015 20:41:34 +0000 (20:41 +0000)]
am 2ab42701: Merge "Fix accessibility for empty list on notification access" into mnc-dev

* commit '2ab427010ae16af8756347cefac6350ce83041e8':
  Fix accessibility for empty list on notification access

9 years agoMerge "Support disabled until used apps" into mnc-dev
Jason Monk [Wed, 17 Jun 2015 20:31:26 +0000 (20:31 +0000)]
Merge "Support disabled until used apps" into mnc-dev

9 years agoMerge "Fix accessibility for empty list on notification access" into mnc-dev
Jason Monk [Wed, 17 Jun 2015 20:31:16 +0000 (20:31 +0000)]
Merge "Fix accessibility for empty list on notification access" into mnc-dev

9 years agoFix accessibility for empty list on notification access
Jason Monk [Wed, 17 Jun 2015 19:42:01 +0000 (15:42 -0400)]
Fix accessibility for empty list on notification access

Bug: 21797352
Change-Id: I6c68c9abb43c6dfcc8b0a4d07cfe0d4cede6e817

9 years agoam a42d94d8: am 9f2b5a74: Merge "Don\'t crash on NameNotFoundException" into mnc-dev
Makoto Onuki [Wed, 17 Jun 2015 18:15:09 +0000 (18:15 +0000)]
am a42d94d8: am 9f2b5a74: Merge "Don\'t crash on NameNotFoundException" into mnc-dev

* commit 'a42d94d82e72c5ef0e99cb9f755673c82e3f8955':
  Don't crash on NameNotFoundException

9 years agoam 9f2b5a74: Merge "Don\'t crash on NameNotFoundException" into mnc-dev
Makoto Onuki [Wed, 17 Jun 2015 17:57:56 +0000 (17:57 +0000)]
am 9f2b5a74: Merge "Don\'t crash on NameNotFoundException" into mnc-dev

* commit '9f2b5a74420988824dd3a91abcdb85bea6fc48fa':
  Don't crash on NameNotFoundException

9 years agoMerge "Don't crash on NameNotFoundException" into mnc-dev
Makoto Onuki [Wed, 17 Jun 2015 17:46:49 +0000 (17:46 +0000)]
Merge "Don't crash on NameNotFoundException" into mnc-dev

9 years agoDon't crash on NameNotFoundException
Makoto Onuki [Wed, 17 Jun 2015 17:13:15 +0000 (10:13 -0700)]
Don't crash on NameNotFoundException

Just finish().

Bug 20672468

Change-Id: Ic600e060990b7e3bc3e98bda63d0f4c9e530fb94

9 years agoam 7343ecc7: (-s ours) am 2eb7ad26: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Wed, 17 Jun 2015 15:44:51 +0000 (15:44 +0000)]
am 7343ecc7: (-s ours) am 2eb7ad26: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '7343ecc71fff3aae7ca1721a958d18850b7dc04e':
  Import translations. DO NOT MERGE

9 years agoam 2eb7ad26: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 17 Jun 2015 15:32:25 +0000 (15:32 +0000)]
am 2eb7ad26: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '2eb7ad2648e85f2474d271499ec43241264ca148':
  Import translations. DO NOT MERGE

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 17 Jun 2015 15:23:33 +0000 (15:23 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

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

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

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 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 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 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 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 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 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 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 agoSupport disabled until used apps
Jason Monk [Tue, 16 Jun 2015 20:18:30 +0000 (16:18 -0400)]
Support disabled until used apps

Bug: 21782239
Change-Id: I59bef6689a9efb74f64827026add0cbddc18cf53

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 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.