Alex Chau
cd0da9c14e
Merge "Enforce Keyguard policy in Notification Settings" into mnc-dev
2015-06-18 17:10:35 +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
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
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
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
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
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
49d73c03aa
am 94f4cb4e
: Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev
...
* commit '94f4cb4e4660db823d268d14eb1199dbc11f8e86':
dex2oat should show something friendlier in Settings -> Battery
2015-06-16 23:07:52 +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
5fafa130ec
am 95b891af
: Merge "Finish storage wizard theming." into mnc-dev
...
* commit '95b891af7c77d51f6284e01467bd6323d3749068':
Finish storage wizard theming.
2015-06-16 22:36:06 +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
Jason Monk
283c469dc8
am e9ec307a
: Merge "Remove theme setting DO NOT MERGE" into mnc-dev
...
* commit 'e9ec307a057618ff40b9988684761a778f9301d4':
Remove theme setting DO NOT MERGE
2015-06-16 21:03:11 +00:00
Jason Monk
e9ec307a05
Merge "Remove theme setting DO NOT MERGE" into mnc-dev
2015-06-16 20:49:55 +00:00
Jason Monk
fbebf8cfc4
am 254e8aea
: Merge "Update for shortcuts" into mnc-dev
...
* commit '254e8aea22f36c90587315a58aeefda9683581eb':
Update for shortcuts
2015-06-16 20:45:22 +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
Sanket Padawe
fc4e9cbdf9
am 7171d686
: Merge "Add PBAP checkbox for BT pairing consent dialog." into mnc-dev
...
* commit '7171d6864fb4d8c1838b4ef1d65b6bb5274d3b53':
Add PBAP checkbox for BT pairing consent dialog.
2015-06-16 20:06:46 +00:00
Jason Monk
4c1f455cac
am 744f2adb
: Merge "Layout refinement for app lists" into mnc-dev
...
* commit '744f2adb56ac0077a103c8e6e3b20f421eddc780':
Layout refinement for app lists
2015-06-16 20:06:29 +00:00
Sanket Padawe
7171d6864f
Merge "Add PBAP checkbox for BT pairing consent dialog." into mnc-dev
2015-06-16 15:24:05 +00:00
Jason Monk
744f2adb56
Merge "Layout refinement for app lists" into mnc-dev
2015-06-16 13:17:02 +00:00
Jason Monk
2cdafc6be3
Layout refinement for app lists
...
Make all app lists (or at least all current app lists) use the same
base layout for icon, label, and sizing/padding. This way they
should look the same.
Bug: 21727125
Bug: 21726922
Bug: 21853632
Change-Id: I3cffadb9e7b5184d4209deacd4ea70ec1d4f71b4
2015-06-16 09:15:39 -04:00
Jeff Sharkey
3538eb2410
am 71c89a17
: Merge "More storage UI updates." into mnc-dev
...
* commit '71c89a171acb1ddd63d10189c39c07134987bd2f':
More storage UI updates.
2015-06-16 04:57:43 +00:00
Jeff Sharkey
71c89a171a
Merge "More storage UI updates." into mnc-dev
2015-06-16 04:47:19 +00:00
Jeff Sharkey
2597625fd9
More storage UI updates.
...
Storage volumes now have headers with larger fonts and progress bars
to show used versus free space. Updated Memory to use new formatting
template, and Data Usage to use consistent display logic.
Allocate a unique color for each private volume, and yell when a
volume is running low on space. Update private volume details to
launch into MediaStore-backed storage backends in a management mode,
and only show detailed items when hosting emulated storage. Show
details dialog about "Other" and user storage items.
Shortcut into single private volume when it's the only device. Add
real eject icon.
Bug: 21756698, 20275574, 21326612
Change-Id: If3ecd1d912d3e709c09d3e4da24f368e04dd3f9d
2015-06-15 21:44:21 -07:00
Jim Miller
6364e0a26a
am a4f8aae4
: Merge "Limit number of fingerprint templates that can be enrolled per device user" into mnc-dev
...
* commit 'a4f8aae4be4040685f88c79006d2cfee42f96504':
Limit number of fingerprint templates that can be enrolled per device user
2015-06-16 04:00:37 +00:00
Jim Miller
5adada6083
Limit number of fingerprint templates that can be enrolled per device user
...
This change places an upper limit on the number of fingerprint templates that
can be enrolled per account. This is done primarily for performance reasons, but
may also be imposed by hardware and Trusted Execution Environment (TEE) reasons.
Fixes bug 20731847
Change-Id: I3975290fa8eb2106467493aab6102015697e012c
On branch max_fingerprint
2015-06-15 20:44:45 -07:00
John Spurlock
3fdfabcd45
am dddd589d
: Merge "Settings: Remove unreachable "Battery Info" screen." into mnc-dev
...
* commit 'dddd589d8f0de00c192022ea9bd87f32a734343b':
Settings: Remove unreachable "Battery Info" screen.
2015-06-15 19:49:30 +00:00
John Spurlock
dddd589d8f
Merge "Settings: Remove unreachable "Battery Info" screen." into mnc-dev
2015-06-15 19:36:46 +00:00
John Spurlock
dae8c154f0
Settings: Remove unreachable "Battery Info" screen.
...
Bug: 21576824
Change-Id: Ia2bb3b22b7512cd05ceca5798e85e5479e064213
2015-06-15 15:24:16 -04:00
Geoff Mendal
f4d7bd4f49
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-06-15 15:36:59 +00:00
Jason Monk
dfe186f57c
am 49ecfcd6
: Merge "Fix bad theming on owner-info" into mnc-dev
...
* commit '49ecfcd690a73112024df188924892772408d170':
Fix bad theming on owner-info
2015-06-15 15:11:59 +00:00
Jason Monk
49ecfcd690
Merge "Fix bad theming on owner-info" into mnc-dev
2015-06-15 15:05:34 +00:00
Jason Monk
39eee0c55c
Fix bad theming on owner-info
...
Bug: 21784828
Change-Id: I18c7ef71efd9549ffb2207b66d04162cd32e35a5
2015-06-15 15:05:11 +00:00
Jason Monk
f7b0dfd6ae
am f0fe5c58
: Merge "Don\'t auto-focus text fields in hotspot dialog" into mnc-dev
...
* commit 'f0fe5c58e2274a550321f936c125c691f7a1646b':
Don't auto-focus text fields in hotspot dialog
2015-06-15 15:00:20 +00:00
Geoff Mendal
b59e4e4df4
Import translations. DO NOT MERGE
...
Change-Id: Ifda55ef8db028d95b618b0a44dbe4d2c3c212f44
Auto-generated-cl: translation import
2015-06-15 07:57:05 -07:00