Bill Yi
e6eb753eca
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c4a622b49
-s ours am: 1b13a3fc1a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13868208
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I79e3b6f2a6a8dfdd8546d54872487b2791cb0f83
2021-03-15 07:23:02 +00:00
Bill Yi
1b13a3fc1a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c4a622b49
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13868208
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I82d562515bf9c26ecb4ebca5759acb2b7a05688d
2021-03-15 07:06:56 +00:00
TreeHugger Robot
cf05544a9d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d5ab407fce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13868217
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie698d453d400a2c28d7b1d3ca99e14e8bab59ab5
2021-03-15 07:00:22 +00:00
TreeHugger Robot
e8c6929fb6
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-03-15 06:58:36 +00:00
TreeHugger Robot
ee26b511ad
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-03-15 06:37:39 +00:00
TreeHugger Robot
d5ab407fce
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-03-15 06:26:57 +00:00
tim peng
4c73082f9d
Merge "Show advanced Bluetooth information in device detail page" into sc-dev am: 28d9db3c86
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835806
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib01fa53298e2d44d08c3336a2c08d41a5caaee59
2021-03-15 05:50:55 +00:00
tim peng
28d9db3c86
Merge "Show advanced Bluetooth information in device detail page" into sc-dev
2021-03-15 05:26:45 +00:00
Jeremy Goldman
18b91319bd
Merge changes I94a881df,I59fd7765
...
* changes:
VpnPreferenceControllerTest converted to JUnit
Warning / Info icon added for the VPN Preference
2021-03-15 04:44:40 +00:00
Jeremy Goldman
7361f8557c
VpnPreferenceControllerTest converted to JUnit
...
global settings string set to guarantee pre-test environment.
PreferenceManager and PreferenceScreen instantiated instead of mocks,
and mock preference inserted with getKey function overridden.
Bug: 176821216
Test: atest -c VpnPreferenceControllerTest
Change-Id: I94a881df13d1b35126de10f561d657136e4fed7f
2021-03-15 03:36:37 +00:00
Stanley Wang
b8ee1d15e2
Merge "Remove the non-translatable tags from MainSwitch titles." into sc-dev am: 9138b055d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849829
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If892607b6518347272d90dae404556a010ccfbc2
2021-03-15 03:26:12 +00:00
Jeremy Goldman
a7774a10e0
Warning / Info icon added for the VPN Preference
...
Within the Provider Model, we would like to show a warning icon if the
user is detected to be using an insecure vpn type. This adds an icon for
that warning, and an imageview containing that layout to settings
Icon: https://screenshot.googleplex.com/644ZsGtVDp6hgZq
Bug: 176821216
Test: atest SettingsUnitTests
Change-Id: I59fd7765876fe58fe2c55929f711c04a45abbe09
2021-03-15 11:06:15 +08:00
Stanley Wang
9138b055d2
Merge "Remove the non-translatable tags from MainSwitch titles." into sc-dev
2021-03-15 02:53:56 +00:00
Jason Hsu
f3c5400b19
Merge "Update the vector drawable for accessibility button preview preference"
2021-03-15 02:41:09 +00:00
jasonwshsu
96121b3f0d
Update the vector drawable for accessibility button preview preference
...
Bug: 173940869
Test: manual test
Change-Id: Id24d1550e7c640a7fdbd752e3571296a7e6567d6
2021-03-15 02:39:46 +00:00
jasonwshsu
1a0e2b1be5
Remove the accessibility gesture tutorial dialog in system navigation
...
Accessibility gesture is replaced by the accessibility floating menu, remove the accessibility gesture tutorial dialog when choosing to use gesture navigation mode.
Bug: 173990914
Test: manual test
Change-Id: Iae5297747594fcc73fc9bc14537c8fdecb86b660
2021-03-15 02:39:37 +00:00
jasonwshsu
5fe2cdcf87
Update the dialog content for accessibility floating menu
...
Accessibility gesture is replaced by accessibility floating menu, related content in edit shortcut dialog and tutorial dialog are updated in this changelist.
Bug: 173990914
Test: manual test
Change-Id: Ie529fa8a1f8ee87ca1ec5611b35675cdfd762165
2021-03-15 02:39:27 +00:00
Tim Peng
90df1c9de1
Show advanced Bluetooth information in device detail page
...
-Apply new metadata on aosp/1596412
Bug: 182338346
Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsHeaderControllerTest
make -j50 RunSettingsRoboTests ROBOTEST_FILTER=AdvancedBluetoothDetailsHeaderControllerTest
Change-Id: Ic48ed9213111d0c6ec19b317d4c22e1400261706
2021-03-15 10:16:14 +08:00
TreeHugger Robot
8131f65703
Merge "Fix bluetooth settings will broadcast to anywhere when some cases" into sc-dev am: 70e508edd4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13839798
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2ca17ace2411223eea45fdb9cfca32fa0853d262
2021-03-15 02:01:59 +00:00
TreeHugger Robot
70e508edd4
Merge "Fix bluetooth settings will broadcast to anywhere when some cases" into sc-dev
2021-03-15 01:53:00 +00:00
Lucas Lin
d6e943144c
Merge "Use getPrivateDnsMode() to get the value of private DNS" into sc-dev am: be164d0a55
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13779500
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I515048404c3aa0ac616f1ad7f12581bf9a5a8537
2021-03-15 01:42:05 +00:00
Lucas Lin
be164d0a55
Merge "Use getPrivateDnsMode() to get the value of private DNS" into sc-dev
2021-03-15 01:00:25 +00:00
Bill Yi
464f6aa64c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic6dd705e34982d51bdd2648bc4f20646d7bd6aba
2021-03-14 22:14:01 +00:00
Bill Yi
de49feae60
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9888959e19cac6bc5c12e7ca04396cf3e074f591
2021-03-14 21:42:50 +00:00
Bill Yi
c9130edef7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie6541f8fa7e50b91c10d2e171e696a690f7c8c00
2021-03-14 20:40:56 +00:00
Bill Yi
0c4a622b49
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iccfaa49e229aeb8c5365144394c6fd2635ee2a91
2021-03-14 18:08:33 +00:00
Minche Li
869f92c092
Merge "Updates magnification settings string" into sc-dev am: 29ff0e0552
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815931
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4039523da9619ddc9e5efc763c296643496d6583
2021-03-14 02:32:58 +00:00
Minche Li
29ff0e0552
Merge "Updates magnification settings string" into sc-dev
2021-03-14 02:02:20 +00:00
Yanting Yang
7880411a96
Merge "Fix NPE for ConfigureNotificationSettings" into sc-dev am: d604ca93dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849827
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2d82fe3b483f581f3786e3b6fb17cae83581ec35
2021-03-13 17:07:24 +00:00
TreeHugger Robot
0f3f0c33d8
Merge "Fix the issue of the repo upload hooking checker" into sc-dev am: f575da48e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849842
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia272c7d7dd79e2381b04c1433d16e65696464276
2021-03-13 17:07:17 +00:00
Yanting Yang
d604ca93dc
Merge "Fix NPE for ConfigureNotificationSettings" into sc-dev
2021-03-13 16:56:29 +00:00
TreeHugger Robot
f575da48e5
Merge "Fix the issue of the repo upload hooking checker" into sc-dev
2021-03-13 16:40:53 +00:00
TreeHugger Robot
ef44fde1fd
Merge "Move WiFi/Bluetooth scanning toggles to new pages" into sc-dev am: 041966442f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13812148
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4c5c8efc52b855a9f92d010a244786c4f72b7787
2021-03-13 03:42:45 +00:00
TreeHugger Robot
041966442f
Merge "Move WiFi/Bluetooth scanning toggles to new pages" into sc-dev
2021-03-13 02:35:13 +00:00
Yu-Han Yang
d8df0d97e2
Move WiFi/Bluetooth scanning toggles to new pages
...
Screenshots: http://shortn/_ZmO6y9Zi5S
Bug: 180533061
Test: on device
Change-Id: I1223c9f5641bcc24b3e16af45138643f62849b8b
2021-03-12 16:52:17 -08:00
TreeHugger Robot
7184295054
Merge "Transition BatteryInfo and BatteryUtils to BatteryUsageStats API" into sc-dev am: 38e0dae439
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13803384
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I06231512af655da4f29e16f2108533fd6d6b759d
2021-03-13 00:25:23 +00:00
TreeHugger Robot
38e0dae439
Merge "Transition BatteryInfo and BatteryUtils to BatteryUsageStats API" into sc-dev
2021-03-12 23:52:00 +00:00
Dmitri Plotnikov
820bee81d6
Transition BatteryInfo and BatteryUtils to BatteryUsageStats API
...
Bug: 173745486
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryHistoryPreferenceTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryInfoLoaderTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryInfoTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryUtilsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.batterytip.detectors
Change-Id: I469ff8b88aa3307422c02f51943df4ef1759db56
2021-03-12 14:08:42 -08:00
TreeHugger Robot
a54126545f
Merge "Add getCpuMeasuredBatteryConsumptionUC to FakeUid" into sc-dev am: 45a3450d6f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13781348
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1c0301bebbefc173ad5248c64298e94596362668
2021-03-12 21:06:20 +00:00
TreeHugger Robot
45a3450d6f
Merge "Add getCpuMeasuredBatteryConsumptionUC to FakeUid" into sc-dev
2021-03-12 20:51:44 +00:00
SongFerng Wang
fd8d5b5c7c
Merge "Change the behavior of notifyAllowedNetworkTypesChanged." into sc-dev am: 516042b160
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13740140
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5b32dd44562fbe0eb9d3a8b37b42007563eadb5b
2021-03-12 18:59:57 +00:00
SongFerng Wang
516042b160
Merge "Change the behavior of notifyAllowedNetworkTypesChanged." into sc-dev
2021-03-12 18:49:49 +00:00
TreeHugger Robot
3e4e0befff
Merge "Remove interactors from voice input settings" into sc-dev am: 9edb779e45
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13774548
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib783c1ff5eedcb72096731111eb080c9398822d8
2021-03-12 17:16:31 +00:00
TreeHugger Robot
9edb779e45
Merge "Remove interactors from voice input settings" into sc-dev
2021-03-12 17:16:16 +00:00
TreeHugger Robot
63dbfe49ee
Merge "Launch channel settings as half sheet" into sc-dev am: d0fa5b2054
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13844943
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id5db8ab3c01fb336ee6dec0fdf02a500976607a1
2021-03-12 17:15:38 +00:00
TreeHugger Robot
d0fa5b2054
Merge "Launch channel settings as half sheet" into sc-dev
2021-03-12 16:45:56 +00:00
Julia Reynolds
efe26e2d44
Launch channel settings as half sheet
...
If opening app has requested only a subset of fields
Test: manual - launch from an app, filtered and unfiltered, for
normal channels and conversations
Bug: 177246841
Change-Id: Ifd70478101d1ea1340d2ecc55033fab55e65ca92
Change-Id: I5194b959c82b2cfa7990c84285aaf69464cff3a8
2021-03-12 09:58:41 -05:00
Victoria Lestari
b3729f6675
Remove interactors from voice input settings
...
Bug: 180960127
Tested: on device, emulator
Change-Id: I53a74e5d003a662b1e86a1c2d77e73ba84262201
2021-03-12 14:42:38 +00:00
Sunny Shao
1e508a4280
Fix the issue of the repo upload hooking checker
...
Fixes: 182555684
Test: repo upload test
Change-Id: I80a4d4de84b6d54a7b50c325b51b832b7b40b133
2021-03-12 22:25:10 +08:00
TreeHugger Robot
c1b9468efd
Merge "[Provider Model] Show Off if WFC is disabled by user" into sc-dev am: 8d73578b5f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849826
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4d251557d1f07d58aca263070e764ada5dd1aec1
2021-03-12 13:04:42 +00:00