Alex Johnston
8ee5aacb52
Merge "Cred mng app settings - close onRemove" into sc-dev am: 74be0de267
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13872510
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id46a769de8ac464fdb78e84c15308ebacc1c0aa1
2021-03-15 13:47:49 +00:00
Alex Johnston
74be0de267
Merge "Cred mng app settings - close onRemove" into sc-dev
2021-03-15 13:33:47 +00:00
Treehugger Robot
e7f1f235c1
Merge "Add OWNER to network/datausage/wifi path" am: 56834d2ce3 am: c38b502c4a am: f21b7ac120 am: e0c081b02e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635179
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I857f5e1fe7592c44222adc3b1b173d0779b163aa
2021-03-15 13:28:36 +00:00
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
c99a8f1b4b
Merge "Replace the hidden getActiveLinkProperties usage" am: d709b55250 am: 201429b683 am: 4589965ebd am: 1516f4e8bb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635200
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I64cdf6696103d92b320926743afe42399d2e578d
2021-03-15 12:11:58 +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
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
Alex Johnston
6469518bf3
Cred mng app settings - close onRemove
...
Remove credential management app and close
settings screen when remove button is selected
Manual testing steps:
* Set app as creg mng app
* Remove cred mng app via Settings
* Verify screen is closed on remove
Bug: 177909523
Test: manual testing
Change-Id: Ie38a5340a4985fb4997f353556f49e9589e8da5f
2021-03-15 10:11:39 +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
Betty Chang
ebea5200cb
Add OWNER to network/datausage/wifi path
...
Change-Id: I30ca24ea0823378d18b39a2eae937378662f6c14
2021-03-15 06:39:14 +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
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
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
Yanting Yang
d604ca93dc
Merge "Fix NPE for ConfigureNotificationSettings" into sc-dev
2021-03-13 16:56:29 +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
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
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
TreeHugger Robot
1d98f112cd
Merge "[Provider Model] Adjust slice title and subtitle" into sc-dev am: cba72ddc2e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13824394
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I16e5f5e1815602d36401b9801e4d368868c93eca
2021-03-12 10:57:36 +00:00
TreeHugger Robot
cba72ddc2e
Merge "[Provider Model] Adjust slice title and subtitle" into sc-dev
2021-03-12 10:19:26 +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
7b04b316ed
Merge "[Provider Model] Update Airplane mode message" into sc-dev am: d0e98010c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815926
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I181d2ad73e8c82424dab13cbc7489c01ec8145e9
2021-03-12 07:29:54 +00: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
Sooraj Sasindran
7f444ead2f
Merge "update isCrossSimCallingEnabledByUser name" into sc-dev am: 14a2fd6bc1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13832226
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2bcaee92a2e2c26431e9928780cda8e6d004ee25
2021-03-12 04:19:51 +00: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