Jeremy Goldman
e092a54381
Merge "Update string for discarding changes to a particular APN's settings."
2020-12-14 04:42:09 +00:00
Jeremy Goldman
11f91e47ea
Merge "Enhanced4gBasePreferenceControllerTest migrated to junit"
2020-12-14 02:58:24 +00:00
Jeremy Goldman
7a16e45290
Update string for discarding changes to a particular APN's settings.
...
Previously was unclear whether the changes, or the entire APN was
being discarded. The word "Cancel" more closely implies that the most
recent changes to the screen will be discarded rather than the entire
APN.
This only changes the resource for english. However, many other
languages have a menu_cancel string that seems much closer
to "Cancel" than "Discard" as well.
i.e. http://cs/android/packages/apps/Settings/res/values-zu/strings.xml?l=1029&rcl=a7397bec91183a7a32561fd8d67b0478af6c65bb
http://cs/android/packages/apps/Settings/res/values-es/strings.xml?l=1029&rcl=a7397bec91183a7a32561fd8d67b0478af6c65bb
Bug: 171538880
Test: N/A
Change-Id: I80fde04dbc36078d5c53e68231fcc4e5c3cf94e6
2020-12-14 02:57:39 +00:00
TreeHugger Robot
e1f15ccc1d
Merge "Add the mutability flag to BluetoothDevicesSlice."
2020-12-14 02:47:41 +00:00
TreeHugger Robot
6571548a37
Merge "[Provider Model] Fix the NetworkDashboardFragmentTest failed issue"
2020-12-13 15:18:40 +00:00
Yi Jiang
111004958d
Grays out Screen Timeout Setting when disabled.
...
Previously we would hide the screen timeout setting when it is disabled
by admin. Instead of hide it in Display Settings, now we gray it out and
also provide the info of the enforced admin.
Bug: 174834978
Test: manually
Change-Id: Idaa3c4512eb648b67fcf6df2996c771a2f1b9617
2020-12-11 15:53:45 -08:00
Jeremy Goldman
4348c2c826
Enhanced4gBasePreferenceControllerTest migrated to junit
...
Bug: 175389659
Test: atest -c Enhanced4gBasePreferenceControllerTest
Change-Id: I7ebcb303eb74168b81dd650fe78f3988647aa64d
2020-12-12 01:11:13 +08:00
Zim
abb239f4a4
Change transcoding default values
...
1. transcode_enabled: s/false/true/
2. transcode_default: s/false/true/
This is to maintain consistence with the MediaProvider defaults and it
only affects the 'checked' state when a user hasn't checked anything
Test: Manual
Bug: 175309276
Change-Id: Ic81490a944407e30f9cd207f64f2a0f5530a23d3
2020-12-11 15:48:21 +00:00
Zoey Chen
e05e21bfe7
Merge "[Provider Model] Should show "No SIM" if there is no SIM in the device."
2020-12-11 14:55:51 +00:00
Zoey Chen
44559badaf
[Provider Model] Should show "No SIM" if there is no SIM in the device.
...
Bug: 172053880
Test: atest NetworkProviderCallsSmsControllerTest#getSummary_noSim_returnNoSim
Change-Id: I31fd8b4b6928ef8aa7c45ac7651fa26e0b08446e
2020-12-11 20:29:13 +08:00
Yi-Ling Chuang
32e7118161
Add the mutability flag to BluetoothDevicesSlice.
...
Starting Android S, all PendingIntent has to have a explicit mutability
flag set.
Fixes: 172207505
Fixes: 172811893
Test: Enable BluetoothDevicesSlice and play on it.
Play on the volume panel.
Change-Id: I618455de683d619fe300309e31864b3c64f12ad1
2020-12-11 15:32:23 +08:00
Robert Luo
4dd011b3c7
Merge "Migrate media output switcher metrics - 2/n" into rvc-qpr-dev
2020-12-11 06:56:24 +00:00
Robert Luo
a2e12619d5
Merge "Migrate media output switcher metrics - 3/n" into rvc-qpr-dev-plus-aosp
2020-12-11 02:15:47 +00:00
Weng Su
66869d2ff5
[Provider Model] Fix the NetworkDashboardFragmentTest failed issue
...
Since the getPreferenceScreenResId() is modified to return different resource ID when provider model enabled. So we need to update SEARCH_INDEX_DATA_PROVIDER class to match the same behavior.
Bug: 175290124
Test:
- Set Settings/System/Developer options/Feature
flags/settings_provider_model to true.
- atest -c NetworkDashboardFragmentTest
Change-Id: I05b0f830158429ddbbfba414cdb33a6df6a7465e
2020-12-10 13:29:49 +00:00
Manish Singh
7a418b240e
Merge "Remove transcoding for apps from Settings."
2020-12-10 07:50:17 +00:00
Jiashen Wang
a0a5165c72
Fix minor issue for DeleteEuiccSubscriptionDialogActivity
...
Bug: 170508680
Test: Manually tested
Change-Id: I656b16f6ca568cd9f5dcbf9a0b031f1ee6f71b49
2020-12-09 23:27:04 -08:00
TreeHugger Robot
04322e2202
Merge "Add mutability flag to WifiSlice."
2020-12-10 06:37:36 +00:00
tim peng
b36ec713ce
Merge "Add FLAG_RECEIVER_FOREGROUND to run redirect intent at foreground priority" into rvc-qpr-dev am: 656867b4de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13136220
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5e1054e999a39a7a91ad9fa04f874b12370b8a89
2020-12-10 05:53:28 +00:00
tim peng
656867b4de
Merge "Add FLAG_RECEIVER_FOREGROUND to run redirect intent at foreground priority" into rvc-qpr-dev
2020-12-10 05:30:42 +00:00
Robert Luo
8da41d2eda
Migrate media output switcher metrics - 3/n
...
Bug: 172181610
Test: run statsd_testdrive 277 and check the
output correctness after content switching.
Change-Id: I5abb471452ec92670d220b2472eadbe77e243653
Merged-In: I5abb471452ec92670d220b2472eadbe77e243653
2020-12-10 11:10:45 +08:00
Robert Luo
ce694271f2
Merge "Migrate media output switcher metrics - 3/n"
2020-12-10 02:36:59 +00:00
TreeHugger Robot
317aa9e772
Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 am: cfdae774cd am: 635029b87f am: f49e9d2196 am: 0b89867372 am: 79bf00aac3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic2a7d0a9ebb8f0840a18f6997bd512f720e35a71
2020-12-09 14:50:28 +00:00
TreeHugger Robot
6172a98b2b
Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 am: cfdae774cd am: 635029b87f am: f49e9d2196 am: 423bcb4fbe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I01cfff4403d6e3499ae2608e34b9184b6358097f
2020-12-09 14:31:49 +00:00
TreeHugger Robot
79bf00aac3
Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 am: cfdae774cd am: 635029b87f am: f49e9d2196 am: 0b89867372
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iadf73a6dac422ef24851c603a1e5cd1ab8c0dcf2
2020-12-09 14:31:38 +00:00
TreeHugger Robot
0b89867372
Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 am: cfdae774cd am: 635029b87f am: f49e9d2196
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I81cd1495fd0beb356554d5a86daa30214d0d27d0
2020-12-09 14:03:32 +00:00
TreeHugger Robot
f49e9d2196
Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 am: cfdae774cd am: 635029b87f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I36f99bfb1e5eee253bb4ce030d7000cb40c2ff63
2020-12-09 13:49:10 +00:00
Yi-Ling Chuang
49cda22b76
Add mutability flag to WifiSlice.
...
Starting Android S, PendeingIntent should have a explicit mutability
flag to avoid vulnerability.
Fixes: 172204181
Test: 1. adb shell am start -a
android.settings.panel.action.INTERNET_CONNECTIVITY and play on the wifi
panel.
2. Enable contextualWifiSlice and play on it.
3. Adjust volume on the volume panel.
Change-Id: I23f03cae8c481d9f5836b7fb967f734e9c99cd65
2020-12-09 21:35:15 +08:00
TreeHugger Robot
635029b87f
Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 am: cfdae774cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iad91ec439965d52c652f79ce4d6fe3b125631f79
2020-12-09 13:03:53 +00:00
TreeHugger Robot
cfdae774cd
Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If3605d2b4dbad8b7b4979b644c89352ee8449ba1
2020-12-09 12:17:08 +00:00
TreeHugger Robot
2117006bc6
Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7d7dcaefd10f297c9e268d8f9d8bf666d98b08fd
2020-12-09 12:08:40 +00:00
TreeHugger Robot
504b96d76c
Merge "Add bluetooth package to permission request intent" into oc-mr1-dev
2020-12-09 12:06:33 +00:00
Jakub Pawlowski
c721dc5bad
Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090436
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I956e8906633af45f12617dabbec4e060c14502f2
2020-12-09 11:32:56 +00:00
Jakub Pawlowski
b29c036522
Prevent overlay drawing on top of Bluetooth activity dialog
...
Bug: 168504491
Merged-In: I04ebe580db2b299af2bd5e44e0b0f20bd42f8535
Change-Id: I04ebe580db2b299af2bd5e44e0b0f20bd42f8535
2020-12-09 08:00:22 +00:00
Robert Luo
2b6fd92de9
Migrate media output switcher metrics - 2/n
...
Bug: 172181610
Test: run statsd_testdrive 277 and check the
output correctness after content switching.
Change-Id: I5abb471452ec92670d220b2472eadbe77e243653
Merged-In: I5abb471452ec92670d220b2472eadbe77e243653
2020-12-09 15:42:56 +08:00
Manish Singh
8b5f7d8f75
Remove transcoding for apps from Settings.
...
Now that we read the transcode_compat_manifest from DeviceConfig, we
don't need the app-level transcoding settings in Media transcoding
settings.
BUG=169327180
Test: manual testing.
Change-Id: Iea0c02820cb850c98d6c8f23ce828fa3d163bd80
2020-12-09 01:49:09 +00:00
TreeHugger Robot
3a150908c3
Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc am: 537c730ca2 am: 4c4f83eb21 am: db48b810b6 am: f7f1781146
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7414cd5ed7a804b1cf6a31dc57d6c0197219b386
2020-12-09 00:55:13 +00:00
TreeHugger Robot
8911c5b632
Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc am: 537c730ca2 am: 4c4f83eb21 am: f0322276a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0e3add9dbe9dd2f5544ae64889282d1235add8c2
2020-12-09 00:48:28 +00:00
TreeHugger Robot
f7f1781146
Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc am: 537c730ca2 am: 4c4f83eb21 am: db48b810b6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I42ad211ac7f3341c38d7b7f992b19e3ae52c9373
2020-12-09 00:32:11 +00:00
TreeHugger Robot
db48b810b6
Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc am: 537c730ca2 am: 4c4f83eb21
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id38617a0c134feeb458a734a86c57360108fdd15
2020-12-09 00:16:09 +00:00
TreeHugger Robot
4c4f83eb21
Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc am: 537c730ca2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic39ad9f7212cdb757f79c61e23c84ac614e73fed
2020-12-08 23:58:02 +00:00
TreeHugger Robot
537c730ca2
Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9c3d91f901bc38554732ff2cc428232f117efea0
2020-12-08 23:27:51 +00:00
TreeHugger Robot
721f43dcdc
Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev
2020-12-08 22:56:46 +00:00
tim peng
c93b70e3a0
Merge changes from topic "media_output_dialog" into rvc-qpr-dev am: 3cea72fb2b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13115230
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia0416c3b3f9ce31ed35ba07363a519b15a4a0d0d
2020-12-08 06:28:52 +00:00
timhypeng
3273b4ebb4
Update rule of launching media output dialog am: 6472c98ffa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13115229
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaeec1436e45b25fce4a4ef08155d35b8b047d916
2020-12-08 06:28:50 +00:00
timhypeng
c26d9f3d48
Update OutputSwitcher from MediaOutputSlice to MediaOutputDialog in Settings am: 7127fff467
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13115228
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id0fc610e5b5f17f9788fc12b96d2871c20be9725
2020-12-08 06:28:49 +00:00
timhypeng
3254d59f0f
Add PairNewBluetoothReceiver to launch Bluetooth pairing page am: 6afe358556
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13115227
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0bce385da81472db27ebe07634e0ad9f0507e47f
2020-12-08 06:28:46 +00:00
tim peng
3cea72fb2b
Merge changes from topic "media_output_dialog" into rvc-qpr-dev
...
* changes:
Redirect to output switcher panel to the new dialog
Update rule of launching media output dialog
Update OutputSwitcher from MediaOutputSlice to MediaOutputDialog in Settings
Add PairNewBluetoothReceiver to launch Bluetooth pairing page
2020-12-08 05:46:13 +00:00
Remi NGUYEN VAN
f40f71ccf1
Replace isWeaklyValidatedHostname with guava
...
The guava implementation is more accurate than the basic NetworkUtils
implementation.
NetworkUtils is being moved to its own JAR and will not be available
from Settings.
Bug: 174436414
Test: m
Wrote test for isWeaklyValidatedHostname, verified it passes with
guava
Change-Id: I1d01f2beba36009e17f651652e2d7f57be5aa398
2020-12-08 14:02:17 +09:00
TreeHugger Robot
84d4237008
Merge "Fix advanced device icon won't update issue"
2020-12-08 02:29:37 +00:00
tim peng
32ef316678
Merge "Fix java.lang.ArrayIndexOutOfBoundsException in RemoteVolumeGroupController" into rvc-qpr-dev am: de2f2754d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13136219
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id4c0ebb50dd2caaeabb1f39549a80d1de0890201
2020-12-08 01:09:56 +00:00