Commit Graph

84932 Commits

Author SHA1 Message Date
Sally Yuen
9a313b52cb Merge "set enabled state of persist switch when Extra Dim state is changed" into sc-dev am: 478b218230 am: b77b7385b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14414318

Change-Id: Ifad9645509eceb365433f6fb91a8afda9beb7443
2021-05-19 21:59:26 +00:00
TreeHugger Robot
1ce65545d0 Merge "Update app usage page footer string" into sc-dev am: 16f8b4c943 am: bccec996c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424447

Change-Id: I1a29c0feaf45f87d4557b077c677ec4609ab4f49
2021-05-19 21:44:10 +00:00
Betty Chang
9bf920f223 Merge "Assign StaticIpConfiguration builder value to global variable" into sc-dev am: 35e244754c am: 26fcdf4745
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419452

Change-Id: Ic7d93eeda0273211401c7a86b6f2b5dca426a540
2021-05-19 21:11:44 +00:00
TreeHugger Robot
8742209c02 Merge "Setting result earlier than onPause" into sc-dev am: c57c351060 am: 0925ba9f24
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14637113

Change-Id: Ida9880e4f0afdc8ac22abc717fc025146ae7d118
2021-05-19 20:49:22 +00:00
TreeHugger Robot
33a02ecb1b Merge "Setting result earlier than onPause" into sc-dev am: c57c351060 am: bd016efe52
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14637113

Change-Id: Iea82919144c670f7d5d6024ead8f4c8a6fc0372c
2021-05-19 20:46:57 +00:00
TreeHugger Robot
bd016efe52 Merge "Setting result earlier than onPause" into sc-dev am: c57c351060
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14637113

Change-Id: I56777a5df9c5af025e5298c0c73d0ed151c31c37
2021-05-19 20:31:16 +00:00
TreeHugger Robot
0925ba9f24 Merge "Setting result earlier than onPause" into sc-dev am: c57c351060
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14637113

Change-Id: I81795d747ae1256aba6526c7a681186fdf551072
2021-05-19 20:28:49 +00:00
TreeHugger Robot
c57c351060 Merge "Setting result earlier than onPause" into sc-dev 2021-05-19 20:11:09 +00:00
TreeHugger Robot
d5131e7aa9 Merge "Remove the Summary of Backup in System Settings" into sc-dev am: 31a697eb79 am: 722ac92514
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410004

Change-Id: Id7c5546a71616e6885233445b0ea875764c63509
2021-05-19 20:08:23 +00:00
Jeremy Goldman
ed7bbfed0a Merge "If the CarrierConfigManager is still null, return that the preference is not available." into sc-dev am: d6913243a1 am: d41def87bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409956

Change-Id: I672e3cdd40d099b950d66e52b4781056f6c3379f
2021-05-19 19:09:08 +00:00
Menghan Li
784cbe08f1 Merge "[Material Next] Typography for font style" into sc-dev am: 4ec4cf32f1 am: f47694d4c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409968

Change-Id: I884d411b843d738370a9b8868bb7cd159a75d6e1
2021-05-19 17:32:47 +00:00
Jack Yu
8ebb08b699 Merge "API Review: Rename CAPABILITY_ALLOWED_NETWORK_TYPES_USED" into sc-dev am: 3616520985 am: 9c60e581e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554359

Change-Id: I4d65366285eb9aa38e83ddf26edd681b77920d3e
2021-05-19 17:06:52 +00:00
Jack Yu
2b2a1f8894 Merge "API Review: Rename CAPABILITY_ALLOWED_NETWORK_TYPES_USED" into sc-dev am: 3616520985 am: a67151ad2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554359

Change-Id: Ia7c13617cbc5d429737a4bbb07e34d0b3c76e92f
2021-05-19 16:50:07 +00:00
Jack Yu
9c60e581e8 Merge "API Review: Rename CAPABILITY_ALLOWED_NETWORK_TYPES_USED" into sc-dev am: 3616520985
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554359

Change-Id: Id6cec29f31d94a378bd78c630b5a7d571bba64c7
2021-05-19 16:47:43 +00:00
Jack Yu
a67151ad2f Merge "API Review: Rename CAPABILITY_ALLOWED_NETWORK_TYPES_USED" into sc-dev am: 3616520985
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554359

Change-Id: I10842db389af23abb685d1e0d4bca799bae48e6f
2021-05-19 16:26:54 +00:00
Jack Yu
3616520985 Merge "API Review: Rename CAPABILITY_ALLOWED_NETWORK_TYPES_USED" into sc-dev 2021-05-19 16:26:18 +00:00
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
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