Jason Monk
163fbd25be
am e707ea37: am a0336eb4: am 1a129e0f: Merge "Remove battery history graph from details screen" into mnc-dev
...
* commit 'e707ea3720188599385be2abaa9efbdf14f0560c':
Remove battery history graph from details screen
2015-06-18 16:12:00 +00:00
Jason Monk
f69f6bcb80
am f99a90d1: am eddd983d: am 58f6728e: Allow give/take in app version/disabled fields
...
* commit 'f99a90d13979525882ec4e6599b423c73fab5643':
Allow give/take in app version/disabled fields
2015-06-18 16:11:59 +00:00
Junda Liu
9eeb63f501
am 5410a176: am 3d9ccb0f: am 2c55f738: Merge "Don\'t show SIM lock Setting if carrier config hides it." into mnc-dev
...
* commit '5410a1769821c016f869493c638f18a8f2a79bf0':
Don't show SIM lock Setting if carrier config hides it.
2015-06-18 16:11:58 +00: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
e707ea3720
am a0336eb4: am 1a129e0f: Merge "Remove battery history graph from details screen" into mnc-dev
...
* commit 'a0336eb47f6256af21fb4b8e3597e04281839d1d':
Remove battery history graph from details screen
2015-06-18 15:49:19 +00:00
Jason Monk
f99a90d139
am eddd983d: am 58f6728e: Allow give/take in app version/disabled fields
...
* commit 'eddd983de58b0fc5499e06591fa3750ff3d7292b':
Allow give/take in app version/disabled fields
2015-06-18 15:49:16 +00:00
Junda Liu
5410a17698
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.
2015-06-18 15:49:13 +00:00
Jason Monk
06fc34e25a
Revert "Accounts -> Account sync"
...
This reverts commit 43db745ea0
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
0095930e12
am 1c8a483c: am a82961f1: am f8577c68: Merge "Support disabled until used apps" into mnc-dev
...
* commit '1c8a483cb662da6b6aa685558e0058bebdc13251':
Support disabled until used apps
2015-06-17 20:59:55 +00:00
Jason Monk
0036894557
am f5269f3b: am c3570166: am 2ab42701: Merge "Fix accessibility for empty list on notification access" into mnc-dev
...
* commit 'f5269f3bdedc9bb3087732e589a4f4c0ad18e63d':
Fix accessibility for empty list on notification access
2015-06-17 20:59:54 +00:00
Jason Monk
1c8a483cb6
am a82961f1: am f8577c68: Merge "Support disabled until used apps" into mnc-dev
...
* commit 'a82961f108e18eaefb836f83fe1508c706a563b1':
Support disabled until used apps
2015-06-17 20:53:32 +00:00
Jason Monk
f5269f3bde
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
2015-06-17 20:53:31 +00: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
35d43fbe98
am 1cc4bd33: am a42d94d8: am 9f2b5a74: Merge "Don\'t crash on NameNotFoundException" into mnc-dev
...
* commit '1cc4bd33265302cfdca55553a5fa746a8265aea7':
Don't crash on NameNotFoundException
2015-06-17 18:23:21 +00:00
Makoto Onuki
1cc4bd3326
am a42d94d8: am 9f2b5a74: Merge "Don\'t crash on NameNotFoundException" into mnc-dev
...
* commit 'a42d94d82e72c5ef0e99cb9f755673c82e3f8955':
Don't crash on NameNotFoundException
2015-06-17 18:15:09 +00: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
2bbbafdd88
am 6a28e257: (-s ours) am 7343ecc7: (-s ours) am 2eb7ad26: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '6a28e2573a210ecaf976e21cc5c4fddd75afa374':
Import translations. DO NOT MERGE
2015-06-17 15:58:38 +00:00
Geoff Mendal
6a28e2573a
am 7343ecc7: (-s ours) am 2eb7ad26: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '7343ecc71fff3aae7ca1721a958d18850b7dc04e':
Import translations. DO NOT MERGE
2015-06-17 15:44:51 +00: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
Geoff Mendal
7b1cca8834
Merge "Import translations. DO NOT MERGE"
2015-06-17 14:29:23 +00:00
Geoff Mendal
a2bb6038c2
Import translations. DO NOT MERGE
...
Change-Id: I74442ac6e0aab88878469be16d6518bd1af75861
Auto-generated-cl: translation import
2015-06-17 07:27:41 -07:00
Jason Monk
3ea384e1da
am f424ccf7: (-s ours) am 5c2de952: am 7fdb1478: RIP -night DO NOT MERGE
...
* commit 'f424ccf7433be32c9bf9c29d388beb0e6fe94267':
RIP -night DO NOT MERGE
2015-06-17 13:58:35 +00:00
Jason Monk
f424ccf743
am 5c2de952: am 7fdb1478: RIP -night DO NOT MERGE
...
* commit '5c2de952e5e7f2501df7a5a94794e526902e47a3':
RIP -night DO NOT MERGE
2015-06-17 13:47:00 +00: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
bce8496aef
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
2015-06-17 13:32:58 +00:00
Jason Monk
840164a21c
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
2015-06-17 13:23:09 +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
c162b354c2
am a39077c9: am 67832cc3: am 74c7f1fc: Merge "Actually gracefully finish this time around." into mnc-dev
...
* commit 'a39077c95bb51102e77e55a2d4e352f8027d5c24':
Actually gracefully finish this time around.
2015-06-17 03:54:31 +00:00
