Zoltan Szatmary-Ban
5de33f402a
Reflect effect of all Wifi editability factors in Settings
...
Bug: 21427528
Bug: 21150087
Bug: 21612565
Change-Id: I62962a9b3fc1bb9c90be79e133873006da102054
2015-06-19 11:06:37 +01:00
Brian Carlstrom
9dca3951f6
am 2567514a
: Merge "Clarify process_dex2oat_label description" into mnc-dev
...
* commit '2567514abcd253cdc857ef0ddb2dbbb4fe6eed08':
Clarify process_dex2oat_label description
2015-06-19 04:33:16 +00:00
Brian Carlstrom
2567514abc
Merge "Clarify process_dex2oat_label description" into mnc-dev
2015-06-19 04:23:08 +00:00
Sanket Padawe
aa10a9ec83
am 5ba90c14
: Increase char limit of the data usage Settings string to 33.
...
* commit '5ba90c148d41ae3f330d7f31de8bced5e21c8727':
Increase char limit of the data usage Settings string to 33.
2015-06-19 01:51:27 +00:00
Sanket Padawe
5ba90c148d
Increase char limit of the data usage Settings string to 33.
...
Bug: 21801556
Change-Id: I82d99f155a3c4b6f1ac0f3056c254e54b8e5f311
2015-06-18 18:39:25 -07:00
Jason Monk
5fd5890f5b
am 47a26c79
: Merge "Fix ListView being too eager too scroll" into mnc-dev
...
* commit '47a26c79288723b8604a91c5cd8daedd83f183f2':
Fix ListView being too eager too scroll
2015-06-18 20:16:51 +00:00
Jason Monk
47a26c7928
Merge "Fix ListView being too eager too scroll" into mnc-dev
2015-06-18 20:07:40 +00:00
Jason Monk
66aa964e2a
Fix ListView being too eager too scroll
...
ListView is always too eager to scroll, so just stop using it.
Bug: 21853796
Change-Id: Id37d89b0312597a9fb65a33f151af34b3f395d91
2015-06-18 15:56:21 -04:00
Jason Monk
beaae8367a
am 6c5b27e0
: Merge "Fix opening secured networks from QS" into mnc-dev
...
* commit '6c5b27e042b5d36f404f11da85145a287a6f1df4':
Fix opening secured networks from QS
2015-06-18 19:29:48 +00:00
Jason Monk
6c5b27e042
Merge "Fix opening secured networks from QS" into mnc-dev
2015-06-18 19:19:12 +00:00
Alex Chau
1e24271a9b
am cd0da9c1
: Merge "Enforce Keyguard policy in Notification Settings" into mnc-dev
...
* commit 'cd0da9c14ef11bdaca1a470fb1d87042d51f9ae7':
Enforce Keyguard policy in Notification Settings
2015-06-18 17:22:23 +00:00
Brian Carlstrom
972ed7750f
Clarify process_dex2oat_label description
...
Bug: 21898104
Change-Id: I264f784db761ac51a1dde51f189fb017b7d378b1
2015-06-18 10:11:18 -07:00
Alex Chau
cd0da9c14e
Merge "Enforce Keyguard policy in Notification Settings" into mnc-dev
2015-06-18 17:10:35 +00:00
Jason Monk
4dd013efc1
Fix opening secured networks from QS
...
Bug: 21908788
Change-Id: I09b1d22ae8b1815e720bd8c05fa1e38d66d1dcfd
2015-06-18 12:36:34 -04:00
Jason Monk
6afa2a5124
am ed672cfc
: Merge "Revert "Accounts -> Account sync"" into mnc-dev
...
* commit 'ed672cfc8c3acb8b5d3fe932e1b31e20b32594c8':
Revert "Accounts -> Account sync"
2015-06-18 16:11:49 +00:00
Jason Monk
ed672cfc8c
Merge "Revert "Accounts -> Account sync"" into mnc-dev
2015-06-18 15:54:56 +00:00
Jason Monk
06fc34e25a
Revert "Accounts -> Account sync"
...
This reverts commit 43db745ea0
.
Bug: 21726868
Change-Id: I72fd09c493f71a607b9df8eaa8e42047a60303e8
2015-06-18 15:44:46 +00:00
Jason Monk
a0336eb47f
am 1a129e0f
: Merge "Remove battery history graph from details screen" into mnc-dev
...
* commit '1a129e0fbb2fdfc4f5b7bda82a457e907a4aeb4f':
Remove battery history graph from details screen
2015-06-18 15:41:36 +00:00
Jason Monk
eddd983de5
am 58f6728e
: Allow give/take in app version/disabled fields
...
* commit '58f6728e6ef8c89d9b88d78b19b2d0f24135564d':
Allow give/take in app version/disabled fields
2015-06-18 15:41:35 +00:00
Junda Liu
3d9ccb0ff4
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.
2015-06-18 15:41:33 +00:00
Jason Monk
1a129e0fbb
Merge "Remove battery history graph from details screen" into mnc-dev
2015-06-18 15:31:23 +00:00
Jason Monk
04ac693da7
Remove battery history graph from details screen
...
Bug: 21854416
Change-Id: I3172106c8b1adbe19179adddcec2848d14d04588
2015-06-18 11:07:31 -04:00
Alex Chau
ccade40278
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
2015-06-18 16:00:16 +01:00
Jason Monk
53a5d7ff2c
Update disable dialog
...
Bug: 20826933
Change-Id: Ib84d3ba50ead2b71f62a3b163a5f5ba32a576c00
2015-06-18 10:46:55 -04:00
Jason Monk
58f6728e6e
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
2015-06-18 10:36:39 -04:00
Robin Lee
5f6f4cc572
Only unregister the network callback at onPause
...
Bug: 21592804
Change-Id: I425a8ebd350125ae48b9cf44cfef0b4c572ec25e
2015-06-17 18:44:58 -07:00
Junda Liu
2c55f738c4
Merge "Don't show SIM lock Setting if carrier config hides it." into mnc-dev
2015-06-17 22:51:00 +00:00
Junda Liu
80753bc275
Don't show SIM lock Setting if carrier config hides it.
...
Bug: b/19623656
Change-Id: Ic7420fe3579815a8c2c884a78b13112affb00787
2015-06-17 14:10:13 -07:00
Jason Monk
a82961f108
am f8577c68
: Merge "Support disabled until used apps" into mnc-dev
...
* commit 'f8577c68afbf4965211ca99233f7c5e40560e566':
Support disabled until used apps
2015-06-17 20:41:36 +00:00
Jason Monk
c3570166c2
am 2ab42701
: Merge "Fix accessibility for empty list on notification access" into mnc-dev
...
* commit '2ab427010ae16af8756347cefac6350ce83041e8':
Fix accessibility for empty list on notification access
2015-06-17 20:41:34 +00:00
Jason Monk
f8577c68af
Merge "Support disabled until used apps" into mnc-dev
2015-06-17 20:31:27 +00:00
Jason Monk
2ab427010a
Merge "Fix accessibility for empty list on notification access" into mnc-dev
2015-06-17 20:31:17 +00:00
Jason Monk
6baf98eb46
Fix accessibility for empty list on notification access
...
Bug: 21797352
Change-Id: I6c68c9abb43c6dfcc8b0a4d07cfe0d4cede6e817
2015-06-17 15:42:45 -04:00
Makoto Onuki
a42d94d82e
am 9f2b5a74
: Merge "Don\'t crash on NameNotFoundException" into mnc-dev
...
* commit '9f2b5a74420988824dd3a91abcdb85bea6fc48fa':
Don't crash on NameNotFoundException
2015-06-17 17:57:56 +00:00
Makoto Onuki
9f2b5a7442
Merge "Don't crash on NameNotFoundException" into mnc-dev
2015-06-17 17:46:50 +00:00
Makoto Onuki
302b77f425
Don't crash on NameNotFoundException
...
Just finish().
Bug 20672468
Change-Id: Ic600e060990b7e3bc3e98bda63d0f4c9e530fb94
2015-06-17 10:22:28 -07:00
Geoff Mendal
7343ecc71f
am 2eb7ad26
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '2eb7ad2648e85f2474d271499ec43241264ca148':
Import translations. DO NOT MERGE
2015-06-17 15:32:25 +00:00
Geoff Mendal
2eb7ad2648
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-06-17 15:23:34 +00:00
Geoff Mendal
38f0b79f33
Import translations. DO NOT MERGE
...
Change-Id: I1ec85dbe877d7fae6edf1f93ec812bc7b1223daa
Auto-generated-cl: translation import
2015-06-17 07:59:14 -07: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
Jason Monk
2abd5be388
am 7a5cb3b9
: Merge "Guard against callbacks when no list view created" into mnc-dev
...
* commit '7a5cb3b9c34af2215bdaaddba976f04bbafd06eb':
Guard against callbacks when no list view created
2015-06-17 13:09:18 +00:00
Jason Monk
7a5cb3b9c3
Merge "Guard against callbacks when no list view created" into mnc-dev
2015-06-17 13:01:28 +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
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
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