PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,614 Commits 1 Branch 0 Tags
93e48656cfc1bd51f078c763d3902b46b7de3a77
Commit Graph

87614 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
93e48656cf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6df7694b57 -s ours am: aaa1ec13a4 -s ours am: 8501fcf38e -s ours am: 6e4420138f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I79dfff1d76eab2134c0c62ce89c509ec8743e04f
 2021-06-03 20:08:33 +00:00
TreeHugger Robot
8bdcbb84d2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b475f57f13 -s ours am: 1476c1a9e9 -s ours am: 4334f338b2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7ce600ad78b955be95d66ae09bf60d344cf41c79
 2021-06-03 20:08:10 +00:00
TreeHugger Robot
2cec1372ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bba877accb -s ours am: 9ed875897b -s ours am: b241f49bee -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: Iff17025a8864983bbe6216af65f26009309d8c3a
 2021-06-03 20:07:37 +00:00
Bill Yi
6e4420138f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6df7694b57 -s ours am: aaa1ec13a4 -s ours am: 8501fcf38e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I12bf774e282ba690c49acb2669d438b54c9279e7
 2021-06-03 19:53:30 +00:00
TreeHugger Robot
4334f338b2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b475f57f13 -s ours am: 1476c1a9e9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8f75b3090a2e67304b99e77f76ef7421c0a654f8
 2021-06-03 19:53:18 +00:00
TreeHugger Robot
b241f49bee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bba877accb -s ours am: 9ed875897b -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: I370da9ef15cccdaf47db9ad06ff4f5cf287faa0e
 2021-06-03 19:52:53 +00:00
Bill Yi
8501fcf38e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6df7694b57 -s ours am: aaa1ec13a4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic673bb7e89bc500f29bcdd45f64900c177037037
 2021-06-03 19:36:00 +00:00
TreeHugger Robot
1476c1a9e9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b475f57f13 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibd2912a6d73dd89bca96cef80fe65de083fd92e3
 2021-06-03 19:35:34 +00:00
TreeHugger Robot
9ed875897b [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: Ice81a271e5c6f70b86559ac1f174759a8d3d1f0b
 2021-06-03 19:34:38 +00:00
TreeHugger Robot
4a3da4a2f2 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-06-03 19:29:35 +00:00
Bill Yi
aaa1ec13a4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6df7694b57 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id22fcec0a379548a7a8ab597ca60d9cf398a779c
 2021-06-03 19:16:47 +00:00
TreeHugger Robot
b475f57f13 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-03 19:09:39 +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
dd8f1b8365 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-06-03 19:04:58 +00:00
Chloris Kuo
14c48731e6 Merge "Fix flaky NotificationAssistantPreferenceControllerTest" into sc-dev am: 8f5ccfaef0 am: 511a2ceffa am: 1bb421e6e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14810398

Change-Id: I251ce347058eac0d829c09b5c959530f6df33156
 2021-06-03 17:59:09 +00:00
Chloris Kuo
1bb421e6e2 Merge "Fix flaky NotificationAssistantPreferenceControllerTest" into sc-dev am: 8f5ccfaef0 am: 511a2ceffa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14810398

Change-Id: I3feb82139f684ed0c9107102857caeef544b0399
 2021-06-03 17:45:11 +00:00
Chloris Kuo
511a2ceffa 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: I143807946ce9ad4591320aef21ed34b175e08faf
 2021-06-03 17:42:33 +00:00
Abel Tesfaye
f3cb092d6d Merge "Use list+ toggle on devices without face detection" into sc-dev am: 040e5ef894 am: 09ed6e8e29 am: a44ce91272 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14040065

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

Change-Id: Id25985076f0dbb76c2744aa5833a35458046bffa
 2021-06-03 17:19:24 +00:00
Abel Tesfaye
09ed6e8e29 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: Ia50dc8db66f913e916bc43a82ce010d0be0793c7
 2021-06-03 16:52:43 +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
TreeHugger Robot
761dc36e53 Merge "[Settings] Modify the ordering of mobile plan preference." into sc-dev am: 36c45e0ffd am: fb8d1ab61b am: 47f39928ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819338

Change-Id: If3eb1c95f6d85a24044a4c0404da8df0660f4fc6
 2021-06-03 15:08:14 +00:00
Les Lee
e57dc6946c Merge "wifi direct: Close the channel after leaving the Setting page" into sc-dev am: c48cf5ee37 am: 0c4c0e5e33 am: 54ef94eded 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786728

Change-Id: Ifaabf8fe1cefdc7a617a4590fd2aa8f8c3bf969a
 2021-06-03 15:08:06 +00:00
Bill Yi
fd3f0ca4e3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib26a56ed3bcfccc0790194113da3691d499f11b8
 2021-06-03 14:51:55 +00:00
Bill Yi
4f1e0067d9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I126614a40aceddc4dc59f7a34f19a1200a3088ea
 2021-06-03 14:48:08 +00:00
TreeHugger Robot
47f39928ee Merge "[Settings] Modify the ordering of mobile plan preference." into sc-dev am: 36c45e0ffd am: fb8d1ab61b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819338

Change-Id: I2acfc5a8139a708dbd3acb642405bea5214be66b
 2021-06-03 14:45:40 +00:00
Les Lee
54ef94eded Merge "wifi direct: Close the channel after leaving the Setting page" into sc-dev am: c48cf5ee37 am: 0c4c0e5e33 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786728

Change-Id: I352a679b8e247c0215f8c5890f3a99e7fae23de3
 2021-06-03 14:45:24 +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
Bill Yi
11d9d5023f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibd401397fed86b685cc30f9c0b6d5216ae8abd5c
 2021-06-03 14:41:35 +00:00
Bill Yi
6df7694b57 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie80bb50e4314ed1517c9cce073508f00232952bb
 2021-06-03 14:35:21 +00:00
TreeHugger Robot
fb8d1ab61b 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: I08afbbf499563ef1fa818fbf4a10cbc2a951c244
 2021-06-03 14:22:19 +00:00
Les Lee
0c4c0e5e33 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: If754ac8946aa0e6faf3fba705b15b4fe1519c3ae
 2021-06-03 14:22:10 +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
24c377d097 [automerger skipped] Merge "Enable the clear credentials buttons when wifi keys are installed." am: 5f1034bce0 am: 2b98c25bcf -s ours am: 8e34fc722f -s ours am: 394f87fb3d -s ours 
am skip reason: Merged-In I69828b64a7e3c707c27b4582d64ff0ddb863a4ff with SHA-1 fae7509721 is already in history

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

Change-Id: Iac93802bafe3b79c0c9b6be2b362307cd77a6466
 2021-06-03 11:00:27 +00:00
TreeHugger Robot
80086988aa Merge "Fix broken test" into sc-dev am: f8641a4d86 am: 6ee940be8a am: 7076e28e95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809883

Change-Id: Ifee98512336878eb1f315db0d7615ade7c6c4b4b
 2021-06-03 11:00:19 +00:00
Syaoran Kuo
3c845b402a Merge "Adjuest battery saver component test for new logic" into sc-dev am: e4be9a7b62 am: 0278cde7ed am: de68d97f8f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14292665

Change-Id: Ic1757ac4beeac0226058ff0ffe85bd5200cc8c51
 2021-06-03 11:00:01 +00:00
Treehugger Robot
394f87fb3d [automerger skipped] Merge "Enable the clear credentials buttons when wifi keys are installed." am: 5f1034bce0 am: 2b98c25bcf -s ours am: 8e34fc722f -s ours 
am skip reason: Merged-In I69828b64a7e3c707c27b4582d64ff0ddb863a4ff with SHA-1 fae7509721 is already in history

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

Change-Id: I61d0e3fc95ac7609109302c7ca9fa8db6f8347fd
 2021-06-03 10:27:42 +00:00
TreeHugger Robot
7076e28e95 Merge "Fix broken test" into sc-dev am: f8641a4d86 am: 6ee940be8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809883

Change-Id: I297b0cf052903f189788a08e60348b593bccddc4
 2021-06-03 10:27:37 +00:00
Syaoran Kuo
de68d97f8f Merge "Adjuest battery saver component test for new logic" into sc-dev am: e4be9a7b62 am: 0278cde7ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14292665

Change-Id: I605edc87a9e26838bcc13f0fb48a40ac8473be47
 2021-06-03 10:27:18 +00:00
Treehugger Robot
8e34fc722f [automerger skipped] Merge "Enable the clear credentials buttons when wifi keys are installed." am: 5f1034bce0 am: 2b98c25bcf -s ours 
am skip reason: Merged-In I69828b64a7e3c707c27b4582d64ff0ddb863a4ff with SHA-1 fae7509721 is already in history

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

Change-Id: I8979806a6b599663c2eddc500bc9ca518ca16080
 2021-06-03 10:26:13 +00:00
Treehugger Robot
2b98c25bcf Merge "Enable the clear credentials buttons when wifi keys are installed." am: 5f1034bce0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1725994

Change-Id: I7a48bd13efccbb49ebd57ee298b7b71dd5410060
 2021-06-03 10:10:25 +00:00
TreeHugger Robot
6ee940be8a 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: I2196df639936515d02c2543f990494de91db8cee
 2021-06-03 10:02:46 +00:00
Syaoran Kuo
0278cde7ed 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: I231a64099acb408f5ae8e984274bcd8d279b2262
 2021-06-03 10:02:16 +00:00
Treehugger Robot
5f1034bce0 Merge "Enable the clear credentials buttons when wifi keys are installed." 2021-06-03 09:56:49 +00:00
TreeHugger Robot
f8641a4d86 Merge "Fix broken test" into sc-dev 2021-06-03 09:55:08 +00:00
Galia Peycheva
7d2c0454f6 Merge "Use SettingsLib string for blur developer option" into sc-dev am: 33a9f49892 am: 175a8661bd am: 429875ad4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788507

Change-Id: I7fab7b07823a9e4e66c5f1f073a6bde240b1b90c
 2021-06-03 09:47:59 +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