PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,367 Commits 1 Branch 0 Tags
03571296d4d17e4bcdc5873cfac92c224f50ab6c
Commit Graph

82367 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
03571296d4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bba877accb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9999c2060159c0373b3fe50e922e19326b76157a
 2021-06-03 19:36:36 +00:00
TreeHugger Robot
bba877accb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-03 19:07:07 +00:00
TreeHugger Robot
5753862c9e Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-03 18:51:21 +00:00
TreeHugger Robot
f189c24095 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-03 18:49:21 +00:00
Chloris Kuo
c2a0a1c3ae Merge "Fix flaky NotificationAssistantPreferenceControllerTest" into sc-dev am: 8f5ccfaef0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14810398

Change-Id: Id6966bb3aa9ba661dc6241bf34199b3524126c58
 2021-06-03 17:36:55 +00:00
Chloris Kuo
8f5ccfaef0 Merge "Fix flaky NotificationAssistantPreferenceControllerTest" into sc-dev 2021-06-03 17:29:59 +00:00
Abel Tesfaye
084d9f864b Merge "Use list+ toggle on devices without face detection" into sc-dev am: 040e5ef894 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14040065

Change-Id: I99312fa02d58f7aff05b38c8d804635e814c2f85
 2021-06-03 16:56:50 +00:00
Abel Tesfaye
040e5ef894 Merge "Use list+ toggle on devices without face detection" into sc-dev 2021-06-03 16:40:58 +00:00
Bill Yi
63d431cc10 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1966dd5e76cefd8e8f0677baed1f126e0e6eb2af
 2021-06-03 14:55:46 +00:00
Bill Yi
6dece1ee8e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I57219c7709c527cc09d1289a9b15f10ca93b1bea
 2021-06-03 14:44:41 +00:00
Bill Yi
6fbb03b185 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I74332e7a4c547a586f7a8a18fff4576de67a0c5a
 2021-06-03 14:43:05 +00:00
TreeHugger Robot
d4d5f05a99 Merge "[Settings] Modify the ordering of mobile plan preference." into sc-dev am: 36c45e0ffd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819338

Change-Id: I59fb897332b5cd4a4654208c42a01a38f94ef698
 2021-06-03 14:24:18 +00:00
Les Lee
44149f10c9 Merge "wifi direct: Close the channel after leaving the Setting page" into sc-dev am: c48cf5ee37 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786728

Change-Id: Ic42db18cbc727089259f13729c2d0553fcc8b7cb
 2021-06-03 14:23:28 +00:00
TreeHugger Robot
36c45e0ffd Merge "[Settings] Modify the ordering of mobile plan preference." into sc-dev 2021-06-03 14:09:08 +00:00
Les Lee
c48cf5ee37 Merge "wifi direct: Close the channel after leaving the Setting page" into sc-dev 2021-06-03 14:08:51 +00:00
Zoey Chen
3251ab68f9 [Settings] Modify the ordering of mobile plan preference. 
Bug: 189409514
Test: make
Change-Id: I76a04b9c38ead0e3b9a2a4a21b50660caa15632b
 2021-06-03 20:02:01 +08:00
TreeHugger Robot
2d68db1cef Merge "Fix broken test" into sc-dev am: f8641a4d86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809883

Change-Id: I2c3f66b65295549d17a8993f92903660eee2671e
 2021-06-03 10:04:33 +00:00
Syaoran Kuo
40f15073b0 Merge "Adjuest battery saver component test for new logic" into sc-dev am: e4be9a7b62 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14292665

Change-Id: Iaa5b48938ada0766d31ea9f5b9952ef7e2ffbca6
 2021-06-03 10:04:15 +00:00
TreeHugger Robot
f8641a4d86 Merge "Fix broken test" into sc-dev 2021-06-03 09:55:08 +00:00
Syaoran Kuo
e4be9a7b62 Merge "Adjuest battery saver component test for new logic" into sc-dev 2021-06-03 09:42:43 +00:00
Galia Peycheva
ce064482cd Merge "Use SettingsLib string for blur developer option" into sc-dev am: 33a9f49892 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788507

Change-Id: I03bbc5361392321d43c7d6eb1873df384a29d8ad
 2021-06-03 09:32:06 +00:00
Galia Peycheva
33a9f49892 Merge "Use SettingsLib string for blur developer option" into sc-dev 2021-06-03 09:12:36 +00:00
YUKAI HUNG
83d97a9e1c Merge "Remove missed added testing locale to cause flaky" into sc-dev am: fa476aef12 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809876

Change-Id: I23bc6382dbe300689347f6397411e04b15e9dee9
 2021-06-03 08:21:00 +00:00
Tsung-Mao Fang
0b9ce16c13 Fix broken test 
Fix: 190017630
Test: robo test
Change-Id: I46978a3f3d3d564cd9fcabad47edf6907d4e4966
 2021-06-03 16:10:36 +08:00
YUKAI HUNG
fa476aef12 Merge "Remove missed added testing locale to cause flaky" into sc-dev 2021-06-03 07:50:55 +00:00
Betty Chang
1da8b1909d Merge "[GAR] Set the correct color and style to panel UI" into sc-dev am: 5b23f3b923 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800153

Change-Id: I6936974270bd665aa01d5b563f4312605842a725
 2021-06-03 07:39:20 +00:00
Betty Chang
8689d3ebc1 Merge "Remove Connect to public network for Network Rating Provider" into sc-dev am: f4fafb97ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809873

Change-Id: I675fa7fc41dd061792bd4133a99b487b9dc516eb
 2021-06-03 07:39:02 +00:00
tim peng
16394b6681 Merge "Remove flake error for AdvancedBluetoothDetailsHeaderControllerTest" into sc-dev am: 032b2b20bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782146

Change-Id: Ic5777b461d45a9ba9f35e613cc319adc706e1720
 2021-06-03 07:38:44 +00:00
TreeHugger Robot
56a94afcb0 Merge "Fix overlapping problem on running services page" into sc-dev am: 28128df960 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800150

Change-Id: I2e4f112d3d1a4ef5fde0610079234544a3cacc58
 2021-06-03 07:37:56 +00:00
Yanting Yang
f52d2b66b8 Merge "Deprecate silky flag for official release" into sc-dev am: 09666f9ef4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800152

Change-Id: I98cff1d6d9cc03e0a33c066e3683771532994b69
 2021-06-03 07:33:39 +00:00
Kunhung Li
bebc5063d2 Merge "Refine wallpaper search keywords" into sc-dev am: a19c7053a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758322

Change-Id: I277dbe3339dee202925b2e055bcfd57e660b89d6
 2021-06-03 07:31:46 +00:00
Les Lee
5294e3f9ab wifi direct: Close the channel after leaving the Setting page 
Bug: 188375791
Bug: 184504089
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2pSettingsTest
Change-Id: I4eff0472fd3cb12e006b5e85f5cdb6b979c93fe5
 2021-06-03 15:31:28 +08:00
Jason Chiu
f979426151 Merge "Revise homepage colors" into sc-dev am: 132cc2127b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797776

Change-Id: Iaa68b01d4b50767dab1052d1573ccf79e86e7573
 2021-06-03 07:30:44 +00:00
TreeHugger Robot
dbdb22e423 Merge "Fix failing test in InteractAcrossProfilesSettingsTest" into sc-dev am: 7e0fb6878d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801130

Change-Id: Ic9aebb02b7a065f6d9f9f0d1e322d17fc2305d97
 2021-06-03 07:29:09 +00:00
Betty Chang
6b419f1075 Merge "[GAR] Set the color to cycle left time to pass the GAR" into sc-dev am: 227f9357ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786144

Change-Id: Ib5a59b4e9581d40f4103eb5c13a30a108797fbde
 2021-06-03 07:29:03 +00:00
Bonian Chen
9ba43f8f75 Merge "[Settings] Connected carrier should not be forbidden ones" into sc-dev am: b71dd1efd2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788603

Change-Id: I4fa26931ada47afd369a87543189add362987493
 2021-06-03 07:28:58 +00:00
Kevin Chyn
7ffcc2a517 Merge "Fix array out of bounds in BiometricEnrollActivity" into sc-dev am: ef963fe079 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801930

Change-Id: Ia45a95eb7b5e30173b21915149e959979f68599b
 2021-06-03 07:28:53 +00:00
Trevor Black
9c5eb35143 Merge "Remove extra app info setting under specific condition" into sc-dev am: 6c0a701540 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788858

Change-Id: I657d34ebebf3ce89c568f4afed2166d58ee5d339
 2021-06-03 07:28:38 +00:00
Curtis Belmonte
45c393cad5 Merge "Align assets and colors for biometric enroll intros" into sc-dev am: 70dfd5332f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14795268

Change-Id: Ic834876f7a9ce6e467d33acd5d526231053ac910
 2021-06-03 07:21:52 +00:00
Betty Chang
5b23f3b923 Merge "[GAR] Set the correct color and style to panel UI" into sc-dev 2021-06-03 07:21:17 +00:00
Betty Chang
f4fafb97ff Merge "Remove Connect to public network for Network Rating Provider" into sc-dev 2021-06-03 07:21:04 +00:00
tim peng
032b2b20bc Merge "Remove flake error for AdvancedBluetoothDetailsHeaderControllerTest" into sc-dev 2021-06-03 07:03:37 +00:00
Janis Danisevskis
9ab6d471b4 Merge "Enable the clear credentials buttons when wifi keys are installed." into sc-dev am: 04fdd614b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14791340

Change-Id: I5ded2cf19aa5235f5e411b330188db24750b71d9
 2021-06-03 06:45:40 +00:00
TreeHugger Robot
30d79bd7e5 Merge "Remove silky flag from misc files" into sc-dev am: 55b577dff8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797782

Change-Id: Iba8077e38aafe0d0254e1306c1770006407db767
 2021-06-03 06:45:33 +00:00
TreeHugger Robot
83e7e42f25 Merge "Remove silky flag for searching and help menu" into sc-dev am: ea2b64a92d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797777

Change-Id: I17da7d979ed50493b6e6de574e72716746a72df7
 2021-06-03 06:45:27 +00:00
TreeHugger Robot
f3125b7d99 Merge "Fix slider RTL problem" into sc-dev am: 7bebe57631 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788607

Change-Id: I008a18d9e183099fe1fe41fcc4fc9484f89a500f
 2021-06-03 06:45:22 +00:00
TreeHugger Robot
9ba96e3d30 Merge "Fix voice access problem on location page." into sc-dev am: 89fbeb6407 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782145

Change-Id: Iaac39f73a0ff5fa7c9f3e55a8f25302d9059b25e
 2021-06-03 06:45:16 +00:00
TreeHugger Robot
d38e7e2568 Merge "Update battery defender tip subtext" into sc-dev am: 2702e5ce80 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788605

Change-Id: I3aa67149060a4715c5b7535017fe8d7c2be3f60b
 2021-06-03 06:45:10 +00:00
Stanley Wang
090c1db54b Merge "SettingsMainSwitchPreference should display the restricted icon if it is restricted." into sc-dev am: b4b35a8c38 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758319

Change-Id: I58e5b740f9f0d09081b6fcbaba6285988bdedece
 2021-06-03 06:44:50 +00:00
TreeHugger Robot
3da51e2fa1 Merge "Remove the face unlock category" into sc-dev am: 3af33cd3fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732241

Change-Id: Idb13354016ee0ad9598f62fffd6370e8da55d513
 2021-06-03 06:41:46 +00:00