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
cedb64da54
Merge "Add WIFI_SCANNING_SETTINGS action to Settings" into sc-qpr1-dev am: 28b7d115de
am: 574d925590
am: c6775ce9a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16047550
Change-Id: I4060ea57e03427fba06522bb8b76dec843335af0
2021-10-14 17:40:21 +00:00
TreeHugger Robot
3b57f4c725
Merge "Add WIFI_SCANNING_SETTINGS action to Settings" into sc-qpr1-dev am: 28b7d115de
am: f9dcd96f2e
am: f7ffefb956
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16047550
Change-Id: Ia72279d08752c9a8e6cf0d23b0d0d2c3ccda3025
2021-10-14 17:40:12 +00:00
TreeHugger Robot
c6775ce9a7
Merge "Add WIFI_SCANNING_SETTINGS action to Settings" into sc-qpr1-dev am: 28b7d115de
am: 574d925590
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16047550
Change-Id: Iee42f831a3854550ad4bf2e2e100476d2039dcb5
2021-10-14 17:22:08 +00:00
TreeHugger Robot
f7ffefb956
Merge "Add WIFI_SCANNING_SETTINGS action to Settings" into sc-qpr1-dev am: 28b7d115de
am: f9dcd96f2e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16047550
Change-Id: I5aa0ed21d5ec7de5ba1bc370f76dec8ab70e28a9
2021-10-14 17:21:50 +00:00
TreeHugger Robot
574d925590
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: I3c768c5e2f820b326e3605fb54ebaf46c723b943
2021-10-14 17:07:35 +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
Yanting Yang
0c359da620
Rephrase dialog message of clear storage dialog for security concern
...
Bug: 193890833
Test: visual
Change-Id: I8f0b066de710169ee8b922c44b6519ca21b9c7ef
2021-10-14 15:07:14 +00:00
Matt Pietal
7bd6a72772
Pattern view - Use new theme colors am: c4aa3b4ac5
am: d74e02be0b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16055023
Change-Id: I20addb80a08f2dcc37bc2e42d83e89927b0c2c70
2021-10-14 15:01:31 +00:00
Matt Pietal
d74e02be0b
Pattern view - Use new theme colors am: c4aa3b4ac5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16055023
Change-Id: I3854e8d29851ff4eded3a1b590d429f2159bf3e5
2021-10-14 14:52:17 +00:00
Matt Pietal
c4aa3b4ac5
Pattern view - Use new theme colors
...
For both SUW and general settings use, colors should match what is
already is use for the systemui bouncer.
Bug: 195272825
Test: SUW pattern view && settings pattern view
Change-Id: I374c904e65aac9a29b5ff5635c9db39f4f7ca8d5
2021-10-14 09:23:54 -04:00
TreeHugger Robot
08390e9e87
Merge "Revert "Add PowerSaveWhitelistExceptIdle as Optimizted modes condition""
2021-10-14 11:18:19 +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
YUKAI HUNG
6d75dc803f
Merge "[B&R] avoid to backup & restore app which is in the PowerSaveWhitelistExceptIdle " into sc-v2-dev am: c4f761c079
am: 3d0d6a38aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16048454
Change-Id: I112627c5f6f56f95e8195f7c5be458da09cc5adf
2021-10-14 10:06:19 +00:00
YUKAI HUNG
3d0d6a38aa
Merge "[B&R] avoid to backup & restore app which is in the PowerSaveWhitelistExceptIdle " into sc-v2-dev am: c4f761c079
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16048454
Change-Id: Iaa9b0143b6dfc96aba4fd83982f2ebeb0c2bd575
2021-10-14 09:56:48 +00:00
YUKAI HUNG
c4f761c079
Merge "[B&R] avoid to backup & restore app which is in the PowerSaveWhitelistExceptIdle " into sc-v2-dev
2021-10-14 09:44:47 +00:00
YUKAI HUNG
b1e10399cc
[B&R] avoid to backup & restore app which is in the PowerSaveWhitelistExceptIdle
...
This reverts commit 9de5fe158d
.
Reason for revert: revert it too based on ag/16048452
Change-Id: I97ffcfcbc37fb4a99e66213023b95af759d1ed3e
2021-10-14 09:34:27 +00:00
Wesley Wang
b900e0e43b
Revert "Add PowerSaveWhitelistExceptIdle as Optimizted modes condition"
...
This reverts commit 3f7839cad0
.
Reason for revert: This fix will cause a side effect which makes app switch state from Unrestricted to Optimize then it will lock at Optimize mode only, will prepare other cl to fix the previous issue
Change-Id: Ic5232eb0099fa1591f15e72747eca4d08b9af9b9
2021-10-14 09:31:13 +00:00
Chienyuan
1b9a21ffb5
RESTRICT AUTOMERGE Remove connection preferences "Files received via Bluetooth"
...
Bug: 197609370
Bug: 201630499
Test: manual
Change-Id: I597a2105ca851dd41d92109f7b1a5d0137942601
(cherry picked from commit 5be9255ddf
)
2021-10-14 08:47:16 +00:00
Menghan Li
ac4448c76b
Merge "Fix Settings app crashes when clicked on the magnification" into sc-v2-dev am: 6de9b2486f
am: 6001f86910
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16044202
Change-Id: I841ede3f2254ffe42881ffb28880ae293dee42f9
2021-10-14 07:42:58 +00:00
Menghan Li
6001f86910
Merge "Fix Settings app crashes when clicked on the magnification" into sc-v2-dev am: 6de9b2486f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16044202
Change-Id: I9fdf101e209d7ade30c3da5850ed4499d7fcca3d
2021-10-14 07:32:01 +00:00
Menghan Li
6de9b2486f
Merge "Fix Settings app crashes when clicked on the magnification" into sc-v2-dev
2021-10-14 07:19:11 +00:00
menghanli
f9ca092d58
Fix Settings app crashes when clicked on the magnification
...
1. Apply SetupWizardUtils.getTheme for AOSP / Nexus phone
2. Remove Magnification controller
3. Correct the description of the Talkback and Magnification page
Bug: 202792097
Test: manual test and upload fixed demo on bug
Change-Id: I108af30e3e2530bfabfcbdae03a7139a5b4e7a63
2021-10-13 22:34:27 +00:00
Sarah Chin
1f98bc28d6
Remove IMS from editabe APNs
...
If APN type is not specified, it will default to all APN types.
Remove IMS from editable APN types to prevent both default and IMS on
the same connection.
Test: make RunSettingsRoboTests
Bug: 195105491
Change-Id: I0db32412e8a2948509f235c94e1d681001b79995
2021-10-13 18:40:43 +00: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
95f32177f8
Merge "Add String for information about Wi-Fi scanning when Wi-Fi is off." into sc-qpr1-dev am: c0b9f4bdba
am: e7f8a872a5
am: 25b6629876
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16047548
Change-Id: I9fbd6c6d5a8ae434cb5f0e048ca550f72403ccbc
2021-10-13 17:26:26 +00:00
Betty Chang
4bce73b4f7
Merge "Add String for information about Wi-Fi scanning when Wi-Fi is off." into sc-qpr1-dev am: c0b9f4bdba
am: 5a5afba75b
am: ae320ac284
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16047548
Change-Id: Ie9e189bce8600015e822b576f94b6a37b3cde792
2021-10-13 17:26:12 +00:00
Betty Chang
25b6629876
Merge "Add String for information about Wi-Fi scanning when Wi-Fi is off." into sc-qpr1-dev am: c0b9f4bdba
am: e7f8a872a5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16047548
Change-Id: Ie19feb710a6a103c6c56b33cac2a62e0c426d94d
2021-10-13 17:16:09 +00:00
Betty Chang
ae320ac284
Merge "Add String for information about Wi-Fi scanning when Wi-Fi is off." into sc-qpr1-dev am: c0b9f4bdba
am: 5a5afba75b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16047548
Change-Id: Iad256ab39ccde14b1996e60d32f3b17127319033
2021-10-13 17:15:40 +00: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
e7f8a872a5
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: Ibd751df31fb63f3277b4319ee747f61cdb4640ec
2021-10-13 17:01:56 +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
Shaowei Shen
7a4715c7fe
Merge "[Sound panel] Update Ui layout to match with mertial next" into sc-v2-dev am: a6fc26dd45
am: bbff2d4bd3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15926634
Change-Id: Ibd5a8815b353591384cc624b81a9127a4b72c98f
2021-10-13 12:21:03 +00:00
Shaowei Shen
bbff2d4bd3
Merge "[Sound panel] Update Ui layout to match with mertial next" into sc-v2-dev am: a6fc26dd45
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15926634
Change-Id: I751ee13a0ab20cb9caefb8388866dd35c8a3590c
2021-10-13 12:11:45 +00:00
Shaowei Shen
a6fc26dd45
Merge "[Sound panel] Update Ui layout to match with mertial next" into sc-v2-dev
2021-10-13 12:01:47 +00:00
ykhung
720bdc249f
[automerger skipped] Adjust Battery Saver percentage slide size (sync from ag/13330588) am: 3c497cc715
-s ours am: 027ac442c7
-s ours
...
am skip reason: Merged-In Ia4453261c22919e325a971237efc79b4887362ec with SHA-1 1770a04730
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16044195
Change-Id: Iaeccf1b1c30879d95521c8168333412cd76a7d75
2021-10-13 05:11:16 +00:00
ykhung
027ac442c7
[automerger skipped] Adjust Battery Saver percentage slide size (sync from ag/13330588) am: 3c497cc715
-s ours
...
am skip reason: Merged-In Ia4453261c22919e325a971237efc79b4887362ec with SHA-1 1770a04730
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16044195
Change-Id: Ie0b30ac0633373624204e8becb02f3d0119731f0
2021-10-13 04:56:30 +00:00
ykhung
3c497cc715
Adjust Battery Saver percentage slide size (sync from ag/13330588)
...
Screenshots:
https://screenshot.googleplex.com/72qRevtZXA4PTcg.png
https://screenshot.googleplex.com/3rJjDRehdsPL8AQ.png
Bug: 157532287
Bug: 202295741
Test: make SettingsGoogleRoboTests
Merged-In: Ia4453261c22919e325a971237efc79b4887362ec
Change-Id: I09fe6fe3de6da45959ee0babbd34202340ec661d
2021-10-13 11:26:15 +08:00
shaoweishen
fb164fe128
[Sound panel] Update Ui layout to match with mertial next
...
please check bug for before/after screenshot.
Bug: 191317779
Test: verified on device
Change-Id: Ia570dde71ce9f18376eaba48102cecde6adb85bb
2021-10-12 14:24:09 +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
d708738137
Merge "[Settings] Crash when resetting downloaded eSIM"
2021-10-12 13:48:34 +00:00
Menghan Li
f4c50ff1af
Merge "Apply fade transition for font size and display size Suw page" into sc-v2-dev am: 502f53619f
am: a6e6cfbee1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16001288
Change-Id: Ic09486a53a972451dc7548f1ffa4c4fba23c67ca
2021-10-12 13:45:45 +00:00
ykhung
c96a20e1b7
Extend the SeekBar left/start padding to avoid touch region too small am: 1770a04730
am: 6b70e89f24
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16038024
Change-Id: Ib2c8b416bddcfb10d90d7fb45f08be9f07a2d96b
2021-10-12 13:45:38 +00:00
Menghan Li
a6e6cfbee1
Merge "Apply fade transition for font size and display size Suw page" into sc-v2-dev am: 502f53619f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16001288
Change-Id: I349e5f81d0124ae90cc7149424491dcb12b73282
2021-10-12 13:33:20 +00:00