Tony Mak
1b8ee6f122
Merge "Fix user id is not used correctly when fetching app info" into pi-dev am: ea43e8285e
...
am: e33a04e278
2018-03-21 00:53:18 +00:00
Phil Weaver
118c2b0d1c
Merge "Indicate when accessibility services have stopped" into pi-dev am: 656aad9c93
...
am: 9eb8ba1b6f
2018-03-21 00:06:20 +00:00
Hansong Zhang
97128f86d6
Merge "Move the setActiveDevice logic from Settings to SettingsLib (2/2)" into pi-dev am: 012e04fa02
...
am: fbd3076a84
2018-03-20 23:23:18 +00:00
Antoan Angelov
92cc5fa977
Merge "Show "Doesn't support work profiles" text in Settings for launchers not supporting work profiles." into pi-dev am: 1bc98edc15
...
am: 2465019035
2018-03-20 23:22:40 +00:00
Qingxi Li
e08fdbe27b
Merge "UI Tweak for eSIM related" into pi-dev am: 2a6b9ff315
...
am: c3d81ef8ab
2018-03-20 23:22:13 +00:00
Pavel Grafov
78fc22ff6b
Merge "Remove "don't show" option from work notifications settings" into pi-dev am: be3e5caa7f
...
am: dfd74e5b1a
2018-03-20 22:10:33 +00:00
Andrew Sapperstein
54762c6ff7
Merge "Remove LinearColorBar and replace uses with ProgressBar." into pi-dev am: a3970d4e52
...
am: e95d9f34f7
2018-03-20 20:28:44 +00:00
TreeHugger Robot
ea43e8285e
Merge "Fix user id is not used correctly when fetching app info" into pi-dev
2018-03-20 20:24:17 +00:00
TreeHugger Robot
656aad9c93
Merge "Indicate when accessibility services have stopped" into pi-dev
2018-03-20 20:16:09 +00:00
TreeHugger Robot
012e04fa02
Merge "Move the setActiveDevice logic from Settings to SettingsLib (2/2)" into pi-dev
2018-03-20 19:56:51 +00:00
Antoan Angelov
1bc98edc15
Merge "Show "Doesn't support work profiles" text in Settings for launchers not supporting work profiles." into pi-dev
2018-03-20 19:33:17 +00:00
TreeHugger Robot
2a6b9ff315
Merge "UI Tweak for eSIM related" into pi-dev
2018-03-20 19:24:59 +00:00
TreeHugger Robot
be3e5caa7f
Merge "Remove "don't show" option from work notifications settings" into pi-dev
2018-03-20 18:41:13 +00:00
Hansong Zhang
02acba607a
Move the setActiveDevice logic from Settings to SettingsLib (2/2)
...
Currently the Settings app handles the logic of setting active device;
however, this should be handled by SettingsLib so the logic can be shared.
Bug: 75984255
Test: robolectric test
Change-Id: I5742de1463d156ff29708ea2aecfc3fd00795e9e
2018-03-20 10:43:15 -07:00
TreeHugger Robot
a3970d4e52
Merge "Remove LinearColorBar and replace uses with ProgressBar." into pi-dev
2018-03-20 17:11:51 +00:00
arangelov
2c9d620091
Show "Doesn't support work profiles" text in Settings for launchers not
...
supporting work profiles.
Screenshot: https://screenshot.googleplex.com/iz3xoeSvbOA.png
Test: Manually go to Settings -> Apps & notifications -> Default apps -> Home app.
Test: make ROBOTEST_FILTER=RadioButtonPreferenceTest -j40 RunSettingsRoboTests
Bug: 69297461
Change-Id: I55c721d7ad979c882bb879a974758cf08eaf0c86
2018-03-20 16:56:36 +00:00
Pavel Grafov
72137f3aad
Remove "don't show" option from work notifications settings
...
Option to not show notifications is still available for
device-wide locks screen notification settings.
Also s/On lock screen/When work profile is locked/ for work
notifications since it applies not only to lock screen but to
notification shade as well.
Bug: 64829587
Test: make RunSettingsRoboTests
Change-Id: Ie3ec461f4c8887a5a49cd92b5350ea683f701027
2018-03-20 16:39:29 +00:00
Yvonne Yang
03315c6b6f
Make the preference not selectable am: 7ac7d7b660
...
am: 2576b0467b
2018-03-20 11:46:37 +00:00
Yvonne Yang
7ac7d7b660
Make the preference not selectable
...
"Battery usage data isn't available" should not respond to taps
Bug: 69312966
Test: Manual test
Change-Id: Id450c5a6089a4fb78a5c48a0f460992dc89f49ec
2018-03-20 08:41:46 +00:00
Andreas Terzis
f0ab2102e8
Merge "In Data Usage screen, hide data bar if plan is unlimited" into pi-dev am: 91ea3c5e56
...
am: b32915a9a7
2018-03-20 08:34:15 +00:00
Lei Yu
cbbe4a337f
Merge "Add summary for battery manager preference" into pi-dev am: 06d5188a71
...
am: fca54d8788
2018-03-20 08:33:21 +00:00
Sunny Goyal
e89345ac20
Merge "Fixing settings crash when no default home app is set" into pi-dev am: ee2ac81999
...
am: 472037fdd3
2018-03-20 08:31:14 +00:00
hughchen
7fc5f884db
Merge "Change BatteryUtils.isLegacyApp() to isPreOApp()" into pi-dev am: 138bdf6030
...
am: 5cf0b2843e
2018-03-20 08:28:14 +00:00
Fan Zhang
c83966663e
Merge "Update switch bar summary for spell checker page" into pi-dev am: 39b54ea1f8
...
am: e147c48470
2018-03-20 08:06:26 +00:00
HJ ChangLiao
e1c2c8d9b3
Merge "Remove ops preference from specific app" into pi-dev am: ac20e2d511
...
am: cbd6c33774
2018-03-20 08:04:11 +00:00
Lei Yu
ccba53cb0b
Merge "update "Last full charge" preference" into pi-dev am: de0a3a5334
...
am: 549d4bd297
2018-03-20 07:44:49 +00:00
Hall Liu
e3b9578658
Merge "Split "Mobile Network Type" indication in Settings" into pi-dev am: 8837f992bb
...
am: 0738a917df
2018-03-20 07:12:38 +00:00
Lei Yu
306f7312f4
Merge "Update the mechanism to upload new anomaly config" into pi-dev am: d06991821f
...
am: f31a7c546d
2018-03-20 05:58:53 +00:00
Andreas Terzis
91ea3c5e56
Merge "In Data Usage screen, hide data bar if plan is unlimited" into pi-dev
2018-03-20 05:49:51 +00:00
Phil Weaver
03f49cf863
Merge "Update string for dwell click timing" into pi-dev am: c10659cee7
...
am: 5f6dd9b4f2
2018-03-20 05:22:49 +00:00
TreeHugger Robot
06d5188a71
Merge "Add summary for battery manager preference" into pi-dev
2018-03-20 04:36:48 +00:00
TreeHugger Robot
ee2ac81999
Merge "Fixing settings crash when no default home app is set" into pi-dev
2018-03-20 04:32:10 +00:00
TreeHugger Robot
138bdf6030
Merge "Change BatteryUtils.isLegacyApp() to isPreOApp()" into pi-dev
2018-03-20 04:09:27 +00:00
TreeHugger Robot
39b54ea1f8
Merge "Update switch bar summary for spell checker page" into pi-dev
2018-03-20 02:58:38 +00:00
TreeHugger Robot
ac20e2d511
Merge "Remove ops preference from specific app" into pi-dev
2018-03-20 02:35:21 +00:00
Lei Yu
6c16840ff5
Add summary for battery manager preference
...
Show different summary based on whether it is on and there is restricted
apps.
Also move method to get restricted app list to BatteryTipUtils since it
is used in 2 places.
Bug: 73018395
Test: RunSettingsRoboTests
Change-Id: Ib2306e0fd1f520fde6d1403ce9c527c241d36005
2018-03-19 19:27:36 -07:00
Sunny Goyal
617acf352b
Fixing settings crash when no default home app is set
...
Test: make -j20 RunSettingsRoboTests
Bug: 74519090
Change-Id: I8846bae1f0083be981cfde9a68291c1b01359228
2018-03-20 02:08:14 +00:00
hughchen
18ce28ed33
Change BatteryUtils.isLegacyApp() to isPreOApp()
...
Bug: 73792442
Test: RunSettingsRoboTests
make -j40 RunSettingsRoboTests
Change-Id: I770030a8f38ec6156aa2a40f4c88ac9e0673751d
2018-03-20 01:44:43 +00:00
Fan Zhang
1a77cfc8fe
Update switch bar summary for spell checker page
...
Change-Id: If48ad81e5ad5e4a7bd65ede5ed67d28250fbe8ed
Fixes: 75277295
Test: atest SpellCheckerSettingsUITest
2018-03-19 18:05:10 -07:00
Phil Weaver
6cd554f397
Indicate when accessibility services have stopped
...
Bug: 35219990
Test: Created an accessibility service that crashes, and
then verified that the new status is reflected in
Settings.
Change-Id: I676c8e87f7642366a51b139f46cf8e3094a58d50
2018-03-19 17:39:23 -07:00
Lei Yu
de0a3a5334
Merge "update "Last full charge" preference" into pi-dev
2018-03-20 00:33:29 +00:00
Andrew Sapperstein
38bf192ed6
Remove LinearColorBar and replace uses with ProgressBar.
...
We never actually needed it, since progress bar can do
everything we want it to. Renamed data_usage_progress to
color_bar_progress to reflect its more generic state.
Updated color_bar_progress to use proper values.
Since we can't seem to use private attrs in settings,
use the dimen/color values that are customizable.
Updated usages to use regular ProgressBar APIs.
Fixes: 74111937
Test: visual inspection and robotests
Change-Id: I4f0c59e6cf5c629e3cc3901800d9c4afc95fa495
2018-03-19 15:11:49 -07:00
Hall Liu
8837f992bb
Merge "Split "Mobile Network Type" indication in Settings" into pi-dev
2018-03-19 21:15:26 +00:00
Jan Nordqvist
641288f7c1
In Data Usage screen, hide data bar if plan is unlimited
...
Bug: 70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I1314bdf9748c55a2391ccb39ff66c3dcb133be7e
2018-03-19 14:13:47 -07:00
Tony Mak
4e29281b99
Fix user id is not used correctly when fetching app info
...
FIXES: 73994288
Test: m -j RunSettingsRoboTest
Test: Install an app in work profile, set it to be restricted,
observe that the app is rendered properly in restricted app list
Change-Id: Ic8a79eb3d0a675f9d1cae3125e8006739e492966
2018-03-19 20:31:17 +00:00
Lei Yu
d06991821f
Merge "Update the mechanism to upload new anomaly config" into pi-dev
2018-03-19 20:20:15 +00:00
Lei Yu
8b148924de
update "Last full charge" preference
...
When there is average time estimation, change it to "Full charge lasts
about" and also update the time.
Also update the BatteryInfo to return average time estimation even
though it is charging.
Bug: 73018395
Test: RunSettingsRoboTests
Change-Id: Ib22dadb5716e3034c60aeeb7768fdbf0cc86be0c
2018-03-19 13:18:27 -07:00
Phil Weaver
c10659cee7
Merge "Update string for dwell click timing" into pi-dev
2018-03-19 19:58:02 +00:00
Jong Wook Kim
056aea7eff
Merge "Display "MAC address is randomized" in Wifi Preference Page" into pi-dev am: 8a022d8693
...
am: 3520bfc36d
2018-03-19 19:39:22 +00:00
Jong Wook Kim
8a022d8693
Merge "Display "MAC address is randomized" in Wifi Preference Page" into pi-dev
2018-03-19 18:14:08 +00:00
