Commit Graph

97082 Commits

Author SHA1 Message Date
Bonian Chen
f28f2884dd Merge "[Settings] Crash when resetting downloaded eSIM" into sc-qpr1-dev am: 74c4ca00e1 am: 2a92ebefbe am: 0925a120b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16039954

Change-Id: I4fbea557be0d7878f36930e752c28ec4c252251e
2021-10-15 02:28:30 +00:00
Bonian Chen
0925a120b3 Merge "[Settings] Crash when resetting downloaded eSIM" into sc-qpr1-dev am: 74c4ca00e1 am: 2a92ebefbe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16039954

Change-Id: I06e99432bfb99f3fba3b9b676bd7e930be8e5458
2021-10-15 02:09:14 +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
4c11d0c7bb [automerger skipped] Merge "Phone fails to switch channel mode from stereo to mono" into stage-aosp-master am: f2295126b6 am: ebc8a9fd1c am: 04e10ffc28 am: 8c5137e3b3 -s ours
am skip reason: Merged-In Iae4aa3f1d77350f5b4d91e7a687e048091c1daea with SHA-1 1469626b4a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15942380

Change-Id: I709323bdd5407e53d5edbde02e77e664a5ee6cf4
2021-10-14 19:16:36 +00:00
Roopa Sattiraju
8c5137e3b3 Merge "Phone fails to switch channel mode from stereo to mono" into stage-aosp-master am: f2295126b6 am: ebc8a9fd1c am: 04e10ffc28
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15942380

Change-Id: I073a5c88f41f227c315ac072ad026b6be424efda
2021-10-14 18:57:53 +00:00
Steven Moreland
c723e3e939 Merge "getBlobAshmemSize -> getOpenAshmemSize" am: 5d30c2de37 am: 90181319da am: 0fbe8bd395 am: 0a412b4351 am: bc25c4e88a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1856673

Change-Id: I505bfd72bc9eddb86e921bb469cbbd492c52dd58
2021-10-14 18:47:50 +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
Steven Moreland
bc25c4e88a Merge "getBlobAshmemSize -> getOpenAshmemSize" am: 5d30c2de37 am: 90181319da am: 0fbe8bd395 am: 0a412b4351
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1856673

Change-Id: Id7089952ed2543ea7e447441b85d2b5ed1aac2bf
2021-10-14 18:33:08 +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
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
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
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
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
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