Phil Weaver
9eb8ba1b6f
Merge "Indicate when accessibility services have stopped" into pi-dev
...
am: 656aad9c93
Change-Id: I850746d339b79b5fa8353ded4a6fea05a7f5f32c
2018-03-20 21:52:56 +00:00
Salvador Martinez
b07afe0538
Merge "Update metered string" into pi-dev
...
am: f9dade022c
Change-Id: I135eb619e7aa94e1f767cb8f5662286a86c91760
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
Change-Id: Ia4c21f5d21f40b9a17e0b7ae6eb65ab6a8ad08ff
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
Change-Id: I9adcbcba0c8c72d7f459e7e7d3639686df2b944d
2018-03-20 21:34:22 +00:00
Qingxi Li
c3d81ef8ab
Merge "UI Tweak for eSIM related" into pi-dev
...
am: 2a6b9ff315
Change-Id: I286216110518f2143bbddf943b24e560f1e8a192
2018-03-20 21:33:53 +00:00
Pavel Grafov
dfd74e5b1a
Merge "Remove "don't show" option from work notifications settings" into pi-dev
...
am: be3e5caa7f
Change-Id: I2e7bc6a3494d58569944d5d7ee36fe91ca1c4863
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
Change-Id: I70c2f9cb56da14cd56e0b799b3b815bd54642bad
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
Change-Id: I6d41d2c9cf285a587c4e5b264251da3da80e7071
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
632d6e06ca
Merge "Remove touch effect of Ratio on listitem" into pi-dev
...
am: a976a0eaad
Change-Id: Id8226bd927f8553335e88cce4bd3fe4a2d81833b
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
2576b0467b
Make the preference not selectable
...
am: 7ac7d7b660
Change-Id: I2a3f289bbf5881d99674b9b8af5eb61dad04b508
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
0c028eaf69
Merge "Reword settings suggestion tile text for airplane mode" into pi-dev
...
am: cbf9300cd2
Change-Id: Ic2feab06f0d9aeb9e9b404747e7bd6fb44f40ac3
2018-03-20 06:46:06 +00:00
TreeHugger Robot
cbf9300cd2
Merge "Reword settings suggestion tile text for airplane mode" into pi-dev
2018-03-20 06:37:35 +00:00
ryanywlin
ef680f82db
Merge "Add "take call on" string for audio output switcher." into pi-dev
...
am: cd908497d6
Change-Id: I7d05037db8d57e9dc891f195d06da18ae529d5c2
2018-03-20 06:06:35 +00:00
Andreas Terzis
b32915a9a7
Merge "In Data Usage screen, hide data bar if plan is unlimited" into pi-dev
...
am: 91ea3c5e56
Change-Id: I17360c93f650a7f9705295961ce4459d9acb32dd
2018-03-20 06:05:54 +00:00
TreeHugger Robot
cd908497d6
Merge "Add "take call on" string for audio output switcher." into pi-dev
2018-03-20 05:52:06 +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
Lei Yu
fca54d8788
Merge "Add summary for battery manager preference" into pi-dev
...
am: 06d5188a71
Change-Id: I69d1a30f9d6ae1682b806c80a976ddad1f37c3c2
2018-03-20 05:23:20 +00:00
Lei Yu
b5d38cc5f9
Merge "Update string for battery seekbar" into pi-dev
...
am: 8916df573d
Change-Id: I35400bdfe84594be938373a28fd9c660a34cce3f
2018-03-20 05:22:36 +00:00
Sunny Goyal
472037fdd3
Merge "Fixing settings crash when no default home app is set" into pi-dev
...
am: ee2ac81999
Change-Id: Ie74613b09179d9c518139cfc597ad62479d9d7c5
2018-03-20 05:22:09 +00:00
hughchen
5cf0b2843e
Merge "Change BatteryUtils.isLegacyApp() to isPreOApp()" into pi-dev
...
am: 138bdf6030
Change-Id: I80fba5f82a2b75a88660478cc91077db648f8204
2018-03-20 05:21:34 +00:00
timhypeng
4ae326b54d
Merge "Add new string for audio switch" into pi-dev
...
am: 73f1a3180a
Change-Id: Ib10a001446f04bbbd0e5a7a127a777a8d1a43184
2018-03-20 05:20:51 +00:00
Maurice Lam
f7c9fbea5e
Merge "Make "minimal" pattern layout sw320dp" into pi-dev
...
am: b98eea4c67
Change-Id: I54ae0434ed07e0bb2842317d91cc6c8b5af8406b
2018-03-20 05:20:05 +00:00
Fan Zhang
e147c48470
Merge "Update switch bar summary for spell checker page" into pi-dev
...
am: 39b54ea1f8
Change-Id: I66bcfd8f0bf5ddcebeca14cb5c1103278ff3a97f
2018-03-20 05:19:17 +00:00
HJ ChangLiao
cbd6c33774
Merge "Remove ops preference from specific app" into pi-dev
...
am: ac20e2d511
Change-Id: I0eb1403ecaaed7d2cfa932a0228e707653623a16
2018-03-20 05:17:57 +00:00
jdesprez
42e58da882
Merge "Update AndroidTest.xml to be APCT suite ready" into pi-dev
...
am: a2da6221c0
Change-Id: I59ed1b0b9bc8ee262f9bc1602ab03773e9f71026
2018-03-20 04:54:41 +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
8916df573d
Merge "Update string for battery seekbar" into pi-dev
2018-03-20 04:32:51 +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
73f1a3180a
Merge "Add new string for audio switch" into pi-dev
2018-03-20 04:08:27 +00:00
TreeHugger Robot
b98eea4c67
Merge "Make "minimal" pattern layout sw320dp" into pi-dev
2018-03-20 03:30:42 +00:00
ryanywlin
8f3f3c5a4e
Add "take call on" string for audio output switcher.
...
Bug: 74130772
Test: rebuild
Change-Id: I652015e0e051a37e8df2d8f7d04b2acbcc2bdaf6
2018-03-20 11:03:22 +08:00
TreeHugger Robot
39b54ea1f8
Merge "Update switch bar summary for spell checker page" into pi-dev
2018-03-20 02:58:38 +00:00
Lei Yu
549d4bd297
Merge "update "Last full charge" preference" into pi-dev
...
am: de0a3a5334
Change-Id: I8b7ef49bc738f88cf36d31208e5370a292eb23b5
2018-03-20 02:57:55 +00:00
TreeHugger Robot
ac20e2d511
Merge "Remove ops preference from specific app" into pi-dev
2018-03-20 02:35:21 +00:00
xshu
ba2acc4ba0
Updating special Settings Wi-Fi strings
...
am: e0a6d1640a
Change-Id: Ic9c587ed88b22d16f8f6ca1dca61bdcccf4214ff
2018-03-20 02:35:02 +00:00