Fan Zhang
1f1fa944db
Merge "Show setting for work profile lock screen notification" into oc-dev am: 5bb87f9f34
...
am: e8e23081fa
2017-05-25 23:27:58 +00:00
jackqdyulei
5f5d409e54
Merge "Sort app list after smeared on screen" into oc-dev am: f68bb7e75c
...
am: 9a091aaac0
2017-05-25 23:27:26 +00:00
Fan Zhang
e8e23081fa
Merge "Show setting for work profile lock screen notification" into oc-dev
...
am: 5bb87f9f34
2017-05-25 23:16:54 +00:00
jackqdyulei
9a091aaac0
Merge "Sort app list after smeared on screen" into oc-dev
...
am: f68bb7e75c
2017-05-25 23:16:24 +00:00
TreeHugger Robot
5bb87f9f34
Merge "Show setting for work profile lock screen notification" into oc-dev
2017-05-25 22:41:07 +00:00
TreeHugger Robot
f68bb7e75c
Merge "Sort app list after smeared on screen" into oc-dev
2017-05-25 22:41:00 +00:00
TreeHugger Robot
3d4faff784
Merge "Add logging to default browser preference controller"
2017-05-25 21:27:23 +00:00
TreeHugger Robot
5c4b1f095e
Merge "Show setting for work profile lock screen notification"
2017-05-25 20:37:50 +00:00
Alison Cichowlas
de01ab40a5
Merge "Update notification settings to match Notification Dot branding." into oc-dev am: ed8b39fe60
...
am: a974b8c595
2017-05-25 20:21:48 +00:00
Lei Yu
e3aefdc320
Merge "Add NPE check for refreshUi" into oc-dev am: 1a8c2dd899
...
am: 9e56dd44cd
2017-05-25 20:21:19 +00:00
Alison Cichowlas
a974b8c595
Merge "Update notification settings to match Notification Dot branding." into oc-dev
...
am: ed8b39fe60
2017-05-25 20:09:22 +00:00
Lei Yu
9e56dd44cd
Merge "Add NPE check for refreshUi" into oc-dev
...
am: 1a8c2dd899
2017-05-25 20:07:20 +00:00
TreeHugger Robot
ed8b39fe60
Merge "Update notification settings to match Notification Dot branding." into oc-dev
2017-05-25 20:06:28 +00:00
Lei Yu
1a8c2dd899
Merge "Add NPE check for refreshUi" into oc-dev
2017-05-25 19:51:14 +00:00
TreeHugger Robot
5452b5474f
Merge "Add setIconContentDescription to EntityHeaderController"
2017-05-25 19:45:32 +00:00
Fan Zhang
378967484a
Add logging to default browser preference controller
...
Bug: 38480521
Test: manual
Change-Id: I1b0d389f0aa6cc4c9d1895e4cae4d0561df0f0ca
2017-05-25 12:22:21 -07:00
Fan Zhang
879f079e04
Show setting for work profile lock screen notification
...
- Add work profile notification setting to security_lockscreen_setting
- Modify the preference controller to stop hardcode preference keys.
Merged-In: I779590e34c1eca2dab5b62dda473cfa4371fc064
Change-Id: I5966d82f6373b3bf784385423b87fb4d26aecf0e
Fix: 62051309
Fix: 62045663
Test: make RunSettingsRoboTests
2017-05-25 11:49:56 -07:00
Fan Zhang
33c493777b
Show setting for work profile lock screen notification
...
- Add work profile notification setting to security_lockscreen_setting
- Modify the preference controller to stop hardcode preference keys.
cherry-pick of: ag/2315314
Bug: 62051309
Bug: 62045663
Test: make RunSettingsRoboTests
Change-Id: I779590e34c1eca2dab5b62dda473cfa4371fc064
2017-05-25 11:49:10 -07:00
jackqdyulei
f984b1e1ae
Sort app list after smeared on screen
...
Then we could make sure the app list is sorted
Bug: 62035385
Test: RunSettingsRoboTests
Change-Id: I3fa3d6ffc5930cf011e382632143e459fdbc4369
Merged-In: I3fa3d6ffc5930cf011e382632143e459fdbc4369
2017-05-25 10:09:05 -07:00
Philip Quinn
a0d327a5ac
Merge "Add metrics category for the assist gesture settings."
2017-05-25 16:18:54 +00:00
Alison Cichowlas
5fe7b7985c
Update notification settings to match Notification Dot branding.
...
Bug: 38387970
Test: string changes only, manually verified
Change-Id: If4086c9c89bef07a6ce0bb1d2ea4259c6369e93b
2017-05-25 09:38:14 -04:00
Charles He
0b7dfb03c2
Merge "Make failed ConfirmCredential attempts count towards wipe"
2017-05-25 12:35:43 +00:00
TreeHugger Robot
2e283ab634
Merge "Add icons to choose lock dialog"
2017-05-25 04:43:28 +00:00
jackqdyulei
0658dcd6fa
Merge "Turn on power accounting in AOSP" into oc-dev am: 0a6d61883c
...
am: db42779cf1
2017-05-25 04:04:47 +00:00
jackqdyulei
db42779cf1
Merge "Turn on power accounting in AOSP" into oc-dev
...
am: 0a6d61883c
2017-05-25 04:01:46 +00:00
TreeHugger Robot
0a6d61883c
Merge "Turn on power accounting in AOSP" into oc-dev
2017-05-25 03:57:29 +00:00
Fan Zhang
b84b9cc8e7
Merge "Recursively remove preference from screen." into oc-dev am: 7731b4244e
...
am: 4472d8af83
2017-05-25 03:28:15 +00:00
Fan Zhang
4472d8af83
Merge "Recursively remove preference from screen." into oc-dev
...
am: 7731b4244e
2017-05-25 03:25:43 +00:00
TreeHugger Robot
7731b4244e
Merge "Recursively remove preference from screen." into oc-dev
2017-05-25 03:22:51 +00:00
Doris Ling
28068990d2
Merge "Listener to tether state change on Network & internet page." into oc-dev am: 1dead24890
...
am: be520a5f34
2017-05-25 02:37:59 +00:00
Doris Ling
be520a5f34
Merge "Listener to tether state change on Network & internet page." into oc-dev
...
am: 1dead24890
2017-05-25 02:34:26 +00:00
TreeHugger Robot
1dead24890
Merge "Listener to tether state change on Network & internet page." into oc-dev
2017-05-25 02:25:56 +00:00
TreeHugger Robot
f688c5612c
Merge "Sort app list after smeared on screen"
2017-05-25 02:25:41 +00:00
TreeHugger Robot
2cc13a8206
Merge "Migrate settings robolectric tests to mockito 2"
2017-05-25 02:20:37 +00:00
TreeHugger Robot
0965a9ded4
Merge "Set correct uid when loading app icon in data usage UI."
2017-05-25 02:13:13 +00:00
TreeHugger Robot
755ff93155
Merge "Add a flag for the Bluetooth device details page"
2017-05-25 02:10:35 +00:00
TreeHugger Robot
939362671b
Merge "UI Cleanup on supported links dialog in app info page."
2017-05-25 02:04:36 +00:00
Maurice Lam
35c9abd4af
Add icons to choose lock dialog
...
- Add icons to items in choose lock dialog
- Add title to the dialog
- Update the font size and color to match specs
Test: Manual. Existing tests pass
Bug: 38394440
Change-Id: Ie7ed9944b71fa5ca408ec6898f49cbd36865a1dd
2017-05-24 18:57:48 -07:00
Antony Sargent
ff8e3e7bde
Add setIconContentDescription to EntityHeaderController
...
This lets us set a contentDescription on the icon in entity headers
for accessibility.
Bug: 62068874
Test: make RunSettingsRoboTests
Change-Id: I1af7aad34aa65b616cf4edb8b144f315040a9fdd
2017-05-24 17:21:58 -07:00
jackqdyulei
0b83954f1c
Add NPE check for refreshUi
...
The reason for NPE is that callback is registered too early, so
one callback is invoked before controller is fully inited. This
cl fix it in two ways:
1. Add NPE check in refreshUi, since this method in InstalledAppDetail
is robost to NPE
2. Move the callback to the end of constructor.
Bug: 37913054
Test: RunSettingsRoboTests
Change-Id: I54b03fb51a958a8e63bfe8a7ccfda79be1fa1956
2017-05-24 17:06:20 -07:00
Doris Ling
5bf5c8ac04
Listener to tether state change on Network & internet page.
...
User can navigates to the page and turn hotspot on or off from the quick
settings. Need to listen to the tether state updates to refresh the
summary for the Hotspot & tethering preference accordingly.
Change-Id: I7c6869b909306b09556e19cf7b7543ce9dcd890e
Fix: 38452559
Test: make RunSettingsRoboTests
2017-05-24 16:51:14 -07:00
Antony Sargent
e4a9530cc1
Add a flag for the Bluetooth device details page
...
This flag will be used to control whether we use a new, separate page
for Bluetooth device details, or the existing dialog.
Bug: 35877479
Test: make RunSettingsGoogleRoboTests
Change-Id: I2bda77493695ebe3b3bb824657a1422a68918256
2017-05-24 16:37:42 -07:00
Fan Zhang
0b6f8fad03
UI Cleanup on supported links dialog in app info page.
...
- Simplify layout file
- Increase paddings
Change-Id: I61b7d9315f74172aeb036ef835de73e268329de5
Fix: 62065754
Test: visual
2017-05-24 16:33:08 -07:00
Fan Zhang
17d63964c7
Set correct uid when loading app icon in data usage UI.
...
work profile apps belongs to a different user. Set the correct uid when
loading the icon so the work profile badge is displayed.
Change-Id: I2ed27d6b83c1b42961500dc8d63475bf1f7eabcd
Fix: 38372681
Test: make RunSettingsRoboTests
2017-05-24 16:04:23 -07:00
Fan Zhang
21aab578c9
Tether screen cleanup am: 20ae31e87c
...
am: a6f821c015
2017-05-24 22:51:59 +00:00
Fan Zhang
a6f821c015
Tether screen cleanup
...
am: 20ae31e87c
2017-05-24 22:48:55 +00:00
Maurice Lam
046400c2c4
Migrate settings robolectric tests to mockito 2
...
- Migrated ArgumentMatcher subclasses to lambdas
- Replaced any() with nullable() where tests were failing
Test: cd tests/robotests && mma
Bug: 38456058
Change-Id: Ice8c39b435c45b87f82dbbd9860e68f235314cf8
2017-05-24 15:14:31 -07:00
Fan Zhang
e84407f5c3
Recursively remove preference from screen.
...
The preference framework does not remove pref recursively. So when a
preference is nested in preference hierarchy, it's not safe to simply
call screen.removePreference(). We need to first find its parent and
remove pref from its parent.
Change-Id: Ic7fefa498ed71a8877d862845ddcc2d6d6034a55
Fix: 38507066
Test: make RunSettingsRoboTests
2017-05-24 21:21:00 +00:00
Fan Zhang
20ae31e87c
Tether screen cleanup
...
- Add a summary placeholder reserving 2 lines for wifi tether pref
- Replace DividerPreference with regular Preference
Change-Id: I2e0c36f27abe2c17625d00d80c816b526f59a6fd
Fix: 37518463
Test: visual
(cherry picked from commit d80117dcea
2017-05-24 19:59:15 +00:00
Phil Weaver
be39d57762
Merge "Follow O patterns for a11y settings"
2017-05-24 19:37:41 +00:00
