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
Robin Lee
645c4e327c
am 02a0cf3a: am 3a839be7: Merge "Only unregister the network callback at onPause" into mnc-dev
...
* commit '02a0cf3ae32a272eff23364f8202f6086fabd28e':
Only unregister the network callback at onPause
2015-06-19 21:23:00 +00:00
Selim Cinek
f4a305ee40
Fixed a crash when rotating the Fingerprint renaming dialog
...
Bug: 21815069
Change-Id: Ice90a5786685c300a522a908c1107af9e5311eb3
2015-06-19 13:15:13 -07:00
Robin Lee
02a0cf3ae3
am 3a839be7: Merge "Only unregister the network callback at onPause" into mnc-dev
...
* commit '3a839be7c165ea152179fb5b4531f4f6fdb7c822':
Only unregister the network callback at onPause
2015-06-19 20:10:51 +00:00
Robin Lee
3a839be7c1
Merge "Only unregister the network callback at onPause" into mnc-dev
2015-06-19 20:03:06 +00:00
Jason Monk
9c4c45b340
am 6a7c7562: am d63e6969: Merge "Add content description to owner info status text" into mnc-dev
...
* commit '6a7c756208555a41b4433b3a0ce12ef1c101215c':
Add content description to owner info status text
2015-06-19 16:15:37 +00:00
John Spurlock
5a148d1bc2
am b9ea1310: am 7699cad0: Merge "Settings: Add widget entry point to magical entry points listing." into mnc-dev
...
* commit 'b9ea1310441d8602b4a51e1c1746e88e45dbc745':
Settings: Add widget entry point to magical entry points listing.
2015-06-19 16:15:25 +00: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
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
b9ea131044
am 7699cad0: Merge "Settings: Add widget entry point to magical entry points listing." into mnc-dev
...
* commit '7699cad0042b8bc8cf3cd5ca728f013abe175de8':
Settings: Add widget entry point to magical entry points listing.
2015-06-19 15:03:16 +00: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
Brian Carlstrom
34e39e7cff
am 9dca3951: am 2567514a: Merge "Clarify process_dex2oat_label description" into mnc-dev
...
* commit '9dca3951f6abd2644b899c34c930da0456b7f814':
Clarify process_dex2oat_label description
2015-06-19 13:59:04 +00:00
Sanket Padawe
4ad7f6254d
am aa10a9ec: am 5ba90c14: Increase char limit of the data usage Settings string to 33.
...
* commit 'aa10a9ec83a639498a1fe5ff483f05a668cdf773':
Increase char limit of the data usage Settings string to 33.
2015-06-19 13:58:57 +00: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
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
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
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
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
beaae8367a
am 6c5b27e0: Merge "Fix opening secured networks from QS" into mnc-dev
...
* commit '6c5b27e042b5d36f404f11da85145a287a6f1df4':
Fix opening secured networks from QS
2015-06-18 19:29:48 +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
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
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
4dd013efc1
Fix opening secured networks from QS
...
Bug: 21908788
Change-Id: I09b1d22ae8b1815e720bd8c05fa1e38d66d1dcfd
2015-06-18 12:36:34 -04:00
Jason Monk
beab783cfd
am 6afa2a51: am ed672cfc: Merge "Revert "Accounts -> Account sync"" into mnc-dev
...
* commit '6afa2a51245cf026ba1606098d65db6d958da1c6':
Revert "Accounts -> Account sync"
2015-06-18 16:20:26 +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
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
Jason Monk
f99a90d139
am eddd983d: am 58f6728e: Allow give/take in app version/disabled fields
...
* commit 'eddd983de58b0fc5499e06591fa3750ff3d7292b':
Allow give/take in app version/disabled fields
2015-06-18 15:49:16 +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
06fc34e25a
Revert "Accounts -> Account sync"
...
This reverts commit 43db745ea0
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
Junda Liu
3d9ccb0ff4
am 2c55f738: Merge "Don\'t show SIM lock Setting if carrier config hides it." into mnc-dev
...
* commit '2c55f738c4336a3f379f94f4142c20a473ae3a9a':
Don't show SIM lock Setting if carrier config hides it.
2015-06-18 15:41:33 +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
