Peter Wang
c417dda04a
[automerger skipped] Merge "Added an option in reset menu in Settings to enable resetting Euicc data only" am: 0b5532f67c
am: e74a04b3a8
am: 447fc31966
-s ours am: 67f7068065
-s ours
...
am skip reason: skip tag Change-Id Ia260b47a4dd0ddf0363740891b5e1d818c8631b7 with SHA-1 ecd856eeeb
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1562838
Change-Id: I3c9683c71a16ecf6ec206590b8058be09fab449e
2021-03-24 20:10:43 +00:00
Peter Wang
67f7068065
[automerger skipped] Merge "Added an option in reset menu in Settings to enable resetting Euicc data only" am: 0b5532f67c
am: e74a04b3a8
am: 447fc31966
-s ours
...
am skip reason: skip tag Change-Id Ia260b47a4dd0ddf0363740891b5e1d818c8631b7 with SHA-1 ecd856eeeb
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1562838
Change-Id: I125327931f43e3312cf5fb7173ba0f2929521044
2021-03-24 19:56:23 +00:00
Sally Yuen
cbe24179ad
Merge "Update Reduce Bright Colors preference string" into sc-dev am: 286247a9b6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13960429
Change-Id: Ia963ff0d90637deac7bd0c2ca5b18794f0d1251d
2021-03-24 19:51:47 +00:00
Peter Wang
447fc31966
Merge "Added an option in reset menu in Settings to enable resetting Euicc data only" am: 0b5532f67c
am: e74a04b3a8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1562838
Change-Id: I7a0a8993fbadd72cfe1dfb16879fb235b67ff007
2021-03-24 19:32:58 +00:00
Sally Yuen
286247a9b6
Merge "Update Reduce Bright Colors preference string" into sc-dev
2021-03-24 19:11:31 +00:00
Peter Wang
e74a04b3a8
Merge "Added an option in reset menu in Settings to enable resetting Euicc data only" am: 0b5532f67c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1562838
Change-Id: Ia2dccf44b762bc5cf805f4c2aa3fea7f937c921c
2021-03-24 18:56:56 +00:00
Ahaan Ugale
861a58ab89
Merge "Autofill Settings: Display the number of saved passwords." into sc-dev am: a8df0386ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13803855
Change-Id: I7e0be679fd52df2f3c5fd17779166521801b5a14
2021-03-24 18:55:51 +00:00
Ahaan Ugale
a8df0386ae
Merge "Autofill Settings: Display the number of saved passwords." into sc-dev
2021-03-24 18:42:50 +00:00
Peter Wang
0b5532f67c
Merge "Added an option in reset menu in Settings to enable resetting Euicc data only"
2021-03-24 18:12:14 +00:00
sallyyuen
cd09b3a571
Update Reduce Bright Colors preference string
...
Test: manual, atest ReduceBrightColorsPreferenceControllerTest
Bug: 182116724
Change-Id: Ifde343aad7c6931efd083a1c728a2504b74f089f
2021-03-24 09:54:57 -07:00
Yanting Yang
d095f6265f
Merge "Add new summaries for homepage preferences" into sc-dev am: 1b82a33048
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13981634
Change-Id: I982dd0ca996dd1ee562abd24b62b7ef88bff4c4e
2021-03-24 15:44:52 +00:00
Yanting Yang
1b82a33048
Merge "Add new summaries for homepage preferences" into sc-dev
2021-03-24 15:21:39 +00:00
Jason Chang
d75463cb1e
Merge "Fix refresh in Gestures, not reflecting the changes after toggling on/off one-handed mode" into sc-dev am: aafe9ac0a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849832
Change-Id: I0c2c63ff60ccb4652801cbfd14ac4e17a579f701
2021-03-24 15:20:16 +00:00
Ahaan Ugale
c5761363d5
Merge "Merge Autofill settings into Account settings." into sc-dev am: 7f3534925f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13958194
Change-Id: I885977691d21e665af4d7b239778245eea507548
2021-03-24 15:19:59 +00:00
Jason Chang
aafe9ac0a0
Merge "Fix refresh in Gestures, not reflecting the changes after toggling on/off one-handed mode" into sc-dev
2021-03-24 15:15:52 +00:00
Ahaan Ugale
7f3534925f
Merge "Merge Autofill settings into Account settings." into sc-dev
2021-03-24 14:48:58 +00:00
Edgar Wang
83498d4b82
Merge "Update Preference style" into sc-dev am: 7cd16ae07d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13892865
Change-Id: I56cc42638e44805f10ee493456f4ad2162ab88f7
2021-03-24 14:20:56 +00:00
SongFerng Wang
f96718be83
Merge "Set setNetworkSelectionModeManual with AccessNetworkType into RIL/Modem" into sc-dev am: 419d5438f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13981638
Change-Id: I035d563b91ff7e2d81e1a5d10d36e7f55f61a320
2021-03-24 14:20:36 +00:00
Edgar Wang
7cd16ae07d
Merge "Update Preference style" into sc-dev
2021-03-24 14:14:37 +00:00
SongFerng Wang
419d5438f1
Merge "Set setNetworkSelectionModeManual with AccessNetworkType into RIL/Modem" into sc-dev
2021-03-24 13:53:52 +00:00
Jason Chang
858bda81f1
Fix refresh in Gestures, not reflecting the changes after
...
toggling on/off one-handed mode
1) Remove disabling on swipe down notification.
2) Update to align asset with One-Handed mode temporarily.
3) Change some states when toggle on/off and align with
One-Handed mode.
4) Set temporary asset style to "centerInside" to avoid image
corrupted problem when device rotate.
5) Add new string on Swipe down notification toggle switch.
Bug: 177679988
Bug: 181970213
Test: manual verified on Settings > System > Gesture page
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures.OneHandedSettingsTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures
.OneHandedAppTapsExitPreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures
.OneHandedEnablePreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures
.OneHandedTimeoutPreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures.OneHandedSettingsUtilsTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures.SwipeBottomToNotificationPreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures.SwipeBottomToNotificationSettingsTest"
Change-Id: Ifd2346a7694323d21eb424891987c8317847e7c5
2021-03-24 21:40:08 +08:00
Yanting Yang
4745f871a7
Add new summaries for homepage preferences
...
Bug: 183586663
Test: rebuilt
Change-Id: Iaff186924cce5a9e5bac4fb648ea1931ec13468a
2021-03-24 21:17:32 +08:00
Jason Chiu
94d4e539d0
Merge "Settings homepage redesign" into sc-dev am: 923cd0de6c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13946305
Change-Id: Ib7238f1ca180ff3f7d2a2bb2af62cb94ae4a0281
2021-03-24 13:10:46 +00:00
Jason Chiu
923cd0de6c
Merge "Settings homepage redesign" into sc-dev
2021-03-24 13:05:34 +00:00
SongFerngWang
b471e2c38c
Set setNetworkSelectionModeManual with AccessNetworkType into RIL/Modem
...
To new the OperatorInfo with the AccessNetworkType parameter.
Bug: 179636444
Bug: 182336960
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=NetworkSelectSettingsTest
Change-Id: If78fde9a22e91ee8b77e2063762166b2137ebbc1
2021-03-24 20:46:04 +08:00
Yanting Yang
c9548fa263
Merge "Rename the screen title of all apps" into sc-dev am: 11ad3be029
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13981626
Change-Id: I65ca45a523f6c6d4461d23925b33bbbfd1e296de
2021-03-24 12:30:31 +00:00
Yanting Yang
11ad3be029
Merge "Rename the screen title of all apps" into sc-dev
2021-03-24 11:42:59 +00:00
Arc Wang
fd8f6c9159
Merge "Fix resource problem in SettingsSliderPreferenceControllerTest" into sc-dev am: 7ed6ce93da
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13981625
Change-Id: I138a8d5dd0479b6d89987c49822f0023b6e67580
2021-03-24 11:32:25 +00:00
Arc Wang
7ed6ce93da
Merge "Fix resource problem in SettingsSliderPreferenceControllerTest" into sc-dev
2021-03-24 11:17:53 +00:00
Jason Chiu
c37dd71260
Settings homepage redesign
...
- Support new suggestion design
- Search bar relayout
- Move avatar icon to the top right corner
Test: robotest
Bug: 178068045
Change-Id: I07f1577488d6d1827ee07d55db6759f02d655d5f
2021-03-24 18:53:27 +08:00
Alex Johnston
ba6ed1e827
Merge "Settings: Disable USB preferences if USB signaling is off" into sc-dev am: 74d2ec5c2d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13901306
Change-Id: I7dee32ff0899087df7654c393421626daca38725
2021-03-24 10:28:51 +00:00
Alex Johnston
74d2ec5c2d
Merge "Settings: Disable USB preferences if USB signaling is off" into sc-dev
2021-03-24 10:13:47 +00:00
Yanting Yang
5cfdd0750e
Rename the screen title of all apps
...
Also update the title of App info entry on Apps page when there is no
recently opened apps.
Bug: 178774987
Test: robotests & visual
Change-Id: I1cd7ffc1a34c9fa65c93d9507bc45dfedc78f549
2021-03-24 17:52:07 +08:00
YUKAI HUNG
4832ecc9c8
Merge "Export methods from BatteryEntry and controller for battery usage" into sc-dev am: 00222cb467
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13975107
Change-Id: Ie5f3ea730ab18cf8973575aca022fa656908c339
2021-03-24 09:45:21 +00:00
Yi-Ling Chuang
dc3abf3e53
Merge "Update category names in Display page" into sc-dev am: ee01f3dd5b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13975108
Change-Id: Icc76ff3eb9cf8ad2f9a54658312e6dbaa3d79519
2021-03-24 09:45:14 +00:00
Weng Su
e583c1aaa9
Merge "[Provider Model] Update fix connectivity icon" into sc-dev am: 95744749e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13975117
Change-Id: Ia440668240b8061239ce10d93e48b688bcde8561
2021-03-24 09:44:57 +00:00
YUKAI HUNG
00222cb467
Merge "Export methods from BatteryEntry and controller for battery usage" into sc-dev
2021-03-24 09:27:32 +00:00
Yi-Ling Chuang
ee01f3dd5b
Merge "Update category names in Display page" into sc-dev
2021-03-24 09:26:22 +00:00
Weng Su
95744749e5
Merge "[Provider Model] Update fix connectivity icon" into sc-dev
2021-03-24 09:22:06 +00:00
Wesley.CW Wang
bb50410e58
Remove Battery Settings page battery saver tips am: 3da3bf7a21
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13946306
Change-Id: Ib139a456ce581d06918d08057ad4f98a8e1d0ff2
2021-03-24 09:09:43 +00:00
Wesley.CW Wang
3da3bf7a21
Remove Battery Settings page battery saver tips
...
- Not present Battery saver tips when it's enabled
- Not redirect Low battery tips to saver tips when saver is enabled
Screenshots:
https://screenshot.googleplex.com/4ehKSRs8gM64wfm.png
https://screenshot.googleplex.com/92pd3q9jnTEXd8o.png
https://screenshot.googleplex.com/BzLYwTjdi3kH4RF.png
https://screenshot.googleplex.com/4w9ubmHaajNxB9b.png
Bug: 183079415
Test: make RunSettingsRoboTests -j40
Change-Id: Ib9783a95df88753342ff217b1a402f2dbb99079d
2021-03-24 08:42:21 +00:00
Arc Wang
2383c6c806
Fix resource problem in SettingsSliderPreferenceControllerTest
...
Somehow Resource IDs are inconsistent between Settings and
SettingsUnitTests. Import SettingsLibTwoTargetPreference to fix.
Bug: 183340630
Test: atest SettingsSliderPreferenceControllerTest
Change-Id: Icc404d8ebefe1399806775272a37c56845406bc7
2021-03-24 16:39:05 +08:00
ykhung
b4b302f936
Export methods from BatteryEntry and controller for battery usage
...
Export a method to fetch BatteryEntry for battery usage new design, and
we have to fetch the label name each time when the new UI is shown to
avoid locale is changed from database records.
Bug: 180607705
Test: make RunSettingsRoboTests
Test: make RunSettingsGoogleRoboTests
Change-Id: Iae8f0b4812beb760b690e622f707fb67388221a2
2021-03-24 07:55:08 +00:00
Weng Su
6800ef3832
[Provider Model] Update fix connectivity icon
...
- Screenshot:
https://screenshot.googleplex.com/8ENoGQxANiAH9uj
Bug: 183576628
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I4da1ca8c474e4c2d88c4bc79aceeac6c69f213ad
2021-03-24 14:58:07 +08:00
Ahaan Ugale
9b183778f2
Merge Autofill settings into Account settings.
...
Autofill settings are removed from Language and Input.
They are now in a new top-level Passwords and Accounts page.
Some polish work is left to match the new design.
Bug: 169455298
Test: manual - check settings page and some search keywords
Test: manual - add work profile and check the above again
Test: make RunSettingsRoboTests
Change-Id: I3981ce73fef63f06a40e61e894481d24284614ba
2021-03-23 23:48:09 -07:00
Zhen Zhang
d64dff2c98
Merge "Update summary based on hibernated apps number" into sc-dev am: 59aa4f9cb1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13955152
Change-Id: I2eaf37a821808a3797d0cf620ad9eeb852c01651
2021-03-24 06:48:01 +00:00
Weng Su
caae56e51b
[automerger skipped] Merge "Hide edit menu if network is uneditable" into rvc-qpr-dev am: 5cb66024fc
am: 0b34d62f6b
-s ours am: 81a7617077
-s ours
...
am skip reason: skip tag Change-Id I47ea2cf19e178eff48f23e56903d0daa4ef8fa28 with SHA-1 b7dbd3a911
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13945393
Change-Id: If1fff33d2a2cd96e0599e2a17957e2ec96994228
2021-03-24 06:44:46 +00:00
Zhen Zhang
59aa4f9cb1
Merge "Update summary based on hibernated apps number" into sc-dev
2021-03-24 06:42:56 +00:00
Weng Su
81a7617077
[automerger skipped] Merge "Hide edit menu if network is uneditable" into rvc-qpr-dev am: 5cb66024fc
am: 0b34d62f6b
-s ours
...
am skip reason: skip tag Change-Id I47ea2cf19e178eff48f23e56903d0daa4ef8fa28 with SHA-1 b7dbd3a911
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13945393
Change-Id: I84ab62558f79fbbd263026177ee3adcc6cb90dfc
2021-03-24 06:09:03 +00:00
Jeremy Goldman
d5e5aaa818
[automerger skipped] Merge "Connect VPN warning help icon with the network & internet page." into sc-dev am: 025301da1f
-s ours
...
am skip reason: skip tag Change-Id I1aa93be5b90b404d9d9cb9bf47ea76fdc9aad401 with SHA-1 7a68eb3b5e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13975106
Change-Id: Ia41af792e568a88464b13a31934f15e0a0c092c5
2021-03-24 05:45:02 +00:00