Minche Li
944e0921be
Merge "Corrects the string for magnification dialog" into sc-dev am: ff6c9e231f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13984246
Change-Id: I391b5b59e767ebcc42475ef9a7998cef2ab2bbe3
2021-03-25 02:35:33 +00:00
Yu-Han Yang
a286bad826
Untab Location Settings and tab Location Services
...
Bug: 180533061
Test: on device
Change-Id: I1f096ffe1028dbf46816bbac5d514e3cb48d9e2c
2021-03-24 19:17:35 -07:00
Minche Li
ff6c9e231f
Merge "Corrects the string for magnification dialog" into sc-dev
2021-03-25 01:52:24 +00:00
Robin Lee
9e5b9d3658
Merge "Move alarms_and_reminders strings to SettingsLib" into sc-dev am: d7b51a7b05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13974286
Change-Id: I848c75edebbafb175a6e48cabef38ebfef6ea6e1
2021-03-25 01:13:56 +00:00
Curtis Belmonte
6aaee7f89f
Add new strings for face auth/enrollment
...
Test: Build and install
Bug: 182806496
Bug: 183649070
Change-Id: I17efa5fee0babcece9c5fb2eb83e8cab4a575f2a
2021-03-24 17:48:01 -07:00
Robin Lee
d7b51a7b05
Merge "Move alarms_and_reminders strings to SettingsLib" into sc-dev
2021-03-25 00:44:37 +00:00
Fan Zhang
a288358343
Button for opening app from Safety settings page
...
Bug: 179063896
Test: Manual
Change-Id: I4cf627d630de277ebea3fe551d6799e5589e1af3
2021-03-24 23:46:49 +00:00
Dmitri Plotnikov
e02d6efe85
Adjust consumed power for SystemBatteryConsumers
...
The implementations of getConsumedPower() now consistently returns
the total power consumed, not the power unattributed to apps.
Bug: 183235836
Test: make RunSettingsRoboTests
Test: make RunSettingsGoogleRoboTests
Change-Id: I9ea1592581b50d1533b00c28c9db4eab1e88edac
2021-03-24 22:28:40 +00:00
Michael Wachenschwanz
11a462deb0
Merge "Add MobileRadio/Gnss MeasuredBatteryConsumpter methods to FakeUid" into sc-dev am: 448dac80de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13959658
Change-Id: I526da2f6997b51902fc53dc6cb8fb2fbd4ea99d1
2021-03-24 20:55:54 +00:00
Kevin Han
d2d32a8dc0
Merge "Fix HibernationSwitchPreferenceControllerTest" into sc-dev am: bad7c091d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13986126
Change-Id: If6b6de316c761e30ffca47a8174bd4a93b563e38
2021-03-24 20:55:30 +00:00
Fan Zhang
4686254012
Merge "Add strings for Safety & Emergency section Bug: 179063896 Test: make Settings" into sc-dev am: c5242cbea9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13975105
Change-Id: Iafd2fd26e3550c839baee12198207b0f0aba9221
2021-03-24 20:54:22 +00:00
Michael Wachenschwanz
448dac80de
Merge "Add MobileRadio/Gnss MeasuredBatteryConsumpter methods to FakeUid" into sc-dev
2021-03-24 20:46:34 +00:00
Kevin Han
bad7c091d6
Merge "Fix HibernationSwitchPreferenceControllerTest" into sc-dev
2021-03-24 20:37:03 +00:00
Fan Zhang
c5242cbea9
Merge "Add strings for Safety & Emergency section Bug: 179063896 Test: make Settings" into sc-dev
2021-03-24 20:36:41 +00:00
Shireesha Bongarala
af15313b34
Add strings for Safety & Emergency section
...
Bug: 179063896
Test: make Settings
Change-Id: Ife43a597fa7262978e705fef96c783f109ff3f16
2021-03-24 20:29:27 +00:00
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
Soonil Nagarkar
2491d63996
Remove dynamic location settings footer
...
Replace with static location settings footer.
Bug: 182210346
Test: manual
Change-Id: If3ab492418e5f3461f7b0123fc771ecdd56db6c9
2021-03-24 12:43:03 -07: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
f8f7876c01
Removed unused import
...
Test: Build
Bug: N/A
Change-Id: Idd87913a67486deaf125b5b5aed89600bfac1982
2021-03-24 11:26:16 -07: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
Zhen Zhang
c86abd9b99
Fix HibernationSwitchPreferenceControllerTest
...
Fix the HibernationSwitchPreferenceControllerTest
Test: this is the test
Bug: 183585589
Change-Id: If97f664596e2724b3435b88ed7f3ea8c3fa4df94
2021-03-24 10:56:30 -07: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
mincheli
78d9b85041
Corrects the string for magnification dialog
...
Corrects one word
Bug: 183368007
Test: none
Change-Id: Ic1babf57ca32617509c5b52463281a00b12c6d75
2021-03-24 22:51:04 +08: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
Weng Su
f50e9c24c1
Correct the defined value of Maximize compatibility
...
- The return value defined by the Wi-Fi framework API is opposite to the
UI
Compatibility on: isBridgedModeOpportunisticShutdownEnabled() = false
Compatibility off: isBridgedModeOpportunisticShutdownEnabled() = true
- Need to use the reverse value from Settings UI to the Wi-Fi framework API.
Bug: 183576049
Test: manual test
atest -c WifiTetherMaximizeCompatibilityPreferenceControllerTest
Change-Id: I731156806661bfbca14e7eaaa648a205a3d77b74
2021-03-24 21:56:57 +08: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