Bill Yi
f7af4b6fb0
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124588
Change-Id: I73f1f4c5f9b93372fd9d02f9b193922c751526cc
2021-10-26 17:52:36 +00:00
Bill Yi
a6de7ad6b8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ied645d81839a1c5b98efcdd508a69aeb291a8feb
2021-10-26 17:52:29 +00:00
TreeHugger Robot
3c824a23e6
Merge changes from topic "presubmit-am-7ec75ddcc57e4269a8bd00190c66c479" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 247075dcd5
Import translations. DO NOT MERGE ANYWHERE
2021-10-22 01:04:30 +00:00
Bill Yi
52146b1b0a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idf72f0b25491f38f592613b85cd7e20c5935681a
2021-10-21 08:16:13 +00:00
Bill Yi
bace1bf648
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 247075dcd5
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16099516
Change-Id: Ic81a43d273bbb6f70c73eab5b8c2ea43a3684bf8
2021-10-21 08:12:44 +00:00
Bill Yi
247075dcd5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia2cd9e21b6ad60ef3f4ebabdc7fbe77c752c34f0
2021-10-21 08:12:37 +00:00
TreeHugger Robot
faf452bf94
Merge "Update UWB toggle display after lifecycle events." into sc-qpr1-dev
2021-10-20 04:43:47 +00:00
SongFerng Wang
11af4846b2
Merge "The Network name is not same as statusbar at SIM Edit page" into sc-qpr1-dev
2021-10-18 08:13:49 +00:00
Joy Babafemi
06a39e9e34
Update UWB toggle display after lifecycle events.
...
Bug: 201790864
Test: Manual
Change-Id: I05cb52331fe106017b2cb6718a897690720725db
2021-10-15 23:48:41 +00:00
TreeHugger Robot
c5cc2f81fe
Merge "For Internet Picker - Information about Wi-Fi scanning when Wi-Fi is off" into sc-qpr1-dev
2021-10-15 20:05:38 +00:00
Bill Yi
2720310af9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0fd72130e9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16061617
Change-Id: Id4c0601df966701353634da83252b6639b83c801
2021-10-15 14:40:48 +00:00
TreeHugger Robot
b39a31e8f8
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-10-15 14:28:06 +00:00
changbetty
bfd3020038
For Internet Picker - Information about Wi-Fi scanning when Wi-Fi is off
...
Bug: 202323013
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I4a26ec43bb7e1758b8170a7ff9fa7d5846cb4a35
2021-10-15 11:18:07 +00:00
Bill Yi
8a603688a7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0dd09e87e7a2116b4ad5bbc03462b30e786cdd07
2021-10-15 04:46:50 +00:00
Bill Yi
0fd72130e9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ieb86bcc7d7e064bcb07a11534b76be5be8eb9cca
2021-10-15 04:43:13 +00:00
Bonian Chen
74c4ca00e1
Merge "[Settings] Crash when resetting downloaded eSIM" into sc-qpr1-dev
2021-10-15 01:36:13 +00:00
TreeHugger Robot
28b7d115de
Merge "Add WIFI_SCANNING_SETTINGS action to Settings" into sc-qpr1-dev
2021-10-14 16:56:03 +00:00
SongFerngWang
050b6d5224
The Network name is not same as statusbar at SIM Edit page
...
Using subscriptionInfo to get the network name.
Bug: 203035698
Bug: 201591202
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest (PASS)
Change-Id: I84848a2801172b46f7cc3ff39d88ad57e34514a4
2021-10-14 19:08:47 +08:00
Betty Chang
c0b9f4bdba
Merge "Add String for information about Wi-Fi scanning when Wi-Fi is off." into sc-qpr1-dev
2021-10-13 16:46:07 +00:00
Weng Su
9e6966d1c2
Add WIFI_SCANNING_SETTINGS action to Settings
...
- Export the interface for System UI to launch Wi-Fi Scanning Settings.
Bug: 202323013
Test: manual test by adb to launch Wi-Fi scanning settings below
adb shell am start -a android.settings.WIFI_SCANNING_SETTINGS
Change-Id: I893d3cea40d1f3ed4a962009416f54c99a91e11f
2021-10-13 15:17:19 +00:00
changbetty
b7509a3079
Add String for information about Wi-Fi scanning when Wi-Fi is off.
...
Bug: 202323013
Test: make
Change-Id: I22618a57bfecd02508f2d4a53ff6c65071de2fd1
2021-10-13 14:07:27 +00:00
Bonian Chen
21f7095b3a
[Settings] Crash when resetting downloaded eSIM
...
Context need to be maintained when performing async operation in
background thread.
Bug: 202787946
Test: local
Change-Id: Ia5b81ae66e9482b10df5133b2f1444fc007a78e8
(cherry picked from commit 8aa98d63fd
)
2021-10-12 13:49:11 +00:00
TreeHugger Robot
c57387dee7
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-10-10 05:34:09 +00:00
Bill Yi
9b8ef1b7ae
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If65120e7b71d5ea69ec91f72077de3c4b45b287b
2021-10-08 20:07:13 +00:00
Bill Yi
cac2809d5b
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16019020
Change-Id: If7e901e27836f4e297645947d45bac9f08088eff
2021-10-08 20:03:37 +00:00
Bill Yi
2c4e278709
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Icbd3c3d47b1f4d87866e79697db179d113e14d32
2021-10-08 20:03:23 +00:00
TreeHugger Robot
9048523ba4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6228bd3469
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16000255
Change-Id: I53f408bfeed1ac6becafa5c24b2fe58e76bf3bf3
2021-10-08 07:23:42 +00:00
TreeHugger Robot
59d01eec17
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e
am: 81a3e690c1
am: 94768f3b18
am: 07fe34aa57
am: f5e2d0dcb3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985
Change-Id: I11e1e9b92471bd5748b9ae2ef8d2d34d77e821a5
2021-10-08 07:23:40 +00:00
TreeHugger Robot
7e02378a43
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e
am: 81a3e690c1
am: 94768f3b18
am: f40e2700d3
am: 6e2eefe2c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985
Change-Id: I7b2810f3752ee51594c15240c086703f8dd5765c
2021-10-08 07:23:34 +00:00
TreeHugger Robot
aeb6c685e1
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into sc-dev am: df95750605
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15987304
Change-Id: I46569f9acd377a8069dffeaa031bc48dd1a6b14b
2021-10-08 07:23:27 +00:00
Chen Chen
3ca98306af
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-qpr-dev am: 7efc9b451c
am: 3449eccd85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995587
Change-Id: Ie95237230c4967360faddc55e4840192701fb3da
2021-10-08 07:23:23 +00:00
Chen Chen
d0cebdde1a
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b
am: d96d13c4f1
am: b025b7fa88
am: 0d70b85832
am: d9eca4893d
am: ca21133410
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984
Change-Id: Ia2c4ae9bc4d4c8735dfc1cd0c69b89b7f8263cbe
2021-10-08 07:23:20 +00:00
Chen Chen
5438c59920
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b
am: d96d13c4f1
am: b025b7fa88
am: 0d70b85832
am: 44deff97de
am: b51bfd47db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984
Change-Id: I036c7a53f4e3d37be654eb6132b36d3f94683107
2021-10-08 07:23:14 +00:00
TreeHugger Robot
15189d2ff6
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e
am: 074f18fd8b
am: 9f388f2a66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986
Change-Id: I0d633706bec12a9e5b0b8e9ce4c93ddec2c33ceb
2021-10-08 07:23:08 +00:00
TreeHugger Robot
cbe25da458
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e
am: 818a481294
am: 050872ecf0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986
Change-Id: Ic22a1b268a2e5a4ff3064c65ad7d6c38cd37cebb
2021-10-08 07:23:02 +00:00
Weng Su
9552e28699
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev am: 3678155f90
am: 2fe0d45ab8
-s ours am: 86a02e1e8e
-s ours am: 0dc4560066
-s ours am: 68952164ad
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164
Change-Id: If10c14a8684381b8bca2aec21ab65164e746054f
2021-10-08 07:22:57 +00:00
Weng Su
b462c1d9d5
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 153b0f03f5
am: 0fe85baf93
-s ours am: 9ccd76cbde
-s ours am: 7ab58102ff
-s ours am: 80d84e4053
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164
Change-Id: I6ee71b203ad83d4db30d2501b25937438e425233
2021-10-08 07:22:57 +00:00
Weng Su
d9a3681733
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 6a2624e500
am: cbd0883356
-s ours am: 1f4b0eaa6f
-s ours am: bd3dcfc61a
-s ours am: 428d973b15
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958163
Change-Id: I82c01505792795b7c20e5f333729c62e05c8a134
2021-10-08 07:22:56 +00:00
Weng Su
6ba2996eec
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431
am: 457a63ce84
-s ours am: f41979632a
-s ours am: 2323109f93
-s ours am: 77e284042e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958162
Change-Id: Iaf5248d7efca0d9fa2e51c72b2372e1274070e8e
2021-10-08 07:22:56 +00:00
Weng Su
55a37d556e
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev am: 3678155f90
am: 2fe0d45ab8
-s ours am: 86a02e1e8e
-s ours am: 54abe21d12
-s ours am: c0dd58ee8c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164
Change-Id: I2f2a64cbd1406114f5f78096f55157374645058d
2021-10-08 07:22:45 +00:00
Weng Su
ba11285fd6
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 153b0f03f5
am: 0fe85baf93
-s ours am: 9ccd76cbde
-s ours am: 9e73b1e4ed
-s ours am: 1dbd53eb70
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164
Change-Id: I4ac66df5cddf34fd1b04f6692dd9d86336f2cbed
2021-10-08 07:22:44 +00:00
Weng Su
d3fd57e2e1
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 6a2624e500
am: cbd0883356
-s ours am: 1f4b0eaa6f
-s ours am: 70fce50634
-s ours am: ad77ce9784
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958163
Change-Id: Ie75a528a63e6388a75aa3b7775a04a069b162379
2021-10-08 07:22:44 +00:00
Weng Su
ec9d3cf201
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431
am: 457a63ce84
-s ours am: f41979632a
-s ours am: 36a13c0cfe
-s ours am: 6b29f7110a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958162
Change-Id: Id33776fcdd4f347604e6ccc9290dee92ca59a4dd
2021-10-08 07:22:43 +00:00
Weng Su
c3531fb273
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483
-s ours am: aed1ab9e45
-s ours am: 00e38c59cc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958167
Change-Id: I3b3b4fdc30ed2db92f19c0b452fa1cef53d3e841
2021-10-08 07:22:34 +00:00
Weng Su
658383d2e3
[automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2
-s ours am: f05b8fbb79
-s ours am: 107ebcdc9e
-s ours
...
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527
is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958166
Change-Id: Ie3889e39febe5e07f927e5740b48fc0f30a836db
2021-10-08 07:22:33 +00:00
Weng Su
504af9e6cd
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483
-s ours am: 395ac6073c
-s ours am: 374ef0012a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958167
Change-Id: I305b55c515a15900ed007c56cb6f5362b3b09c6e
2021-10-08 07:22:28 +00:00
Weng Su
5c878f37a6
[automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2
-s ours am: d5ff68889c
-s ours am: b885452051
-s ours
...
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527
is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958166
Change-Id: I578872acacdb22c11ef08b1ebb33311d05664475
2021-10-08 07:22:28 +00:00
Weng Su
973211dba5
[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: ca67955d7d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958174
Change-Id: Ib42cd4909a5d6265ee2a3181df4c34b0c32a79bb
2021-10-08 07:22:21 +00:00
Weng Su
77d30c4d0c
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: f733da4859
-s ours
...
am skip reason: skipped by user wengsu
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15951620
Change-Id: I5d0fa94c0b09106bb65764ffbd4636209f685c35
2021-10-08 07:22:20 +00:00
Weng Su
1400ff3139
[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: e92d1d1a6b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958170
Change-Id: Ie039408dcee182693303390eca26386ff6c546d2
2021-10-08 07:22:20 +00:00