Jason Monk
6c5b27e042
Merge "Fix opening secured networks from QS" into mnc-dev
2015-06-18 19:19:12 +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
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
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
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
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
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
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
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
Jim Miller
50d7d19a73
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
2015-06-16 16:21:27 -07:00
Brian Carlstrom
99c1009a89
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
2015-06-16 23:18:33 +00:00
Brian Carlstrom
94f4cb4e46
Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev
2015-06-16 22:59:04 +00:00
Jeff Sharkey
aa1e5f2f00
am 5fafa130
: am 95b891af
: Merge "Finish storage wizard theming." into mnc-dev
...
* commit '5fafa130ec8f031310e5372a89034057053fa634':
Finish storage wizard theming.
2015-06-16 22:49:20 +00:00
Makoto Onuki
3f507b2fbd
am abf80cb1
: am d91ddfeb
: Merge "Allow formatting when a partition is corrupt." into mnc-dev
...
* commit 'abf80cb1d058aa96abd29a329a6f79b6e62acad9':
Allow formatting when a partition is corrupt.
2015-06-16 22:49:19 +00:00
Jeff Sharkey
95b891af7c
Merge "Finish storage wizard theming." into mnc-dev
2015-06-16 22:31:29 +00:00
Jeff Sharkey
8e987d9bfb
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
2015-06-16 15:28:49 -07:00
Makoto Onuki
d91ddfeb16
Merge "Allow formatting when a partition is corrupt." into mnc-dev
2015-06-16 22:27:09 +00:00
Jason Monk
24db3674af
am 283c469d
: am e9ec307a
: Merge "Remove theme setting DO NOT MERGE" into mnc-dev
...
* commit '283c469dc82841827d3dd2e7052f68c5e71f1425':
Remove theme setting DO NOT MERGE
2015-06-16 21:26:03 +00:00
Jason Monk
23d6ab342a
am fbebf8cf
: am 254e8aea
: Merge "Update for shortcuts" into mnc-dev
...
* commit 'fbebf8cfc4a612b6708d024ce71e8069e87cd310':
Update for shortcuts
2015-06-16 21:25:48 +00:00
Yorke Lee
c47e89a44c
am 0d736b59
: am 610413d3
: Merge "Send broadcast when default dialer changes" into mnc-dev
...
* commit '0d736b59d88ffd7dd5ea7c823669d69dcf14737e':
Send broadcast when default dialer changes
2015-06-16 21:23:13 +00:00
Jason Monk
9afed46106
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
2015-06-16 21:23:12 +00:00
Jason Monk
18c5d20bd3
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
2015-06-16 21:23:10 +00:00
Sanket Padawe
3c2f469bf9
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.
2015-06-16 21:23:09 +00:00
Jason Monk
464ad14d37
am 808f7826
: am 6e613472
: Start all help intents as startActivityForResult
...
* commit '808f7826b1259c6f0344d5273b7855c93cfe44f7':
Start all help intents as startActivityForResult
2015-06-16 21:23:08 +00:00
Jason Monk
27fe38eb2c
am 4c1f455c
: am 744f2adb
: Merge "Layout refinement for app lists" into mnc-dev
...
* commit '4c1f455cac4ed69a1dec0ce5c75323301d288e1b':
Layout refinement for app lists
2015-06-16 21:23:07 +00:00
Makoto Onuki
7ccea2f19a
Allow formatting when a partition is corrupt.
...
Bug 21848166
Change-Id: Ied8efaa1320c49a01ae08f19461bf125b3ffa97f
2015-06-16 14:22:33 -07:00
Jason Monk
e9ec307a05
Merge "Remove theme setting DO NOT MERGE" into mnc-dev
2015-06-16 20:49:55 +00:00
Jason Monk
cf611f4695
Remove theme setting DO NOT MERGE
...
Because it's just too incredibly useful...
Bug: 21854466
Change-Id: I984cf709f484a220e9ba7738a8b9c166c28573b2
2015-06-16 20:45:22 +00:00
Jason Monk
254e8aea22
Merge "Update for shortcuts" into mnc-dev
2015-06-16 20:36:46 +00:00