Commit Graph

85070 Commits

Author SHA1 Message Date
Jason Chang
ecb58cbbc5 (2/n) Stop user from enabling OHM setting if user is using 3-button
mode

Return One-Handed mode getAvailabilityStatus to UNSUPPORTED_ON_DEVICE
when SystemNavigationMode is 3-button.

Bug: 184903678

Test: manual
Test: manual verified on Settings > System > Gesture page
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures
      .OneHandedEnablePreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures
      .SwipeBottomToNotificationPreferenceControllerTest"
Change-Id: I454dabb5cc267d544732fa5079f3146154d0568c
2021-05-20 00:25:26 +08:00
YUKAI HUNG
737e6d449d Merge "Rename variables and refine the format style from ag/14346184" into sc-dev am: 37d6d0835c am: ff80cd7dd4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419441

Change-Id: I9a9310bc3face17fa2e94ee3b3a594361fb44846
2021-05-19 15:58:03 +00:00
Bill Yi
2f6785dfd6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe0e09fdb4 -s ours am: d92ec7a9cc -s ours am: 7c02bd8602 -s ours am: 3808659f80 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14416157

Change-Id: Ia0f604fc7ae560c1ac176331c0233204bbdd47c8
2021-05-19 15:25:17 +00:00
Bill Yi
c1ebacd82e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c73e6bf08d -s ours am: d7caf65594 -s ours am: 383a5aa78e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14415146

Change-Id: I5ae1e2bd9ee1ce3998dae69bfe5555b22d9bb29f
2021-05-19 14:32:57 +00:00
Antoan Angelov
5eabf5464f Merge "Update ActionDisabledByAdminDialogHelper" into sc-dev am: eb45fd3f2a am: 57d52482cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441130

Change-Id: I872babca5324d9a9ac1cf9db6392a12fcf4ebfb7
2021-05-19 14:32:43 +00:00
Antoan Angelov
3bd2b1cae2 Merge "Update ActionDisabledByAdminDialogHelper" into sc-dev am: eb45fd3f2a am: 8019ba0d5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441130

Change-Id: I52b3d1cd995eefab222e447072f13eb3571250e8
2021-05-19 14:30:50 +00:00
Antoan Angelov
8019ba0d5b Merge "Update ActionDisabledByAdminDialogHelper" into sc-dev am: eb45fd3f2a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441130

Change-Id: Ie1a010c2ca3b2d07108b3a21251bb0554212f9b4
2021-05-19 14:06:58 +00:00
Antoan Angelov
57d52482cc Merge "Update ActionDisabledByAdminDialogHelper" into sc-dev am: eb45fd3f2a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441130

Change-Id: I1d2ca81504f78e98d2f27d34ca8b037ffc433719
2021-05-19 14:05:09 +00:00
Antoan Angelov
eb45fd3f2a Merge "Update ActionDisabledByAdminDialogHelper" into sc-dev 2021-05-19 13:50:06 +00:00
ykhung
587a8f9800 Add metric for new battery relative functions for S (1/2) am: a3d3c22a27 am: 98aafd8500
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622866

Change-Id: If2b61e48c16f0671b66ce0b8a7c884680130e1cc
2021-05-19 12:59:11 +00:00
ykhung
4ae06f8823 Add metric for new battery relative functions for S (1/2) am: a3d3c22a27 am: ae66f84815
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622866

Change-Id: I4c37546aad5a789451ed45ff58737198687cc6b8
2021-05-19 12:57:33 +00:00
TreeHugger Robot
8ae1bc7d9c Merge "Fix unable to send file via OPP" into sc-dev am: 5ef4fa037e am: 0151b0a8f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327016

Change-Id: I9fff2a7b451c40443b74165ec937c6240812adeb
2021-05-19 12:42:36 +00:00
ykhung
ae66f84815 Add metric for new battery relative functions for S (1/2) am: a3d3c22a27
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622866

Change-Id: Ia26c6fe38d5948c9c46b4a47ec261b6b900797ea
2021-05-19 12:40:19 +00:00
ykhung
98aafd8500 Add metric for new battery relative functions for S (1/2) am: a3d3c22a27
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622866

Change-Id: I81540aec054edadc9d34c6f46337c398a3bb11ba
2021-05-19 12:36:22 +00:00
ykhung
a3d3c22a27 Add metric for new battery relative functions for S (1/2)
Reference the table from PM requested:
https://docs.google.com/spreadsheets/d/1TC_6MLVMvOS0p1ic0wPfQ-19AOuY8Kc8FUJdqaQSM4I/edit?ts=6098b296#gid=0

Bug: 188505537
Test: make SettingsRoboTests
Change-Id: I2a4df9ab900cbeaf9885bb2dbc21ea848920bc81
2021-05-19 12:22:20 +00:00
TreeHugger Robot
09c04410cc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 8d0376c98c -s ours am: 0b99020b5a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14416159

Change-Id: Ief2ea4249c89a9cbf17a702576f0b9cfc30bea60
2021-05-19 11:19:57 +00:00
TreeHugger Robot
b6859223b0 Merge "Remove Advanced item in Language & input Settings." into sc-dev am: f2ec0fbf83 am: dbe3c72bb6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410006

Change-Id: Ie5139f823f78bf147edb8770266c823be061dae3
2021-05-19 11:13:33 +00:00
Kevin Chyn
b3f9271fa9 Merge "Cancel enrollment when back or negative buttons pressed" into sc-dev am: 08b7833120 am: c60fcecf32
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14414017

Change-Id: Ie3b5db627f3598ece2ac21cf8f9ab5c829109acc
2021-05-19 10:36:28 +00:00
menghanli
0afc2de85e Fix glifLayout is not align the preference in SuW
Bug: 186076332
Test: Run initBCTestEnv_S.sh and switch to RTL and LTR language to
check layout
Change-Id: I5f22b8853d036f22a2e66a6144660950c268d89b
2021-05-19 09:23:14 +00:00
bsears
f17a812842 Merge "Revert "Fixes 'no ripple effect' issue for screen attention setting"" into sc-dev am: deb2acc9b3 am: 15b21dfed4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410366

Change-Id: Ib3f4d3bad60cb72c1c6407e0bdfc1f4e01823a8b
2021-05-19 09:20:30 +00:00
Weng Su
99d8fcfae2 [Provider model] Revise the Internet Panel title sub-text
- Display "Tap a network to connect" on sub-title when Wi-Fi networks is
not empty

- Screenshot:
  https://screenshot.googleplex.com/5TzpJDLghpCQnDP

Bug: 188594439
Test: manual test
atest -c InternetConnectivityPanelTest

Change-Id: I0e3f0eb269fb4fe040a62be9ee84105879af82f7
2021-05-19 15:35:41 +08:00
Jason Chiu
817fb55032 Merge "Fix NullPointerException at VolumeSliceHelper" into sc-dev am: 9f24967458
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622863

Change-Id: Idbe15167ca0f5dafe886af8b7fca6a8d49a960e5
2021-05-19 07:21:20 +00:00
Jason Chiu
9f24967458 Merge "Fix NullPointerException at VolumeSliceHelper" into sc-dev 2021-05-19 07:03:17 +00:00
Yi Jiang
f1a04d7284 Merge "Fixes ScreenTimeoutSettingsTest" into sc-dev am: 07532443ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14629551

Change-Id: I0d1a3aeb5fc2494af81dec11f9b50395e2b5dd57
2021-05-19 06:50:59 +00:00
Peiyong Lin
4e4a7f0dbd Merge "Add Game settings support." into sc-dev am: d32d11248e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14553339

Change-Id: Id122a4cd8356f8ee735df146a1631238e81178c5
2021-05-19 06:49:45 +00:00
Yi Jiang
07532443ca Merge "Fixes ScreenTimeoutSettingsTest" into sc-dev 2021-05-19 06:10:03 +00:00
Peiyong Lin
d32d11248e Merge "Add Game settings support." into sc-dev 2021-05-19 05:42:14 +00:00
Jason Chiu
728081f9bb Fix NullPointerException at VolumeSliceHelper
Race condition happens on accessing a map while system is destroying it.

Test: manual, robotest
Fixes: 188114877
Change-Id: I245121b95d1d4db02e3107a47c6d3ae13a5d32e5
2021-05-19 13:19:55 +08:00
Suprabh Shukla
63fd87a13a Setting result earlier than onPause
Setting the result in onPause is too late for delivering it to the
requesting activity. Changing to setting the result any time the
uncommitted state is written. The state will still be committed in
onPause only.

Test: Manually with a test app using startActivityForResult.

Bug: 188477366
Change-Id: I676c99e7d2a64b644cef60ecd14728d4d49180c3
2021-05-18 22:13:47 -07:00
Weng Su
eccb787bbb Merge "Introduce new Disconnect functionality for Wifi networks in Internet Panel only" into sc-dev am: 3d904eba71
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622856

Change-Id: I94d660df34cf3873eab89b7cf2f7ff28b8f6ade3
2021-05-19 04:35:36 +00:00
Weng Su
46d3fc525e Merge "Improve discoverability of the intent & actions progress" into sc-dev am: ca5f4e4952
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622857

Change-Id: Ibe3c2cbce2440578dceb8b67f09feae66d07d2ae
2021-05-19 04:34:01 +00:00
Weng Su
3d904eba71 Merge "Introduce new Disconnect functionality for Wifi networks in Internet Panel only" into sc-dev 2021-05-19 03:48:24 +00:00
Weng Su
ca5f4e4952 Merge "Improve discoverability of the intent & actions progress" into sc-dev 2021-05-19 03:48:16 +00:00
TreeHugger Robot
08e146982b Merge "Apply color extraction for Fingerprint enrollment" into sc-dev am: bac284a622
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622855

Change-Id: Ia9107de5e771eac1e7862e7ca600816bdae57e12
2021-05-19 03:41:00 +00:00
TreeHugger Robot
80c3d12ff9 Merge "Visual update for FaceSettings" into sc-dev am: 2a7e608ef2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14551407

Change-Id: Iab74ccda074e474d65f70c9b3ace8105d4abee8e
2021-05-19 03:40:54 +00:00
TreeHugger Robot
aaf4959555 Merge "Fix the text contrast for biometric header" into sc-dev am: a07eb69948
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14605930

Change-Id: I633edb6a3dc4a92143d6d4fe28ac023d9f116ee9
2021-05-19 03:40:49 +00:00
TreeHugger Robot
d3f0fc54a7 Merge "Update the layout of Pattern/PIN/Password confirmation" into sc-dev am: 6d550713dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554361

Change-Id: I7b44bb1cf9e244e063b13ce5fbc8c83b391665aa
2021-05-19 03:40:38 +00:00
TreeHugger Robot
7bb6afbfd1 Merge "Tweak the layout for Pattern/PIN/Password enrollment" into sc-dev am: 4a67b1c099
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554357

Change-Id: Ic60fa99f77c21aef31aa570ace8cbbd5a38394b2
2021-05-19 03:39:58 +00:00
TreeHugger Robot
bac284a622 Merge "Apply color extraction for Fingerprint enrollment" into sc-dev 2021-05-19 03:19:56 +00:00
TreeHugger Robot
2a7e608ef2 Merge "Visual update for FaceSettings" into sc-dev 2021-05-19 03:19:07 +00:00
TreeHugger Robot
a07eb69948 Merge "Fix the text contrast for biometric header" into sc-dev 2021-05-19 03:17:48 +00:00
TreeHugger Robot
6d550713dd Merge "Update the layout of Pattern/PIN/Password confirmation" into sc-dev 2021-05-19 03:16:47 +00:00
TreeHugger Robot
4a67b1c099 Merge "Tweak the layout for Pattern/PIN/Password enrollment" into sc-dev 2021-05-19 03:15:28 +00:00
Dmitri Plotnikov
6deeadc714 Merge "Replace uses of SystemBatteryConsumer with aggregate BatteryConsumers" into sc-dev am: 501eea7fa2 am: 6acbd70713 am: c2515e9c20
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14346184

Change-Id: I8471bb1aff886e76277cd90bb5230776dc981438
2021-05-19 03:05:41 +00:00
TreeHugger Robot
835f507f07 Merge "Storage Settings Apps category shows image/video/audio APPs" into sc-dev am: 8d1fd73e89 am: e0e26649fb am: fbb3409f9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14186629

Change-Id: I0937561c24bc3e1779890b3760c50b8c3d89d69d
2021-05-19 02:58:42 +00:00
TreeHugger Robot
d2f8bd093e Merge "Update apps icon in Sound > Media page to correct size." into sc-dev am: 80daf4fc49 am: 07427eeeb3 am: c38bda35bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410003

Change-Id: I16c0c14a0aec25d5133dead35d9efe9b0db5744c
2021-05-19 02:58:29 +00:00
Yichi Chen
837ff92cd9 Merge "RefreshRatePrefCtr: Correct the check of peak refresh rate" into sc-dev am: ffbea30a18 am: 97efa6eed4 am: 3c5b65fb20
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352150

Change-Id: If6dadccf0a8a8f9a4710eee0fa8e8e8abe8a1b2f
2021-05-19 02:58:21 +00:00
TreeHugger Robot
c3b453e52c Merge "Remove reserved icon space for Safety > Wireless emergency alerts" into sc-dev am: 001dcc9e93 am: 21f81feb86 am: f7191fd0a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409961

Change-Id: I9b4871c0fb436953504be29fad1f4f9068f970c3
2021-05-19 02:58:12 +00:00
YUKAI HUNG
74d44526fd Merge "Add new field for data interpolation usage" into sc-dev am: f988790908 am: 29cc5c19a0 am: 51650d3e59
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409677

Change-Id: I8a129d5170165ffc69e5da29256ff633841ab003
2021-05-19 01:44:33 +00:00
Ryan Lin
f03ec080d9 Merge "Move Magnification Mode Settings to the main page" into sc-dev am: 194015b774 am: 9d46a4fec6 am: ddc3ecb071
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327003

Change-Id: Iee4052001ff4e338a279adb4fb6f803f715bf1f3
2021-05-19 01:44:25 +00:00