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
Arc Wang
3648d67201
Change DeepLinkHomepageActivity enable state for ACTION_USER_INITIALIZE
...
Each user has different components enable state,
should update enable state of DeepLinkHomepageActivity
for Intent#ACTION_USER_INITIALIZE.
Bug: 202364984
Test: manual
Switch user -> long click Launcher -> Wallpaper & style
See if it shows wallpaper app's Activity.
Change-Id: If50de0f017f5cd606ba0cbf88d41eeabf3f47506
2021-10-08 08:11:13 +00:00
Jason Chiu
de33f1224b
Merge "Support highlightable Settings homepage menu for 2-pane" into sc-v2-dev am: 9b1f593773
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15785736
Change-Id: I541605e02d5afdc340faf28c69ecc4b66207ed86
2021-10-08 08:04:48 +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
TreeHugger Robot
d8d7b901b0
Merge "Update to new method of getting display power profile constants" into sc-v2-dev am: d754409050
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15927847
Change-Id: I5e423b8ee6973354089c6a014fc8900d32cce8eb
2021-10-08 06:21:16 +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
TreeHugger Robot
d754409050
Merge "Update to new method of getting display power profile constants" into sc-v2-dev
2021-10-08 02:28:51 +00:00
Bonian Chen
168eb66096
Merge "[Settings] Adopt comfirm SIM deletion to euicc reset UI" into sc-qpr1-dev am: 78c18a1b45 am: ca721649c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15993432
Change-Id: I1273ad2a03d6f18e936008e12e26bfe0df7bd50c
2021-10-08 00:34:36 +00:00
Bonian Chen
c915df88b7
Merge "[Settings] Adopt comfirm SIM deletion to euicc reset UI" into sc-qpr1-dev am: 78c18a1b45
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15993432
Change-Id: I295924575236c7101f3784f8c9f102d2f5dc49a5
2021-10-08 00:01:14 +00:00
Bonian Chen
ca721649c8
Merge "[Settings] Adopt comfirm SIM deletion to euicc reset UI" into sc-qpr1-dev am: 78c18a1b45
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15993432
Change-Id: I1b2cd3afdd506f14f0bb7f8f02299fc8b26116d9
2021-10-08 00:01:10 +00:00
Bonian Chen
4ee6123229
[Crash] finish activity without super#onResume()
...
When finish() an activity within onStart() or onResume(),
super#onStart() or super#onResume() need to be invoked prior to
finish().
Bug: 200513672
Test: local
Change-Id: Ifba0956fb3a11888c84f55342f62a3f192a67294
(cherry picked from commit 24dfc61f99 )
2021-10-07 23:44:52 +00:00
Bonian Chen
78c18a1b45
Merge "[Settings] Adopt comfirm SIM deletion to euicc reset UI" into sc-qpr1-dev
2021-10-07 23:42:43 +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
Arc Wang
4b24df9387
Merge "[Large screen] Fix SplitPaitRule not match for deep link problem" into sc-v2-dev am: d2cb885c32
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15948302
Change-Id: Ie12e2314024d3eabf1ec2cc69e8565bfc64ca752
2021-10-07 10:38:43 +00:00
Arc Wang
dcc46cf136
[Large screen] Fix SplitPaitRule not match for deep link problem
...
- Set both secondary ComponentName and secondary Intent action
in SplitPairFilter when registering SplitPairRule for deep link.
- Set ComponentName to the Intent which DeepLinkHomepageActivity
uses to start the deep link page.
This change setup Intent and SplitPairRule to have both
Intent action and ComponentName. It fixes matching problem.
Bug: 201627196
Bug: 199888089
Test: manual
[Unfolded] Long press home (workspace) -> Pop-up menu ->
Tap 'Wallpaper & style' -> Launch Settings in the left as
list and 'Wallpaper & style' in the right as detail.
Change-Id: I8cc8cef911ce0d7d05f332eb86f77f8d2543827f
2021-10-07 17:44:24 +08: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
6662a94c23
[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 34b571612f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959646
Change-Id: Ica11fe7e996e2e7ddf20572b4d84f1e5637a846c
2021-10-06 19:08:49 +00:00
Weng Su
1b732ee4cb
[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: ca67955d7d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958174
Change-Id: Ibe7ee7e46ef2568608ab98781b2795d8b6216bbb
2021-10-06 19:08:27 +00:00
Weng Su
36558d2c6c
[RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: f733da4859
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15951620
Change-Id: I2328f01474382bf74a445cddf8d110bb4ce7ac58
2021-10-06 19:08:25 +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
Bonian Chen
71818bdf15
[Settings] Adopt comfirm SIM deletion to euicc reset UI
...
There's an "Erase downloaded SIMs" option within reset options UI.
When reset EUICC, eSIM profile might get removed.
There's a security feature "Confirm SIM deletion" need to be applied in
this case.
Bug: 194145231
Test: local
Change-Id: I1798dfe347be7d0610a12fb79f103efece2ab240
(cherry picked from commit ebca15a861 )
2021-10-06 16:58:07 +00:00
Kunhung Li
4e77f2d62c
Merge "Not use NEW_TASKS for Wallpaper & style's 2-pane UX" into sc-v2-dev am: f83531e0b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15938355
Change-Id: I04034e2b77306d8494f496851af02f3d4e666e77
2021-10-06 14:19:12 +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
ebdfd05c67
Merge "Apply GlifPreferenceLayout for accessibility service Setup Wizard two-panel styles" into sc-v2-dev am: 9441d2b289
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15773283
Change-Id: Icfd8f891f85dc2a179770592fc1168eab2a501b0
2021-10-06 11:00:39 +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
e6a10f3487
Merge "Update adaptive preference summary" into sc-v2-dev am: 6ff60d7771
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15981706
Change-Id: I33990898878a7f3a451667827936503f707f09f7
2021-10-06 10:14:33 +00:00
TreeHugger Robot
6ff60d7771
Merge "Update adaptive preference summary" into sc-v2-dev
2021-10-06 10:03:55 +00:00