PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,158 Commits 1 Branch 0 Tags
53adf04f1f3e005b722a2d594e91c7789792e3cc
Commit Graph

88158 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
0f95249651 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-07 04:42:56 +00:00
TreeHugger Robot
ca0bd9611c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 37e8f3f696 -s ours am: ee2d493495 -s ours am: a2da3b7769 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibb75ca12e029d824a2085340d786ff740a63c73c
 2021-06-07 04:40:00 +00:00
Bill Yi
d29748d440 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 79ef9e3fc8 -s ours am: fc601649d9 -s ours am: 328b6b1133 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifeb819bf008eb34f7cfaeecfc52aa7292cb2a900
 2021-06-07 04:38:56 +00:00
TreeHugger Robot
8a873dc187 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 23e3a2b7f2 -s ours am: 7221374cb4 -s ours am: da1f092ff6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia93efeb0275cd81f68859babedb1eee1b7a1c583
 2021-06-07 04:37:04 +00:00
TreeHugger Robot
f10272ddc4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-07 04:35:59 +00:00
Bill Yi
9f16faf79b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6df7694b57 -s ours am: aaa1ec13a4 -s ours am: 01e5331975 -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: I2e8f0732f7baa8f353cfe19dcb3b082c543f7d83
 2021-06-07 04:27:50 +00:00
TreeHugger Robot
cc1a18cd04 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b475f57f13 -s ours am: 74aef75430 -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: I26039db8509fa3311bb3802b451ff3bbcc595050
 2021-06-07 04:14:08 +00:00
TreeHugger Robot
134ac21dbc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bba877accb -s ours am: 73998bce49 -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: I5fb46fcab37cdc9fdb59e971f61eaef75a5f4eaf
 2021-06-07 04:09:53 +00:00
Bill Yi
d1c2769b54 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib08bd8483d4ae26f48b03aadf242055da9b6bad9
 2021-06-07 03:51:05 +00:00
Bill Yi
ad2c686b48 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0ce668c4a4c8f7f14cd0173645350fd3318163c9
 2021-06-07 03:47:17 +00:00
Bill Yi
992779a314 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Icc1570ae783b997b29745659bf593fd648b1959a
 2021-06-07 03:43:26 +00:00
Bill Yi
efffd6f45b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I18003e4dadc5ac398986ed0fe72cb5824c4e2097
 2021-06-07 03:40:02 +00:00
Bill Yi
a4bf78bdd9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ife555b09b530f7960547bdf0e715819f42fd2e3f
 2021-06-07 03:38:35 +00:00
Bill Yi
86eb42fb68 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I708fb20bc730db9951edde212e2b9bea92a66d75
 2021-06-07 03:37:05 +00:00
Bill Yi
bb3b29aa23 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If7d61282d38d4d53fd15c2a5d2d9b72777cd8375
 2021-06-07 03:34:10 +00:00
Chloris Kuo
c320e83be2 Merge "Fix flaky NotificationAssistantPreferenceControllerTest" into sc-dev am: 8f5ccfaef0 am: 8606095ff5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14810398

Change-Id: I990207422b779484b2f5628fc9bff4d7a10c2b67
 2021-06-07 03:33:19 +00:00
Abel Tesfaye
9421f2caff Merge "Use list+ toggle on devices without face detection" into sc-dev am: 040e5ef894 am: 02a218deee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14040065

Change-Id: I7a161fd1291df9b2e62c978e4cbbef8d5f98b689
 2021-06-07 03:33:07 +00:00
Automerger Merge Worker
ff03eb5cc3 Merge "Merge "[Settings] Modify the ordering of mobile plan preference." into sc-dev am: 36c45e0ffd am: 06f88f8368" 2021-06-07 03:33:04 +00:00
TreeHugger Robot
4291115385 Merge "[Settings] Modify the ordering of mobile plan preference." into sc-dev am: 36c45e0ffd am: 06f88f8368 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819338

Change-Id: I7ed73c31d72045c850ff7e459b4b4f2d74096ab9
 2021-06-07 03:33:02 +00:00
Les Lee
02ac2cf45a Merge "Usage Settings: Fix NPE when subscriberId is Null." into sc-dev am: 787685b2cc am: dedd647b97 am: 65d2157b6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847052

Change-Id: I9529f46f86d052ec8d251c9b519ae6635beb4022
 2021-06-07 03:32:59 +00:00
TreeHugger Robot
ff82d66e31 Merge "Add key for StorageDashboardFragment" into sc-dev am: b734aa3f7f am: 297c48d04d am: 21fcecc514 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14841816

Change-Id: Ib6c7d8a17b256f014dea44da1b115663a83c7c13
 2021-06-07 03:32:54 +00:00
Les Lee
5ca4b0347c Merge "Usage Settings: Fix NPE when subscriberId is Null." into sc-dev am: 787685b2cc am: d0745b39b6 am: ef9b85ed44 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847052

Change-Id: I769511cd350cccbedf38be2f2ac5d5f5d3ab059d
 2021-06-07 03:32:49 +00:00
TreeHugger Robot
9b813bee31 Merge "Add key for StorageDashboardFragment" into sc-dev am: b734aa3f7f am: cb0a247abf am: a75a39701c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14841816

Change-Id: I2e239eed7eaa95c73a4591f9f9ebdeecd49394d1
 2021-06-07 03:32:42 +00:00
Bill Yi
d5ad833f15 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia726dc7609d52ae736e34e5a3a5ef35f0f5104a0
 2021-06-07 03:30:43 +00:00
Les Lee
969c8f317f Merge "wifi direct: Close the channel after leaving the Setting page" into sc-dev am: c48cf5ee37 am: fe09f24058 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786728

Change-Id: I0252b8dc0a948bd9f0d3a1e06c75090cdd6d9d9e
 2021-06-07 03:29:11 +00:00
TreeHugger Robot
673e9b716b Merge "Fix broken test" into sc-dev am: f8641a4d86 am: 2a87d48741 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809883

Change-Id: I58ed889b40199b3e85e48f5eeeeed6adf6f616cb
 2021-06-07 03:29:05 +00:00
Syaoran Kuo
a6111479f7 Merge "Adjuest battery saver component test for new logic" into sc-dev am: e4be9a7b62 am: d6d1e6946c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14292665

Change-Id: Ibbdbaef17b269237816225c2bb5139f2164b36f6
 2021-06-07 03:28:58 +00:00
Bill Yi
d132c6a8a3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I388b68cdaf49c96b272e25d64434dc575cb717c6
 2021-06-07 03:26:32 +00:00
Bill Yi
509a162ad5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7d3900e4010febbecd776f59089d71ae01456432
 2021-06-07 03:22:51 +00:00
Bill Yi
9c88dc614f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I11980069f072d9032b0ce1c2604f9a6d70910156
 2021-06-07 03:19:35 +00:00
Bill Yi
3dbdb383ad Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4ce0771c0f32c3419e9eba1271d11111106bfcde
 2021-06-07 03:18:04 +00:00
Les Lee
65d2157b6f Merge "Usage Settings: Fix NPE when subscriberId is Null." into sc-dev am: 787685b2cc am: dedd647b97 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847052

Change-Id: Ie7c5d9fed74f993b6a11865c21a798abe9be85f4
 2021-06-07 03:17:17 +00:00
TreeHugger Robot
21fcecc514 Merge "Add key for StorageDashboardFragment" into sc-dev am: b734aa3f7f am: 297c48d04d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14841816

Change-Id: I869f54528b81aad89de54ff0c01f19d5551b2865
 2021-06-07 03:17:11 +00:00
Galia Peycheva
66b01a9a99 Merge "Use SettingsLib string for blur developer option" into sc-dev am: 33a9f49892 am: 7d25b50b2c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788507

Change-Id: I065567300e601468fd2609ae26c6f0563fca382d
 2021-06-07 03:08:50 +00:00
YUKAI HUNG
7ac4829c89 Merge "Remove missed added testing locale to cause flaky" into sc-dev am: fa476aef12 am: 8a7e4b9ed0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809876

Change-Id: I9e93c92e93238e7511622756adab1a78517243cd
 2021-06-07 03:08:42 +00:00
Les Lee
ef9b85ed44 Merge "Usage Settings: Fix NPE when subscriberId is Null." into sc-dev am: 787685b2cc am: d0745b39b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847052

Change-Id: I2472991fd8fe4bb7082c6451a6df165fce8487ca
 2021-06-07 03:08:37 +00:00
Betty Chang
aae41a7e99 Merge "[GAR] Set the correct color and style to panel UI" into sc-dev am: 5b23f3b923 am: ba209f63aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800153

Change-Id: I7bbd6f8cf021a54a527ee78498fd0865eba71b50
 2021-06-07 03:08:36 +00:00
TreeHugger Robot
a75a39701c Merge "Add key for StorageDashboardFragment" into sc-dev am: b734aa3f7f am: cb0a247abf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14841816

Change-Id: I7659f0f415ffb054a340bb6d3b642f1294003f80
 2021-06-07 03:08:33 +00:00
Betty Chang
262318ef09 Merge "Remove Connect to public network for Network Rating Provider" into sc-dev am: f4fafb97ff am: 16fc9f7a50 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809873

Change-Id: I216c81ea0df91f8b246f49735fc2742b19e18fb5
 2021-06-07 03:08:31 +00:00
tim peng
c7a2b911e1 Merge "Remove flake error for AdvancedBluetoothDetailsHeaderControllerTest" into sc-dev am: 032b2b20bc am: 94fbcf042b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782146

Change-Id: I56dffb55d695c1a78310831f1e7ded7545eada62
 2021-06-07 03:08:25 +00:00
TreeHugger Robot
39a55f6fad Merge "Fix overlapping problem on running services page" into sc-dev am: 28128df960 am: 96d22f4efa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800150

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

Change-Id: I1bfc8aa987d39b42530a26366a5f94cc2fec7fdf
 2021-06-07 03:05:24 +00:00
Les Lee
dedd647b97 Merge "Usage Settings: Fix NPE when subscriberId is Null." into sc-dev am: 787685b2cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847052

Change-Id: I425454a57490bdb44ebbd01dbf35cc48fba94762
 2021-06-07 02:55:56 +00:00
TreeHugger Robot
297c48d04d Merge "Add key for StorageDashboardFragment" into sc-dev am: b734aa3f7f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14841816

Change-Id: I2705f11283e98901896144c7fcd4710700f1bfe2
 2021-06-07 02:55:20 +00:00
Les Lee
9dabe5005c Merge "Usage Settings: Fix NPE when subscriberId is Null." into sc-dev am: 787685b2cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847052

Change-Id: I78ee71bfac73cbece7efe1c6fbaf91c2e03ae5ce
 2021-06-07 02:53:41 +00:00
TreeHugger Robot
14cdceb10a Merge "Add key for StorageDashboardFragment" into sc-dev am: b734aa3f7f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14841816

Change-Id: I7a4e9eda41709d631c242355db63de5dcd61314e
 2021-06-07 02:53:31 +00:00
Les Lee
d0745b39b6 Merge "Usage Settings: Fix NPE when subscriberId is Null." into sc-dev am: 787685b2cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847052

Change-Id: Ibb93d30549d00dc7cd85f2d17332d27dcab5657a
 2021-06-07 02:51:30 +00:00
TreeHugger Robot
cb0a247abf Merge "Add key for StorageDashboardFragment" into sc-dev am: b734aa3f7f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14841816

Change-Id: Ife95f2185be80d42d377aebcfd2cfce0be97005a
 2021-06-07 02:51:11 +00:00
Les Lee
787685b2cc Merge "Usage Settings: Fix NPE when subscriberId is Null." into sc-dev 2021-06-07 02:41:28 +00:00
TreeHugger Robot
b734aa3f7f Merge "Add key for StorageDashboardFragment" into sc-dev 2021-06-07 02:37:51 +00:00