Jason Monk
d63e696902
Merge "Add content description to owner info status text" into mnc-dev
2015-06-19 15:22:21 +00:00
Jason Monk
2e78f53af1
Add content description to owner info status text
...
Bug: 21799551
Change-Id: I8fe82d304309949a5a46492f7d20c58e006baea3
2015-06-19 11:17:03 -04:00
John Spurlock
533a5664da
Settings: Add widget entry point to magical entry points listing.
...
Bug: 21930077
Change-Id: I67b05d6064a2ab0fe93d3d8841c9f23c9246a101
2015-06-19 10:47:36 -04:00
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
Jason Monk
8af26277a3
am 8a753643: am 5fd5890f: am 47a26c79: Merge "Fix ListView being too eager too scroll" into mnc-dev
...
* commit '8a753643058760fb44a286dbf7d198053a3f3a01':
Fix ListView being too eager too scroll
2015-06-18 20:43:09 +00:00
Jason Monk
8a75364305
am 5fd5890f: am 47a26c79: Merge "Fix ListView being too eager too scroll" into mnc-dev
...
* commit '5fd5890f5b94d102d7cf655fd0d1dbd9d09dd55f':
Fix ListView being too eager too scroll
2015-06-18 20:30:36 +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
feaae6959a
am aa5964de: am beaae836: am 6c5b27e0: Merge "Fix opening secured networks from QS" into mnc-dev
...
* commit 'aa5964de3768703de9dfa88fb7aa66ece7a353fe':
Fix opening secured networks from QS
2015-06-18 19:55:32 +00:00
Jason Monk
aa5964de37
am beaae836: am 6c5b27e0: Merge "Fix opening secured networks from QS" into mnc-dev
...
* commit 'beaae8367ad41ff20ada95e621e488384b1730e3':
Fix opening secured networks from QS
2015-06-18 19:37:34 +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
3fb2e54ace
am ee6ffccb: am 1e24271a: am cd0da9c1: Merge "Enforce Keyguard policy in Notification Settings" into mnc-dev
...
* commit 'ee6ffccbc7ff4015597da1fcc725456117a3141c':
Enforce Keyguard policy in Notification Settings
2015-06-18 17:47:27 +00:00
Alex Chau
ee6ffccbc7
am 1e24271a: am cd0da9c1: Merge "Enforce Keyguard policy in Notification Settings" into mnc-dev
...
* commit '1e24271a9bee773911b630637c7096613d825a27':
Enforce Keyguard policy in Notification Settings
2015-06-18 17:35:55 +00: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
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
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
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
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
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
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
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
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
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
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
Jeff Sharkey
a39077c95b
am 67832cc3: am 74c7f1fc: Merge "Actually gracefully finish this time around." into mnc-dev
...
* commit '67832cc3984665cf55ac3d4afc5fdbb76326f1a0':
Actually gracefully finish this time around.
2015-06-17 03:45:06 +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
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