Geoff Mendal
e4841b38d0
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-06-22 15:31:26 +00:00
Jason Monk
d8c811d8b8
am b4b590d1
: Merge "Update disable dialog" into mnc-dev
...
* commit 'b4b590d13f4ddd2ae5ffd099eb93ad8fa647ec57':
Update disable dialog
2015-06-22 15:02:15 +00:00
Geoff Mendal
b593d12bea
Import translations. DO NOT MERGE
...
Change-Id: I2c01af1003b67115a748fbe8ba3a7ec2d82144a8
Auto-generated-cl: translation import
2015-06-22 08:00:38 -07:00
Jason Monk
b4b590d13f
Merge "Update disable dialog" into mnc-dev
2015-06-22 14:55:14 +00:00
Adrian Roos
5023c89d24
am a029671b
: Merge "Work around improper ListView recycling in TrustAgentSettings" into mnc-dev
...
* commit 'a029671bfd2d915ce6d43fa31a896058454cfe24':
Work around improper ListView recycling in TrustAgentSettings
2015-06-20 03:28:00 +00:00
Adrian Roos
ba59f5b222
Work around improper ListView recycling in TrustAgentSettings
...
Previously, the views for our SwitchPreference would never
be recycled because they weren't present in onCreate, which
broke accessibility events.
Bug: 21837103
Change-Id: I01f40b4e6df6d807b77f985116a57334e4ca4868
2015-06-19 20:01:56 -07:00
Jason Monk
6a7c756208
am d63e6969
: Merge "Add content description to owner info status text" into mnc-dev
...
* commit 'd63e696902cbefaa7361aaa16e6b20d0fe593cdb':
Add content description to owner info status text
2015-06-19 15:33:37 +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
Brian Carlstrom
9dca3951f6
am 2567514a
: Merge "Clarify process_dex2oat_label description" into mnc-dev
...
* commit '2567514abcd253cdc857ef0ddb2dbbb4fe6eed08':
Clarify process_dex2oat_label description
2015-06-19 04:33:16 +00:00
Brian Carlstrom
2567514abc
Merge "Clarify process_dex2oat_label description" into mnc-dev
2015-06-19 04:23:08 +00:00
Sanket Padawe
aa10a9ec83
am 5ba90c14
: Increase char limit of the data usage Settings string to 33.
...
* commit '5ba90c148d41ae3f330d7f31de8bced5e21c8727':
Increase char limit of the data usage Settings string to 33.
2015-06-19 01:51:27 +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
5fd5890f5b
am 47a26c79
: Merge "Fix ListView being too eager too scroll" into mnc-dev
...
* commit '47a26c79288723b8604a91c5cd8daedd83f183f2':
Fix ListView being too eager too scroll
2015-06-18 20:16:51 +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
Alex Chau
1e24271a9b
am cd0da9c1
: Merge "Enforce Keyguard policy in Notification Settings" into mnc-dev
...
* commit 'cd0da9c14ef11bdaca1a470fb1d87042d51f9ae7':
Enforce Keyguard policy in Notification Settings
2015-06-18 17:22:23 +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
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