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
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
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
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
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
Bonian Chen
d708738137
Merge "[Settings] Crash when resetting downloaded eSIM"
2021-10-12 13:48:34 +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
ykhung
c96a20e1b7
Extend the SeekBar left/start padding to avoid touch region too small am: 1770a04730
am: 6b70e89f24
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16038024
Change-Id: Ib2c8b416bddcfb10d90d7fb45f08be9f07a2d96b
2021-10-12 13:45:38 +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
ykhung
6b70e89f24
Extend the SeekBar left/start padding to avoid touch region too small am: 1770a04730
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16038024
Change-Id: If31c979c180f7874da7528dd48d01078508e3e91
2021-10-12 13:33:13 +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
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
a6e52a5b65
Merge "Add try-catch to avoid IllegalStateException in the data parsing" into sc-v2-dev am: f438abe0d9
am: 70ad3f590b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16038010
Change-Id: I59602b4653741017b50a4e2bcff6d5e00fb89975
2021-10-12 12:06:20 +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
Bonian Chen
8aa98d63fd
[Settings] Crash when resetting downloaded eSIM
...
Context need to be maintained when performing async operation in
background thread.
Bug: 202787946
Test: local
Change-Id: Ia5b81ae66e9482b10df5133b2f1444fc007a78e8
2021-10-12 19:43:16 +08: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
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
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
0956aee1f9
Merge "Revert "[Settings] Code refactor DataSaverSummary"" am: b0a2857ec5
am: dcd13abd65
am: 640fc7d172
am: 51cf3c121d
am: 146692a920
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853597
Change-Id: I14e04a1e3e2cacefd41ee740556806371969d2cd
2021-10-12 07:39:26 +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
TreeHugger Robot
0c8a97ff73
Merge "Remove connection preferences "Files received via Bluetooth""
2021-10-12 07:14:07 +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
ff75b3f969
Merge "[Settings] Code refactor DataSaverSummary" am: e7b211b35e
am: ef03b3a361
am: a300d2ecaa
am: c5bce8de72
am: 97de60c25f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853594
Change-Id: I7d25fdb228fea64043c67dd6bd8284da69b7cd70
2021-10-12 06:56:16 +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
Dmitri Plotnikov
4b8a7bcaa5
Use a simpler constructor
...
The constructor with two arguments is changing
Bug: 195306545
Test: make RunSettingsRoboTests
Change-Id: I56288bb5b3eb9d71ae49128ccbc72fd57abb48d1
2021-10-12 05:17:14 +00:00
Zoey Chen
9632cd7087
[Settings] Add null protection to avoid the crash
...
Change-Id: Id933a33ecf2931445a57cf6588a9c9123c170707
Test: manual
Bug: 202162176
2021-10-12 04:00:03 +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
99e05ea46c
Merge "Add NEW_TASK flag for intents that leave Settings" into sc-v2-dev am: 5a7966884b
am: e99fe9b60c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16018030
Change-Id: I740ef2294a340ad01366fd99df986f34563e28da
2021-10-11 16:05:50 +00: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
6387fa14a9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: c57387dee7
-s ours am: d3f9214763
-s ours am: da19c80eb2
-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: Ie648a580c58b9b018636dba0c9f493afa2e27e3c
2021-10-10 06:22:52 +00:00
Bill Yi
3a9f3d72f7
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709
am: cac2809d5b
-s ours am: cde6bf9031
-s ours am: 62b29dc3f9
-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: I1ff9f413ed79915e1cf8cdcd5c31eca733a339cc
2021-10-10 06:21:46 +00:00