Bill Yi
8e49756934
[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: Ib88fd011aa4e79ac0fbf689dd5c91e249865a767
2021-10-26 17:52:35 +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
Bill Yi
4c9877242c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 247075dcd5
-s ours am: 4bb4205b98
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16099516
Change-Id: I2677a4bb0fac39636b5a83879c43cb801566e1f1
2021-10-22 01:33:10 +00:00
TreeHugger Robot
17d5b1fc06
Merge changes from topic "presubmit-am-7ec75ddcc57e4269a8bd00190c66c479" into sc-qpr1-dev am: 3c824a23e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16099516
Change-Id: Ie9e4192c1a90a4f721ff02331df5b54370a5d7b2
2021-10-22 01:21:57 +00:00
Bill Yi
1aa1369fd8
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 247075dcd5
am: bace1bf648
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16099516
Change-Id: Id40fd4e26953fcf755ac5ea6cc4643720a199e58
2021-10-22 01:21:56 +00:00
Bill Yi
9b4af9ca03
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 52146b1b0a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16099517
Change-Id: I93be458d57eb11d851fcf6570e1dc12345ebc661
2021-10-22 01:21:39 +00:00
Bill Yi
4bb4205b98
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 247075dcd5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16099516
Change-Id: Ic29a34b7823931a043d7b419a11dd69118e2f750
2021-10-22 01:17:57 +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
Weng Su
76e3973684
Merge "Keep compatibility for old WiFi shortcut" am: ab7640dcd9
am: 400e5b0fba
am: 8cf3250517
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853101
Change-Id: Ifc9692777cd4e99ee358a4599317b69a619745ac
2021-10-21 13:20:13 +00:00
Weng Su
8cf3250517
Merge "Keep compatibility for old WiFi shortcut" am: ab7640dcd9
am: 400e5b0fba
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853101
Change-Id: Idb08b9650e7c5efce4ab40eb949ccab0e5949333
2021-10-21 13:10:56 +00:00
Weng Su
400e5b0fba
Merge "Keep compatibility for old WiFi shortcut" am: ab7640dcd9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853101
Change-Id: I44f373cab6a829af3e08ab95d62d53a42516d41a
2021-10-21 12:56:02 +00:00
Weng Su
ab7640dcd9
Merge "Keep compatibility for old WiFi shortcut"
2021-10-21 12:38:12 +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
changbetty
aab7b55926
Add location check for Wifi Scanning notify message
...
Bug: 203471614
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I0fccd1a8dfd8e6ca499a6f87a59772f70961bc1d
2021-10-20 15:14:08 +00:00
TreeHugger Robot
b097e09dd7
Merge "Update UWB toggle display after lifecycle events." into sc-qpr1-dev am: faf452bf94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16047401
Change-Id: I34e321f6a32401f5b0adcaacf90a63d32e7bccef
2021-10-20 04:53:31 +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
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