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
Arc Wang
8b2dd65738
Improve scalability of Settings deep link API
...
Avoid using 'two pane' and 'large screen' because
they are implementation details exposure.
Bug: 201662312
Test: build pass
Change-Id: Id3555f734ff11e31d2f4db0479331c4f27e9e715
2021-10-12 21:31:54 +08:00
ykhung
1770a04730
Extend the SeekBar left/start padding to avoid touch region too small
...
old padding: https://screenshot.googleplex.com/3t57cJfM2HCd6bc
new padding: https://screenshot.googleplex.com/5yuzj5oQvvKvY7W
Bug: 202295741
Test: make SettingsRoboTests
Change-Id: Ia4453261c22919e325a971237efc79b4887362ec
2021-10-12 13:20:53 +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
Bonian Chen
dcd13abd65
Merge "Revert "[Settings] Code refactor DataSaverSummary"" am: b0a2857ec5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853597
Change-Id: Ibdca526adba3a2fb79cec39101832d53d87b46b7
2021-10-12 06:50:56 +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
Bonian Chen
b0a2857ec5
Merge "Revert "[Settings] Code refactor DataSaverSummary""
2021-10-12 06:36:35 +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
Treehugger Robot
ef03b3a361
Merge "[Settings] Code refactor DataSaverSummary" am: e7b211b35e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853594
Change-Id: I8e4f9e3429948ba709dfa40eb56f7c428813590c
2021-10-12 06:09:37 +00:00
Treehugger Robot
e7b211b35e
Merge "[Settings] Code refactor DataSaverSummary"
2021-10-12 05:56:21 +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
David Magno
6031a6ef69
Keep compatibility for old WiFi shortcut
...
WifiSettings2Activity has been replaced by WifiSettingsActivity
Test: Create a shortcut to WifiSettings in Android 11, update to Android 12 and test it
Bug: 202534606
Change-Id: I042eb3ae0bc0af6c42221c876cc4ea7b0a6de0b7
2021-10-11 18:26:09 +02: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
TreeHugger Robot
da19c80eb2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: c57387dee7
-s ours am: d3f9214763
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16019021
Change-Id: I3cc599a18511c1fddc63c8c247d691b723693dbb
2021-10-10 06:10:54 +00:00
Bill Yi
62b29dc3f9
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709
am: cac2809d5b
-s ours am: cde6bf9031
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16019020
Change-Id: I45c7f6b3b4fdafbdadf9e2551b282e895145832d
2021-10-10 06:10:08 +00:00
Bill Yi
39e7e33489
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709
am: fcdcf5a0a1
-s ours am: f445e1018d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16019020
Change-Id: I6f7fbd7cda6172b280a1f28183ab56eec9796f94
2021-10-10 06:09:00 +00:00
TreeHugger Robot
ccb2ded802
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: c57387dee7
-s ours am: 1b8322a812
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16019021
Change-Id: I368c1287c2c271b5e70db30e68c230862d233fcf
2021-10-10 05:57:37 +00:00
Bill Yi
16e17ee6c9
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709
am: cac2809d5b
-s ours am: 4f311bebde
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16019020
Change-Id: Ibeda7ba6e8538ca5f23907b4849ca42ec32b19af
2021-10-10 05:56:43 +00:00
TreeHugger Robot
d3f9214763
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: c57387dee7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16019021
Change-Id: I9ac05f5da437030e1b5db082ddaf7959f82acccd
2021-10-10 05:56:12 +00:00
TreeHugger Robot
1b8322a812
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: c57387dee7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16019021
Change-Id: Ic4a369673e7cab2927c9c6f51dbf30674c9fc55b
2021-10-10 05:55:47 +00:00
TreeHugger Robot
7439f9dcfc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6cf476bd44
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16019023
Change-Id: I35909efac7d6a21c025f87b5c36cd8a1adb41e4a
2021-10-10 05:55:12 +00:00
Bill Yi
cde6bf9031
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709
am: cac2809d5b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16019020
Change-Id: I1a4ce422c864b46a3400ed3b8e53109a4bf0c957
2021-10-10 05:55:05 +00:00
Bill Yi
4f311bebde
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709
am: cac2809d5b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16019020
Change-Id: I8cf88d7a8d77131af720823b7be7b2c0af0d50b1
2021-10-10 05:54:56 +00:00
Bill Yi
f445e1018d
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709
am: fcdcf5a0a1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16019020
Change-Id: If3a3af0cabe768f1309479d54c0d99612940eb98
2021-10-10 05:53:33 +00:00
TreeHugger Robot
c57387dee7
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-10-10 05:34:09 +00:00
TreeHugger Robot
6cf476bd44
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-10-10 05:34:04 +00:00
Bill Yi
4eedb7fa41
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic5c26e1d4bd75816dbda40b0f818dac5729e04b4
2021-10-08 20:10:53 +00:00
Bill Yi
9b8ef1b7ae
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If65120e7b71d5ea69ec91f72077de3c4b45b287b
2021-10-08 20:07:13 +00:00
Bill Yi
fcdcf5a0a1
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16019020
Change-Id: Iba6c62591668b487a0d31665e28d1ea37956fb44
2021-10-08 20:03:37 +00:00
Bill Yi
cac2809d5b
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16019020
Change-Id: If7e901e27836f4e297645947d45bac9f08088eff
2021-10-08 20:03:37 +00:00
Bill Yi
2c4e278709
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Icbd3c3d47b1f4d87866e79697db179d113e14d32
2021-10-08 20:03:23 +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