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
17fb53a1ad
Merge "The Network name is not same as statusbar at SIM Edit page" into sc-qpr1-dev am: 11af4846b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16055430
Change-Id: Idc12ca6b932fc9143a4c83729af16b82fae1669e
2021-10-18 08:25:21 +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
49bd615d6b
Merge "For Internet Picker - Information about Wi-Fi scanning when Wi-Fi is off" into sc-qpr1-dev am: c5cc2f81fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16048447
Change-Id: Ie08d46288074ae6df95535d203728a9b81c4c8c5
2021-10-15 20:21:03 +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
92da783302
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0fd72130e9
-s ours am: b4a75e746e
-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: Ied408c68868a84c3f0fa4b600a336dd0c96a802d
2021-10-15 14:56:02 +00:00
Bill Yi
82f09c65fe
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0fd72130e9
-s ours am: 2720310af9
-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: I9dbdaa077bdea11b2ce6d116dadb7bc451f72fa1
2021-10-15 14:41:50 +00:00
TreeHugger Robot
ec17bd2bd6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: b39a31e8f8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16061618
Change-Id: If79262008fa23e4760669f029956b8e1fc211ebd
2021-10-15 14:40:53 +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
Bill Yi
b4a75e746e
[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: I97c510fd3f22aa49b0f17150ef705cb469a0bd86
2021-10-15 14:39:56 +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
2a92ebefbe
Merge "[Settings] Crash when resetting downloaded eSIM" into sc-qpr1-dev am: 74c4ca00e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16039954
Change-Id: I56ec53c93e3a6941db8b2d57e57ad2c2e9e74276
2021-10-15 01:55:38 +00:00
Bonian Chen
74c4ca00e1
Merge "[Settings] Crash when resetting downloaded eSIM" into sc-qpr1-dev
2021-10-15 01:36:13 +00:00
Roopa Sattiraju
04e10ffc28
Merge "Phone fails to switch channel mode from stereo to mono" into stage-aosp-master am: f2295126b6
am: ebc8a9fd1c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15942380
Change-Id: I1261f696aa6d7a74c6b5bcdcc6e961fb7302d760
2021-10-14 18:46:52 +00:00
Roopa Sattiraju
ebc8a9fd1c
Merge "Phone fails to switch channel mode from stereo to mono" into stage-aosp-master am: f2295126b6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15942380
Change-Id: I3eb45e51e9e4cb2a5940d4fd2c928b509f49dc5d
2021-10-14 18:32:20 +00:00
Steven Moreland
0a412b4351
Merge "getBlobAshmemSize -> getOpenAshmemSize" am: 5d30c2de37
am: 90181319da
am: 0fbe8bd395
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1856673
Change-Id: I33d698f384f9a75f09486867a9034e638c5e143f
2021-10-14 18:17:56 +00:00
Roopa Sattiraju
f2295126b6
Merge "Phone fails to switch channel mode from stereo to mono" into stage-aosp-master
2021-10-14 18:17:20 +00:00
Steven Moreland
0fbe8bd395
Merge "getBlobAshmemSize -> getOpenAshmemSize" am: 5d30c2de37
am: 90181319da
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1856673
Change-Id: I270b25f7408e3557fdce3b87cf9b478bb01c46cd
2021-10-14 18:02:39 +00:00
Steven Moreland
90181319da
Merge "getBlobAshmemSize -> getOpenAshmemSize" am: 5d30c2de37
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1856673
Change-Id: I1ecba7ee53fead58d83d159f2849e3798e7198fd
2021-10-14 17:48:04 +00:00
Steven Moreland
5d30c2de37
Merge "getBlobAshmemSize -> getOpenAshmemSize"
2021-10-14 17:43:16 +00:00
TreeHugger Robot
f9dcd96f2e
Merge "Add WIFI_SCANNING_SETTINGS action to Settings" into sc-qpr1-dev am: 28b7d115de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16047550
Change-Id: I76f4ca5b2e6908de3b0a32848c1af479f45c4688
2021-10-14 17:06:06 +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
Steven Moreland
519546ce3e
getBlobAshmemSize -> getOpenAshmemSize
...
This API returns the total size of all ashmem memory that is in FDs that
is owned by a Parcel object. It was renamed a while ago, but the name
was never updated in Java.
Bug: 202029388
Test: N/A
Change-Id: Icc428063083110952cf3951721d69cbb919429b1
2021-10-13 11:01:10 -07:00
Betty Chang
5a5afba75b
Merge "Add String for information about Wi-Fi scanning when Wi-Fi is off." into sc-qpr1-dev am: c0b9f4bdba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16047548
Change-Id: Ifa14bb3bcb79634a06ca53a03a2fb25f882b09b9
2021-10-13 17:01:59 +00: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
Bonian Chen
51cf3c121d
Merge "Revert "[Settings] Code refactor DataSaverSummary"" am: b0a2857ec5
am: dcd13abd65
am: 640fc7d172
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853597
Change-Id: Ibcae1b83d198fd6bf0251c5f31ef555cd0264a20
2021-10-12 07:19:52 +00:00
Bonian Chen
640fc7d172
Merge "Revert "[Settings] Code refactor DataSaverSummary"" am: b0a2857ec5
am: dcd13abd65
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853597
Change-Id: I6eb3eac6886ba2011c65df9237474ecbef0e3b32
2021-10-12 07:05:41 +00:00
Bonian Chen
dcd13abd65
Merge "Revert "[Settings] Code refactor DataSaverSummary"" am: b0a2857ec5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853597
Change-Id: Ibdca526adba3a2fb79cec39101832d53d87b46b7
2021-10-12 06:50:56 +00:00
Bonian Chen
b0a2857ec5
Merge "Revert "[Settings] Code refactor DataSaverSummary""
2021-10-12 06:36:35 +00:00
Treehugger Robot
c5bce8de72
Merge "[Settings] Code refactor DataSaverSummary" am: e7b211b35e
am: ef03b3a361
am: a300d2ecaa
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853594
Change-Id: I4cfff8948ae3d67f0c8bd33fb6368e772049d339
2021-10-12 06:33:16 +00:00
Treehugger Robot
a300d2ecaa
Merge "[Settings] Code refactor DataSaverSummary" am: e7b211b35e
am: ef03b3a361
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853594
Change-Id: Iaabb7552c607fe883f4bffa9debf75f06eff1d0e
2021-10-12 06:19:35 +00:00
Bonian Chen
16b298ef92
Revert "[Settings] Code refactor DataSaverSummary"
...
This reverts commit 0ea486d1e5
.
Reason for revert: build breakage
Change-Id: Id4c7689ae6f82ab05987365551a06debc1676aa5
2021-10-12 06:14:17 +00:00
Treehugger Robot
ef03b3a361
Merge "[Settings] Code refactor DataSaverSummary" am: e7b211b35e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853594
Change-Id: I8e4f9e3429948ba709dfa40eb56f7c428813590c
2021-10-12 06:09:37 +00:00
Treehugger Robot
e7b211b35e
Merge "[Settings] Code refactor DataSaverSummary"
2021-10-12 05:56:21 +00:00
Bonian Chen
0ea486d1e5
[Settings] Code refactor DataSaverSummary
...
Remove unused Callbacks.
Bug: 202792574
Test: local and presubmit
Change-Id: I185c083fd1621b0256e55339e9688d6b190dee32
2021-10-12 11:53:32 +08:00
David Magno
6031a6ef69
Keep compatibility for old WiFi shortcut
...
WifiSettings2Activity has been replaced by WifiSettingsActivity
Test: Create a shortcut to WifiSettings in Android 11, update to Android 12 and test it
Bug: 202534606
Change-Id: I042eb3ae0bc0af6c42221c876cc4ea7b0a6de0b7
2021-10-11 18:26:09 +02:00
TreeHugger Robot
d3f9214763
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: c57387dee7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16019021
Change-Id: I9ac05f5da437030e1b5db082ddaf7959f82acccd
2021-10-10 05:56:12 +00:00
Bill Yi
cde6bf9031
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709
am: cac2809d5b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16019020
Change-Id: I1a4ce422c864b46a3400ed3b8e53109a4bf0c957
2021-10-10 05:55:05 +00:00
Bill Yi
f445e1018d
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709
am: fcdcf5a0a1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16019020
Change-Id: If3a3af0cabe768f1309479d54c0d99612940eb98
2021-10-10 05:53:33 +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
fcdcf5a0a1
[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: Iba6c62591668b487a0d31665e28d1ea37956fb44
2021-10-08 20:03:37 +00:00