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
Salvador Martinez
457f75a139
Merge "Update metered string" into pi-dev am: f9dade022c
...
am: b07afe0538
2018-03-21 00:05:45 +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
Chad Brubaker
803340d27d
Merge "Fix lockdown string" into pi-dev am: 91b6d17b8d
...
am: f74a874dda
2018-03-20 22:00:34 +00:00
Phil Weaver
9eb8ba1b6f
Merge "Indicate when accessibility services have stopped" into pi-dev
...
am: 656aad9c93
2018-03-20 21:52:56 +00:00
Salvador Martinez
b07afe0538
Merge "Update metered string" into pi-dev
...
am: f9dade022c
2018-03-20 21:51:43 +00:00
Hansong Zhang
fbd3076a84
Merge "Move the setActiveDevice logic from Settings to SettingsLib (2/2)" into pi-dev
...
am: 012e04fa02
2018-03-20 21:35:05 +00:00
Antoan Angelov
2465019035
Merge "Show "Doesn't support work profiles" text in Settings for launchers not supporting work profiles." into pi-dev
...
am: 1bc98edc15
2018-03-20 21:34:22 +00:00
Qingxi Li
c3d81ef8ab
Merge "UI Tweak for eSIM related" into pi-dev
...
am: 2a6b9ff315
2018-03-20 21:33:53 +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
Pavel Grafov
dfd74e5b1a
Merge "Remove "don't show" option from work notifications settings" into pi-dev
...
am: be3e5caa7f
2018-03-20 20:24:22 +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
f9dade022c
Merge "Update metered string" into pi-dev
2018-03-20 20:05:07 +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
Chad Brubaker
f74a874dda
Merge "Fix lockdown string" into pi-dev
...
am: 91b6d17b8d
2018-03-20 19:30:27 +00:00
TreeHugger Robot
2a6b9ff315
Merge "UI Tweak for eSIM related" into pi-dev
2018-03-20 19:24:59 +00:00
Andrew Sapperstein
e95d9f34f7
Merge "Remove LinearColorBar and replace uses with ProgressBar." into pi-dev
...
am: a3970d4e52
2018-03-20 19:10:46 +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
TreeHugger Robot
91b6d17b8d
Merge "Fix lockdown string" into pi-dev
2018-03-20 18:19:09 +00:00
Salvador Martinez
aea566d44e
Update metered string
...
This CL updates the metered network string to say
'detect automatically' instead of 'network preference'
Bug: 68030417
Test: rototest, visual inspection
Change-Id: I347e3b89b014d7ec0d5d0e6601f2813a3a96f5ab
2018-03-20 10:55:00 -07: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
HJ ChangLiao
baaf1fdfe8
Merge "Remove touch effect of Ratio on listitem" into pi-dev am: a976a0eaad
...
am: 632d6e06ca
2018-03-20 14:30:35 +00:00
HJ ChangLiao
632d6e06ca
Merge "Remove touch effect of Ratio on listitem" into pi-dev
...
am: a976a0eaad
2018-03-20 14:20:04 +00:00
TreeHugger Robot
a976a0eaad
Merge "Remove touch effect of Ratio on listitem" into pi-dev
2018-03-20 14:07:26 +00:00
Yvonne Yang
03315c6b6f
Make the preference not selectable am: 7ac7d7b660
...
am: 2576b0467b
2018-03-20 11:46:37 +00:00
Yvonne Yang
2576b0467b
Make the preference not selectable
...
am: 7ac7d7b660
2018-03-20 11:37:31 +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
Antony Sargent
b435d464af
Merge "Reword settings suggestion tile text for airplane mode" into pi-dev am: cbf9300cd2
...
am: 0c028eaf69
2018-03-20 08:35:40 +00:00
ryanywlin
59e9abaaa2
Merge "Add "take call on" string for audio output switcher." into pi-dev am: cd908497d6
...
am: ef680f82db
2018-03-20 08:34:53 +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
Lei Yu
f687bc9b99
Merge "Update string for battery seekbar" into pi-dev am: 8916df573d
...
am: b5d38cc5f9
2018-03-20 08:32:40 +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
timhypeng
8227e7cf31
Merge "Add new string for audio switch" into pi-dev am: 73f1a3180a
...
am: 4ae326b54d
2018-03-20 08:08:54 +00:00
Maurice Lam
52512f64ee
Merge "Make "minimal" pattern layout sw320dp" into pi-dev am: b98eea4c67
...
am: f7c9fbea5e
2018-03-20 08:07:54 +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
jdesprez
57b9e15574
Merge "Update AndroidTest.xml to be APCT suite ready" into pi-dev am: a2da6221c0
...
am: 42e58da882
2018-03-20 07:55:16 +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
xshu
da432d904a
Updating special Settings Wi-Fi strings am: e0a6d1640a
...
am: ba2acc4ba0
2018-03-20 07:32: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
Antony Sargent
0c028eaf69
Merge "Reword settings suggestion tile text for airplane mode" into pi-dev
...
am: cbf9300cd2
2018-03-20 06:46:06 +00:00
