Treehugger Robot
e0c081b02e
Merge "Add OWNER to network/datausage/wifi path" am: 56834d2ce3
am: c38b502c4a
am: f21b7ac120
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635179
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I422c40567fc90176cea5242494028d621c1656a5
2021-03-15 12:54:33 +00:00
Treehugger Robot
f21b7ac120
Merge "Add OWNER to network/datausage/wifi path" am: 56834d2ce3
am: c38b502c4a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635179
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If2ab0c8c81b6ba25a32bd41437c6a37cda9fc0e9
2021-03-15 12:12:13 +00:00
Chiachang Wang
1516f4e8bb
Merge "Replace the hidden getActiveLinkProperties usage" am: d709b55250
am: 201429b683
am: 4589965ebd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635200
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I966ca888ce14550ac0b76bbcf59e4e50015d44c3
2021-03-15 11:33:25 +00:00
Treehugger Robot
c38b502c4a
Merge "Add OWNER to network/datausage/wifi path" am: 56834d2ce3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635179
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4d177c825df890a2d8947173e85ddd401e9f7361
2021-03-15 11:30:18 +00:00
Treehugger Robot
56834d2ce3
Merge "Add OWNER to network/datausage/wifi path"
2021-03-15 11:02:28 +00:00
Chiachang Wang
4589965ebd
Merge "Replace the hidden getActiveLinkProperties usage" am: d709b55250
am: 201429b683
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635200
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib0118ce1ed80dd4b672e98f8a7a905d42462f24f
2021-03-15 10:51:50 +00:00
Chiachang Wang
201429b683
Merge "Replace the hidden getActiveLinkProperties usage" am: d709b55250
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635200
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3d7e876c9fb8bf81a300b6b76154672e0d3b04c7
2021-03-15 10:14:46 +00:00
Chiachang Wang
d709b55250
Merge "Replace the hidden getActiveLinkProperties usage"
2021-03-15 09:42:16 +00:00
Chiachang Wang
fd1fa9c0a8
Replace the hidden getActiveLinkProperties usage
...
It's a refactor work to remove the hidden connectivity method
usages outside the incoming connectivity module.
CM#getActiveLinkProperties is hidden and no longer supported
outside the module. Caller should replace it with
CM#getLinkProperties(Network), so replace the usage as it is.
Bug: 172183305
Test: m
Change-Id: I20bcc9da97113da352e43a87d029596c9729cad8
2021-03-15 09:07:48 +00:00
Bill Yi
4cd2f79deb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5f062373bd
-s ours am: 62fd4e850b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13868209
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I359662a106e00919d242612601d0fa19055c679a
2021-03-15 07:27:42 +00:00
TreeHugger Robot
1e90c63385
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 3bb6f3afa1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13868207
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iad518d1e586e592527375f4a7ed7797515a8d7be
2021-03-15 07:07:16 +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
Bill Yi
62fd4e850b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5f062373bd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13868209
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4f9a496b81acc2f2f31dab8546d6f2add2db1f75
2021-03-15 07:02:44 +00:00
Betty Chang
ebea5200cb
Add OWNER to network/datausage/wifi path
...
Change-Id: I30ca24ea0823378d18b39a2eae937378662f6c14
2021-03-15 06:39:14 +00:00
TreeHugger Robot
3bb6f3afa1
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-03-15 06:35:45 +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
5f062373bd
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9c6912b3ddd71aeecf639f628f15d04723ffea1d
2021-03-14 19:39:14 +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
Bill Yi
97e669d333
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iba69fb0c0a9d7edb15865e4444f8d558465ce2f4
2021-03-14 17:36:32 +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