Robin Lee
3a839be7c1
Merge "Only unregister the network callback at onPause" into mnc-dev
2015-06-19 20:03:06 +00:00
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
7699cad004
Merge "Settings: Add widget entry point to magical entry points listing." into mnc-dev
2015-06-19 14:55:11 +00: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
Brian Carlstrom
2567514abc
Merge "Clarify process_dex2oat_label description" into mnc-dev
2015-06-19 04:23:08 +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
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
6c5b27e042
Merge "Fix opening secured networks from QS" into mnc-dev
2015-06-18 19:19:12 +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
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
2015-06-18 15:44:46 +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
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
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
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
7fdb147872
RIP -night DO NOT MERGE
...
Bug: 21854466
Change-Id: Ied1512cb1d8c80df9f6c990f8f91f82d7f140533
2015-06-17 09:17:31 -04: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
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
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
94f4cb4e46
Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev
2015-06-16 22:59:04 +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
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
Jason Monk
78b1715bcb
Update for shortcuts
...
Change-Id: If28d540fd9e300b9c26d5cb6869be3d475124e9e
2015-06-16 16:31:01 -04:00
Jason Monk
77537b697b
Support disabled until used apps
...
Bug: 21782239
Change-Id: I59bef6689a9efb74f64827026add0cbddc18cf53
2015-06-16 16:18:30 -04:00
Yorke Lee
610413d307
Merge "Send broadcast when default dialer changes" into mnc-dev
2015-06-16 19:30:14 +00:00
