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
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
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
a6fc26dd45
Merge "[Sound panel] Update Ui layout to match with mertial next" into sc-v2-dev
2021-10-13 12:01:47 +00: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
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
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
Jason Chiu
e65d3ab1cc
Revert "Revert "Support highlightable Settings homepage menu for 2-pane"" am: 29a09e55ba
am: 235353a131
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16038013
Change-Id: I4c526a0854fbe64efb834bf993c1e461b7993cad
2021-10-12 11:12:26 +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
TreeHugger Robot
0c8a97ff73
Merge "Remove connection preferences "Files received via Bluetooth""
2021-10-12 07:14:07 +00: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
Antoan Angelov
e17b0850ee
Merge "Don't start DPC with the FLAG_ACTIVITY_NEW_TASK flag" into sc-v2-dev am: 3bc6b32b51
am: c32f18a7c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15853135
Change-Id: I340c4a735b6eda7409f67dab1bcd8252c04a41b1
2021-10-08 18:49:16 +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
Chienyuan
5be9255ddf
Remove connection preferences "Files received via Bluetooth"
...
Bug: 197609370
Bug: 201630499
Test: manual
Change-Id: I597a2105ca851dd41d92109f7b1a5d0137942601
2021-10-09 01:19:00 +08:00
Greg Kaiser
d659a5271b
Merge "Revert "Support highlightable Settings homepage menu for 2-pane"" into sc-v2-dev am: 1ab7ad3e40
am: 3f638ebad8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16017469
Change-Id: I8a3deba2be06113f781f399221a8463f5454ceee
2021-10-08 15:12:13 +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
Jason Chiu
630cbdc519
Merge "Support highlightable Settings homepage menu for 2-pane" into sc-v2-dev am: 9b1f593773
am: de33f1224b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15785736
Change-Id: Ic375f9e19b1f6dbc6f70cedaa770c133fb96f652
2021-10-08 08:12:37 +00:00
Jason Chiu
9b1f593773
Merge "Support highlightable Settings homepage menu for 2-pane" into sc-v2-dev
2021-10-08 07:52:45 +00:00
Jason Chiu
9037ceabd3
Support highlightable Settings homepage menu for 2-pane
...
1. Add a preference group adapter to perform highlighting
2. Add a class for mapping highlighable menu keys and preference keys
3. Add an API to determine if the screen is in split mode
Bug: 199017944
Test: manual, build
Change-Id: I8e3fe5fb96480a31ee0f3b3afb6ad78999d3d2bc
2021-10-08 12:52:52 +08:00
Adam Bookatz
97302f6f77
Merge "UM.getUserHandle -> UM.getProcessUserId"
2021-10-08 02:22:28 +00:00
arangelov
c5346baaa2
Don't start DPC with the FLAG_ACTIVITY_NEW_TASK flag
...
The flag prevents the DPC screen from showing with the in-app
transition.
Fixes: 198422800
Test: manual
Change-Id: Ie6debb55396eb5ce48a21b1ef52c89612b1c7ffd
2021-10-07 19:27:38 +01:00
Weng Su
d6104f2e72
[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: f603e671e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959642
Change-Id: I644814dfa7c696b1a7df4be6b061f1c6be21092d
2021-10-06 19:09:43 +00:00
Weng Su
cbd0883356
[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 6a2624e500
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958163
Change-Id: I74316633648d6a5002433440358b9a0a443b3cf8
2021-10-06 19:04:58 +00:00
Weng Su
1c15ca32c2
Merge changes from topic "sc-dev_WifiDialogActivity_permission-sc-qpr1-dev-sc-v2-dev" into sc-v2-dev
...
* changes:
[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity"
[RESTRICT AUTOMERGE] Revert "Add SafetyNet logging"
2021-10-06 18:48:54 +00:00
Weng Su
e736eff6db
Merge changes from topic "sc-dev_WifiDialogActivity_permission-sc-qpr1-dev" into sc-qpr1-dev
...
* changes:
[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity"
[RESTRICT AUTOMERGE] Revert "Add SafetyNet logging"
2021-10-06 18:48:39 +00:00
Kunhung Li
068b235c12
Merge "Not use NEW_TASKS for Wallpaper & style's 2-pane UX" into sc-v2-dev am: f83531e0b3
am: 4e77f2d62c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15938355
Change-Id: I87c801dbd33fba3a851090ca91eae6bcc81aa1a5
2021-10-06 14:38:36 +00:00
Kunhung Li
f83531e0b3
Merge "Not use NEW_TASKS for Wallpaper & style's 2-pane UX" into sc-v2-dev
2021-10-06 14:05:10 +00:00
Kunhung Li
c692af2a76
Not use NEW_TASKS for Wallpaper & style's 2-pane UX
...
Refine launch mode to support 2-pane UX for Settings.
Bug: 197609643
Test: make RunSettingsRoboTests
Change-Id: I5212bbcf8c512fac571284379a29cf487f387c5a
2021-10-06 14:04:08 +00:00
Menghan Li
21eb4d80f4
Merge "Apply GlifPreferenceLayout for accessibility service Setup Wizard two-panel styles" into sc-v2-dev am: 9441d2b289
am: ebdfd05c67
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15773283
Change-Id: Ie70c92947bcff341fe7040e8ce5d2046eea0643d
2021-10-06 11:18:43 +00:00
Menghan Li
9441d2b289
Merge "Apply GlifPreferenceLayout for accessibility service Setup Wizard two-panel styles" into sc-v2-dev
2021-10-06 10:46:37 +00:00
TreeHugger Robot
bf19d369a0
Merge "Update adaptive preference summary" into sc-v2-dev am: 6ff60d7771
am: e6a10f3487
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15981706
Change-Id: If760aaa0006cadb1f5cbb999b977ffe719dfb6d7
2021-10-06 10:19:36 +00:00
TreeHugger Robot
6ff60d7771
Merge "Update adaptive preference summary" into sc-v2-dev
2021-10-06 10:03:55 +00:00
TreeHugger Robot
fe13cd070d
Merge "Update font/display size pages for support large screen in SuW" into sc-v2-dev am: 9ade901dd7
am: 87895d0893
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15895175
Change-Id: Icb7de5c7fc4bd8f89f7ef04b0cd9e8eb36a1c882
2021-10-06 06:42:34 +00:00
Sunny Shao
f9beef43c9
Update font/display size pages for support large screen in SuW
...
- Follow the SuW design of the UI guideline.
- Add the footer button for each pages.
- Add a new AccessibilityScreenSizeForSetupWizardActivity for SuW.
- Add suw_font_size_fragment.xml and suw_screen_zoom_fragment.xml
for each fragment.
- Shorten 50% of the preview height.
Bug: 194447311
Fixes: 199369859
Test: manual test
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.accessibility
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: I2685e96d37d542490521ec24cfce490f87cbd88d
2021-10-06 11:41:57 +08:00
Daniel Solomon
c2bc33531b
Merge "Update BrightnessInfo constructor usage" into sc-qpr1-dev am: 396939a577
am: cdf1cf85ee
am: 0ecfb4be90
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15918324
Change-Id: Ib693de8b376a442e4ecbbdd674f0f5d9339d5ce1
2021-10-05 23:28:45 +00:00
Daniel Solomon
0ecfb4be90
Merge "Update BrightnessInfo constructor usage" into sc-qpr1-dev am: 396939a577
am: cdf1cf85ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15918324
Change-Id: I994364ea896dc8852c83a022891f28e99ca3dfd8
2021-10-05 23:14:00 +00:00
Daniel Solomon
71d5798d3e
Merge "Update BrightnessInfo constructor usage" into sc-qpr1-dev am: 396939a577
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15918324
Change-Id: Iea142d5bec500413df5dd68ee0fc73273130ecdc
2021-10-05 23:01:16 +00:00
Daniel Solomon
396939a577
Merge "Update BrightnessInfo constructor usage" into sc-qpr1-dev
2021-10-05 22:44:19 +00:00
Adam Bookatz
30dafd4140
UM.getUserHandle -> UM.getProcessUserId
...
UM is being made @UserHandleAware, so using an explicit method avoids ambiguity.
Bug: 201679968
Test: (No-op) compiles and treehugger
Change-Id: If067af7ced5017a9689cafbf99ceec1d26c06b3b
2021-10-05 12:55:22 -07:00
Weng Su
ca67955d7d
[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity"
...
This reverts commit 71e728e934
.
Reason for revert: rollback CLs to avoid compatibility risks
Bug: 185126813
Change-Id: I9251eb35ecba9bcc07eb3763c47c3ad7f55897f1
2021-10-05 12:04:33 +00:00
Wesley.CW Wang
4137253658
Update adaptive preference summary
...
Bug: 195627250
Test: make RunSettingsRoboTests
Change-Id: I50ed736bbba7ac8d3d6fcf026e9e17e2116f86a7
2021-10-05 17:52:43 +08:00
Weng Su
18043562c1
[RESTRICT AUTOMERGE] Revert "[DO NOT MERGE] Add permission checking to WifiDialogActivity"
...
Revert submission 15207347-add_permission_wifidialog
Reason for revert: rollback CLs to avoid compatibility risks
Reverted Changes:
If7ca069c8:[DO NOT MERGE] Add permission checking to WifiDial...
I1535f6f2d:[DO NOT MERGE] Add SafetyNet logging
Bug: 185126813
Change-Id: Ifc3b53dc91fc8d5aa31c1a10d4eb033bbe54c47d
2021-10-05 06:47:46 +00:00
Weng Su
6a2624e500
[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity"
...
Revert submission 15220072-add_permission_wifidialog-qt-dev
Reason for revert: rollback CLs to avoid compatibility risks
Reverted Changes:
I1535f6f2d:Add SafetyNet logging
If7ca069c8:Add permission checking to WifiDialogActivity
Bug: 185126813
Change-Id: I3f75adf5bf0eea037dc0c5dfbeeb22b35b2856b6
2021-10-05 03:37:51 +00:00
menghanli
7e8dd64ee4
Apply GlifPreferenceLayout for accessibility service Setup Wizard two-panel styles
...
Bug: 194447311
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilitySetupWizardUtilsTest
Change-Id: Icace09d12c0d2a82eb2591a55f6454f320172ec9
2021-10-05 10:09:04 +08:00
Weng Su
34b571612f
[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity"
...
This reverts commit 71e728e934
.
Reason for revert: rollback CLs to avoid compatibility risks
Bug: 185126813
Change-Id: I9251eb35ecba9bcc07eb3763c47c3ad7f55897f1
2021-10-04 07:29:56 +00:00
Weng Su
f603e671e7
[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity"
...
This reverts commit 71e728e934
.
Reason for revert: rollback CLs to avoid compatibility risks
Bug: 185126813
Change-Id: I9251eb35ecba9bcc07eb3763c47c3ad7f55897f1
2021-10-03 18:26:32 +00:00