Jason Monk
e09535541d
am 591aa6ae
: am d8c811d8
: am b4b590d1
: Merge "Update disable dialog" into mnc-dev
...
* commit '591aa6ae9ed7bd254df849fd154ce2de70eb60c1':
Update disable dialog
2015-06-22 16:07:16 +00:00
Jason Monk
591aa6ae9e
am d8c811d8
: am b4b590d1
: Merge "Update disable dialog" into mnc-dev
...
* commit 'd8c811d8b80d251630303afda518c8407424abae':
Update disable dialog
2015-06-22 15:54:26 +00:00
Jason Monk
b4b590d13f
Merge "Update disable dialog" into mnc-dev
2015-06-22 14:55:14 +00:00
Pavel Zhamaitsiak
8e3ce3da36
am bfa2bf65
: am a8491f34
: am 5a6d17c8
: Log WiFi Calling actions from settings
...
* commit 'bfa2bf654b3391349f8e16d846df45da2177192a':
Log WiFi Calling actions from settings
2015-06-22 04:06:20 +00:00
Pavel Zhamaitsiak
bfa2bf654b
am a8491f34
: am 5a6d17c8
: Log WiFi Calling actions from settings
...
* commit 'a8491f348ef1a1f10278a83bb33b2b38723fb30c':
Log WiFi Calling actions from settings
2015-06-22 03:54:39 +00:00
Pavel Zhamaitsiak
5a6d17c8cd
Log WiFi Calling actions from settings
...
Change-Id: Ie18bf18de22469f9b2615ba19f088316d20464d7
2015-06-20 15:49:08 -07:00
Adrian Roos
952471b0e3
am e14151f9
: am 5023c89d
: am a029671b
: Merge "Work around improper ListView recycling in TrustAgentSettings" into mnc-dev
...
* commit 'e14151f9c9761d4ccecb9fc677f7b291d287d8e0':
Work around improper ListView recycling in TrustAgentSettings
2015-06-20 05:44:35 +00:00
Selim Cinek
23731e5339
am d49930c2
: am e4daef16
: am 5f0976a0
: Merge "Fixed a crash when rotating the Fingerprint renaming dialog" into mnc-dev
...
* commit 'd49930c28f9c1724fefb7cc986e6ddd5a060b1bd':
Fixed a crash when rotating the Fingerprint renaming dialog
2015-06-20 05:44:33 +00:00
Adrian Roos
e14151f9c9
am 5023c89d
: am a029671b
: Merge "Work around improper ListView recycling in TrustAgentSettings" into mnc-dev
...
* commit '5023c89d24723f1fc8e5b176fab476d80484b974':
Work around improper ListView recycling in TrustAgentSettings
2015-06-20 03:41:02 +00:00
Selim Cinek
d49930c28f
am e4daef16
: am 5f0976a0
: Merge "Fixed a crash when rotating the Fingerprint renaming dialog" into mnc-dev
...
* commit 'e4daef16c573913fdac8aaf79acb0754004d53d5':
Fixed a crash when rotating the Fingerprint renaming dialog
2015-06-20 03:41:01 +00:00
Adrian Roos
a029671bfd
Merge "Work around improper ListView recycling in TrustAgentSettings" into mnc-dev
2015-06-20 03:23:03 +00:00
Selim Cinek
5f0976a0ac
Merge "Fixed a crash when rotating the Fingerprint renaming dialog" into mnc-dev
2015-06-20 03:21:21 +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
Robin Lee
b745831e3f
am 645c4e32
: am 02a0cf3a
: am 3a839be7
: Merge "Only unregister the network callback at onPause" into mnc-dev
...
* commit '645c4e327cda52b5dbc9560aece66edb075d7658':
Only unregister the network callback at onPause
2015-06-19 21:40:34 +00: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
3a839be7c1
Merge "Only unregister the network callback at onPause" into mnc-dev
2015-06-19 20:03:06 +00:00
Jason Monk
0591282f2a
am 9c4c45b3
: am 6a7c7562
: am d63e6969
: Merge "Add content description to owner info status text" into mnc-dev
...
* commit '9c4c45b34013514b4f8a734b3f8d146dc613e46b':
Add content description to owner info status text
2015-06-19 16:26:37 +00:00
John Spurlock
7eb1906fcc
am 5a148d1b
: am b9ea1310
: am 7699cad0
: Merge "Settings: Add widget entry point to magical entry points listing." into mnc-dev
...
* commit '5a148d1bc210256c74d45e25cae59f5eb27c931b':
Settings: Add widget entry point to magical entry points listing.
2015-06-19 16:26:36 +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
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
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
Jason Monk
8af26277a3
am 8a753643
: am 5fd5890f
: am 47a26c79
: Merge "Fix ListView being too eager too scroll" into mnc-dev
...
* commit '8a753643058760fb44a286dbf7d198053a3f3a01':
Fix ListView being too eager too scroll
2015-06-18 20:43:09 +00: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
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
feaae6959a
am aa5964de
: am beaae836
: am 6c5b27e0
: Merge "Fix opening secured networks from QS" into mnc-dev
...
* commit 'aa5964de3768703de9dfa88fb7aa66ece7a353fe':
Fix opening secured networks from QS
2015-06-18 19:55:32 +00: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
6c5b27e042
Merge "Fix opening secured networks from QS" into mnc-dev
2015-06-18 19:19:12 +00:00
Alex Chau
3fb2e54ace
am ee6ffccb
: am 1e24271a
: am cd0da9c1
: Merge "Enforce Keyguard policy in Notification Settings" into mnc-dev
...
* commit 'ee6ffccbc7ff4015597da1fcc725456117a3141c':
Enforce Keyguard policy in Notification Settings
2015-06-18 17:47:27 +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
163fbd25be
am e707ea37
: am a0336eb4
: am 1a129e0f
: Merge "Remove battery history graph from details screen" into mnc-dev
...
* commit 'e707ea3720188599385be2abaa9efbdf14f0560c':
Remove battery history graph from details screen
2015-06-18 16:12:00 +00:00
Junda Liu
9eeb63f501
am 5410a176
: am 3d9ccb0f
: am 2c55f738
: Merge "Don\'t show SIM lock Setting if carrier config hides it." into mnc-dev
...
* commit '5410a1769821c016f869493c638f18a8f2a79bf0':
Don't show SIM lock Setting if carrier config hides it.
2015-06-18 16:11:58 +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
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
0095930e12
am 1c8a483c
: am a82961f1
: am f8577c68
: Merge "Support disabled until used apps" into mnc-dev
...
* commit '1c8a483cb662da6b6aa685558e0058bebdc13251':
Support disabled until used apps
2015-06-17 20:59:55 +00:00
Jason Monk
0036894557
am f5269f3b
: am c3570166
: am 2ab42701
: Merge "Fix accessibility for empty list on notification access" into mnc-dev
...
* commit 'f5269f3bdedc9bb3087732e589a4f4c0ad18e63d':
Fix accessibility for empty list on notification access
2015-06-17 20:59:54 +00: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