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
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
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
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
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
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
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
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
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
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
Menghan Li
502f53619f
Merge "Apply fade transition for font size and display size Suw page" into sc-v2-dev
2021-10-12 13:31:57 +00:00
YUKAI HUNG
70ad3f590b
Merge "Add try-catch to avoid IllegalStateException in the data parsing" into sc-v2-dev am: f438abe0d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16038010
Change-Id: Ifbb0ea168a7f099ebaed0c20aa9b8ab1cf1c3dbd
2021-10-12 11:54:59 +00:00
YUKAI HUNG
f438abe0d9
Merge "Add try-catch to avoid IllegalStateException in the data parsing" into sc-v2-dev
2021-10-12 11:41:57 +00:00
Jason Chiu
235353a131
Revert "Revert "Support highlightable Settings homepage menu for 2-pane"" am: 29a09e55ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16038013
Change-Id: I599f443a720cccc3c3e5a784a689cf2df1cc7fc3
2021-10-12 10:58:00 +00:00
ykhung
72a25f16ee
Add try-catch to avoid IllegalStateException in the data parsing
...
if the BatteryStats service is crashed, we will provide the default instance for all modules in the battery settings, but it will encounter the IllegalStateException if we try to parse its history content (reference: ag/15926630)
Bug: 201729939
Test: make SettingsRoboTests
Change-Id: Ifebb48551e371e7c4e121969cb92cf95aa026812
2021-10-12 09:37:41 +00:00
Jason Chiu
29a09e55ba
Revert "Revert "Support highlightable Settings homepage menu for 2-pane""
...
This reverts commit 096c090b80 .
Reason for revert: crash is fixed in this change
Bug: 202510128
Test: manual, build
Change-Id: Ifff8d58cfdcf43e123b11dee308665b2617cb4b3
2021-10-12 09:32:07 +00:00
Bonian Chen
146692a920
Merge "Revert "[Settings] Code refactor DataSaverSummary"" am: b0a2857ec5 am: dcd13abd65 am: 640fc7d172 am: 51cf3c121d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853597
Change-Id: I2989c2847378b3f51e9263538dddde1fbb32ca34
2021-10-12 07:29:16 +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
Treehugger Robot
97de60c25f
Merge "[Settings] Code refactor DataSaverSummary" am: e7b211b35e am: ef03b3a361 am: a300d2ecaa am: c5bce8de72
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853594
Change-Id: I3207627a6fc0df30c6dc2fe023757d4f4722b2bf
2021-10-12 06:45:16 +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
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
menghanli
71aca3b7a9
Apply fade transition for font size and display size Suw page
...
- Create font size & screen size controler to simply xml
- Add onPuase animation
Bug: 194447311
Test: atest AccessibilityScreenSizeForSetupWizardActivityTest
Test: atest FontSizePreferenceControllerTest
Test: atest ScreenSizePreferenceControllerTest
Change-Id: I91f3fd4c22aba4f8cd46f6e82e50987544942245
2021-10-12 09:48:16 +08:00
TreeHugger Robot
e99fe9b60c
Merge "Add NEW_TASK flag for intents that leave Settings" into sc-v2-dev am: 5a7966884b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16018030
Change-Id: I670e7a9cc69ef1805e5450a6054d4616624583d6
2021-10-11 15:51:19 +00:00
TreeHugger Robot
5a7966884b
Merge "Add NEW_TASK flag for intents that leave Settings" into sc-v2-dev
2021-10-11 15:38:16 +00:00
Antoan Angelov
c32f18a7c5
Merge "Don't start DPC with the FLAG_ACTIVITY_NEW_TASK flag" into sc-v2-dev am: 3bc6b32b51
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15853135
Change-Id: Iaf3272d30b5c54a89525989e9d91ea0c3429c879
2021-10-08 18:36:40 +00:00
Antoan Angelov
3bc6b32b51
Merge "Don't start DPC with the FLAG_ACTIVITY_NEW_TASK flag" into sc-v2-dev
2021-10-08 18:23:50 +00:00
Julia Reynolds
f8cdea4b9d
Add NEW_TASK flag for intents that leave Settings
...
Test: manual
Fixes: 202101382
Change-Id: Ie0cc7c10b19b49ad33227f3fdaad397e03e33858
2021-10-08 17:05:45 +00:00
Greg Kaiser
3f638ebad8
Merge "Revert "Support highlightable Settings homepage menu for 2-pane"" into sc-v2-dev am: 1ab7ad3e40
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16017469
Change-Id: I01497de4d02a9a2868af8f2611eb20b24f61b20f
2021-10-08 14:56:25 +00:00
Greg Kaiser
1ab7ad3e40
Merge "Revert "Support highlightable Settings homepage menu for 2-pane"" into sc-v2-dev
2021-10-08 14:48:14 +00:00
Greg Kaiser
096c090b80
Revert "Support highlightable Settings homepage menu for 2-pane"
...
This reverts commit 9037ceabd3 .
Reason for revert: Presumed cause of b/202510128
Change-Id: I0daaab95d9bc57229c0c8c916cbe3ada7aafb6fa
2021-10-08 14:29:06 +00:00
TreeHugger Robot
815abaade4
Merge "[Large screen] Set alwaysExpand for SearchActivity." into sc-v2-dev am: bf6160280f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15921663
Change-Id: I92af54854cc20dc8835a9a650d63b018c68692f0
2021-10-08 12:07:10 +00:00
TreeHugger Robot
bf6160280f
Merge "[Large screen] Set alwaysExpand for SearchActivity." into sc-v2-dev
2021-10-08 11:58:29 +00:00
TreeHugger Robot
fdb46441a9
Merge "Change DeepLinkHomepageActivity enable state for ACTION_USER_INITIALIZE" into sc-v2-dev am: 1bc9997032
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16013678
Change-Id: I4882850212e0936f262f883ab82ee22c91f171ce
2021-10-08 11:31:18 +00:00
TreeHugger Robot
1bc9997032
Merge "Change DeepLinkHomepageActivity enable state for ACTION_USER_INITIALIZE" into sc-v2-dev
2021-10-08 11:11:20 +00:00
Arc Wang
28cdf73cf7
[Large screen] Set alwaysExpand for SearchActivity.
...
Set alwaysExpand and SearchActivity will show in full screen.
Bug: 196923591
Test: manual
Settings -> Search settings
Change-Id: I4174753bce15232342fa69d0845225a95d757782
2021-10-08 18:14:18 +08:00