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
d5ab407fce
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-03-15 06:26:57 +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
Stanley Wang
9138b055d2
Merge "Remove the non-translatable tags from MainSwitch titles." into sc-dev
2021-03-15 02:53:56 +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
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
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
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
29ff0e0552
Merge "Updates magnification settings string" into sc-dev
2021-03-14 02:02:20 +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
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
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
45a3450d6f
Merge "Add getCpuMeasuredBatteryConsumptionUC to FakeUid" into sc-dev
2021-03-12 20:51:44 +00:00
SongFerng Wang
516042b160
Merge "Change the behavior of notifyAllowedNetworkTypesChanged." into sc-dev
2021-03-12 18:49:49 +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
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
8d73578b5f
Merge "[Provider Model] Show Off if WFC is disabled by user" into sc-dev
2021-03-12 12:32:38 +00:00
Stanley Wang
751dff2bf6
Remove the non-translatable tags from MainSwitch titles.
...
The titles of MainSwitch need to be translated.
Fix: 182540501
Test: run Robotest
Change-Id: I4a07c599e607644729718543a12d4e9147117e78
2021-03-12 19:52:07 +08:00
TreeHugger Robot
cba72ddc2e
Merge "[Provider Model] Adjust slice title and subtitle" into sc-dev
2021-03-12 10:19:26 +00:00
tim peng
f90be25ca8
Merge "Update strings and tag it translatable" into sc-dev
2021-03-12 08:22:12 +00:00
Yanting Yang
a1a30296ae
Fix NPE for ConfigureNotificationSettings
...
The NPE is caused by that we have removed the advanced category from
Notification page for android S design but it still tries to get
category and call setInitialExpandedChildrenCount in onCreate().
Only run the relevant logic on the old design since it’s only used to
expand the advanced category and we don’t need the expand feature
anymore for android S.
Bug: 182237530
Fixes: 182532954
Test: robotest & manual
Change-Id: I96f35fa40221079d5498d9d2fab9c75d64698808
2021-03-12 16:11:23 +08:00
Zoey Chen
dc1ec2d092
[Provider Model] Show Off if WFC is disabled by user
...
Bug: 182232693
Test: make and atest
Change-Id: I0ef0a09adb1c9636ec14e0ab71116fd2834f1f97
2021-03-12 15:30:07 +08:00
Weng Su
d0e98010c4
Merge "[Provider Model] Update Airplane mode message" into sc-dev
2021-03-12 07:04:52 +00:00
Hugh Chen
9d00364da4
Fix bluetooth settings will broadcast to anywhere when some cases
...
BluetoothPermissionActivity and DevicePickerFragment will send
broadcast to return the result to calling apps. As this broadcast
intent is from Settings with uid 1000, it will be sent to any
protected BroadcastReceivers in the device. It can make an attacker
send broadcast to protected BroadcastReceivers like factory reset intent
(android/com.android.server.MasterClearReceiver) via
BluetoothPermissionActivity or DevicePickerFragment.
This CL will compare to calling package name with launch package name.
If they are not equal, the broadcast will not send to launch package name.
Bug: 179386960
Bug: 179386068
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify factory reset not started and no system UI notification.
Change-Id: Ib8a5acde663e875912d300dd4912c4e9416f02f1
2021-03-12 14:56:57 +08:00
Weng Su
8ce423cdd2
[Provider Model] Update Airplane mode message
...
- Show Airplane mode message when Airplane mode is enabled
- Show the same message whether Wi-Fi is enabled or disabled
- Screenshot:
https://screenshot.googleplex.com/9FgqG7WWskRLZxo
https://screenshot.googleplex.com/4g4kvnAT6aYN57s
Bug: 181858434
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I3cb5a8bc7cb4d1e8678eb6d75116effd00ac9432
2021-03-12 11:49:46 +08:00
Tim Peng
624770a51d
Update strings and tag it translatable
...
-"Use bluetooth" -> "Use Bluetooth"
-"Use Dark Theme" -> "Use Dark theme"
Bug: 181358643
Test: manual
Change-Id: Ia999ddca2244653c3d2d32f5ea4c4e53f1c72d89
2021-03-12 10:57:35 +08:00
Sooraj Sasindran
14a2fd6bc1
Merge "update isCrossSimCallingEnabledByUser name" into sc-dev
2021-03-11 23:55:50 +00:00
TreeHugger Robot
9086ed36a8
Merge "Fallback to AOSP eSOS settings page if OEM impl fails" into sc-dev
2021-03-11 22:37:50 +00:00
Fan Zhang
9fdceaea78
Fallback to AOSP eSOS settings page if OEM impl fails
...
When OEM eSOS implementation fails for any reason (app disabled,
misconfigured, etc), Emergency SOS settings should fallack to the
default settings page (rather than hiding the setting entirely)
Bug: 180959553
Test: robotests
Change-Id: I31c08449eff3f01d4c33bf827023f17beade93c2
2021-03-11 20:30:55 +00:00
TreeHugger Robot
0936026260
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 36288fc240
-s ours am: 9444cfa8cf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13830592
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4179b17ce23649f291435a8f6747f3490636f28b
2021-03-11 20:11:41 +00:00
TreeHugger Robot
952a6a9214
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: f6ba91f322
-s ours am: d3faa11064
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835675
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iba5c301a838912b0f27af6916d3fe08d35713acc
2021-03-11 20:11:33 +00:00
TreeHugger Robot
9444cfa8cf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 36288fc240
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13830592
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8b19a631d045bb90a6e9fb2205e5256b163a6028
2021-03-11 19:25:43 +00:00
TreeHugger Robot
d3faa11064
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: f6ba91f322
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835675
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I096c84edb684d619d339a541ee249f556eca944f
2021-03-11 19:25:32 +00:00
TreeHugger Robot
36288fc240
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-03-11 18:43:56 +00:00
TreeHugger Robot
f6ba91f322
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-03-11 18:42:47 +00:00
Sally Yuen
c2025d7180
Merge "Add seekBar properties 'tickMark' to LabeledSeekBarPreference" into sc-dev
2021-03-11 17:41:42 +00:00
Almaz Mingaleev
4a3ff95367
Merge "Move GeoTZ toggle to Date&Time settings screen." into sc-dev
2021-03-11 14:04:01 +00:00
Andras Kloczl
4239c9047e
[automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669
-s ours am: 94ed37dacf
-s ours am: b21072b773
-s ours am: 4f095b1a6b
-s ours am: cb10105fe1
-s ours am: 601902f3dc
-s ours am: 8210550151
-s ours
...
am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 6746add669
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816457
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If239a1de2199474d60ca6db8f4a1452047ed26e7
2021-03-11 12:02:30 +00:00
András Klöczl
3ff966da98
[automerger skipped] Merge "Prevent using invalid result uri during multi user image change" into pi-dev am: f1125282f9
-s ours am: 28539c02dd
-s ours am: e690821501
-s ours am: fca809b408
-s ours am: 5715f4301e
-s ours am: a1e59f0a6a
-s ours
...
am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 6746add669
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816456
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I38ebf7b94eeaec82c9596e08f3fe83ebf3dd971b
2021-03-11 12:02:24 +00:00
Andras Kloczl
4008f54081
[automerger skipped] Prevent using invalid result uri during multi user image change am: e0f8214e80
-s ours am: c40b15712c
-s ours am: a95829294d
-s ours am: 7c4f563b62
-s ours am: fb94b7d113
-s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815795
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I067bd1ba1abcaa53c4854817a52e98aef6f17660
2021-03-11 12:02:17 +00:00
Andras Kloczl
8210550151
[automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669
-s ours am: 94ed37dacf
-s ours am: b21072b773
-s ours am: 4f095b1a6b
-s ours am: cb10105fe1
-s ours am: 601902f3dc
-s ours
...
am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 9c0024f455
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816457
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2d2861dafde2d11d39741db7189d6586542d6851
2021-03-11 11:37:15 +00:00
András Klöczl
a1e59f0a6a
[automerger skipped] Merge "Prevent using invalid result uri during multi user image change" into pi-dev am: f1125282f9
-s ours am: 28539c02dd
-s ours am: e690821501
-s ours am: fca809b408
-s ours am: 5715f4301e
-s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816456
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3a4f9d1b918a7d406383472636f6ec519c1b5a8c
2021-03-11 11:37:07 +00:00
Andras Kloczl
fb94b7d113
[automerger skipped] Prevent using invalid result uri during multi user image change am: e0f8214e80
-s ours am: c40b15712c
-s ours am: a95829294d
-s ours am: 7c4f563b62
-s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 798bdd90b0
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815795
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icf18ccc315b62ea33a38e5786b3962d1da50635f
2021-03-11 11:36:57 +00:00