PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,032 Commits 1 Branch 0 Tags
69ce6cadcd5e932d26d268c6d8da20f7862ae11c
Commit Graph

105032 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Lin
69ce6cadcd Merge "Update biometric_settings_hand_back_to_guardian by device type" into tm-d1-dev am: 3db69adf01 am: c4492becef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281783

Change-Id: I987d4c6a4c71515e8040f4a2773bd74935103130
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 02:31:03 +00:00
Bill Lin
c4492becef Merge "Update biometric_settings_hand_back_to_guardian by device type" into tm-d1-dev am: 3db69adf01 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281783

Change-Id: I48390a1462c42d2676f8d740f1bc7a8c05613c13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 02:04:55 +00:00
Bill Lin
3db69adf01 Merge "Update biometric_settings_hand_back_to_guardian by device type" into tm-d1-dev 2022-05-18 01:43:56 +00:00
TreeHugger Robot
4271a34c16 Merge "Add the ripple effect to the highlight background" into tm-dev am: 56e3f60dec am: 7446f16681 am: f5b2d6bf85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356599

Change-Id: I2cff8564aad6e898040338d529c59eaca6e9c85c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 22:29:18 +00:00
Arc Wang
1a55855a39 Fix Settings crash when setting a null ringtone am: ec3ae8bb17 am: 3975972483 am: 0e2485a762 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18400413

Change-Id: I01fecf6b807cae539b2304e331f05a497470c432
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 22:29:00 +00:00
TreeHugger Robot
4e520cbeb3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: bcd32c74c1 -s ours am: 6e7e95593a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I546264cb3d6591dc2fe63bf5b12e58ebdd3645b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 22:12:38 +00:00
Bill Yi
21365f1d25 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e958634cc6 -s ours am: d2388e01b3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8db0c97a6f75842ebacd38fe8731fb4acfa59cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 22:12:22 +00:00
TreeHugger Robot
8c15a74d62 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d10c148d38 -s ours am: 14e9b89377 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7f263aa47b781e5ebd929750217cb41e94c36f69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 22:12:04 +00:00
Bill Yi
5de62a3ab7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6aadac2448 -s ours am: 74a4376590 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia4262843457d4fb99e2021a548c1ae0f5782023c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 22:11:47 +00:00
TreeHugger Robot
85f04741e8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 6bc7ea75a7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iae60069b5214f1588b528335e45e12b6611e114e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 22:08:03 +00:00
Bill Yi
42caff50f0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 93bd223fdf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic736fb436b499dbb11af6e6240ad41b15cc1318c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 22:07:41 +00:00
TreeHugger Robot
d67de35b9d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 7b538df037 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I50b4cba5ea7daeb084910ea69d0f0e6492065b6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 22:07:20 +00:00
Bill Yi
73958e15fc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 01c81a73dd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If90b0f6a940f8e8445a232b56454d02647483331
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 22:07:07 +00:00
TreeHugger Robot
5626e65991 Merge "Add the ripple effect to the highlight background" into tm-dev am: 56e3f60dec am: 7446f16681 am: a1c18a04f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356599

Change-Id: Icf2c8b9a451ca18d8dc6910a037ba153695ad4bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 15:02:10 +00:00
TreeHugger Robot
db835221af Merge "Add the ripple effect to the highlight background" into tm-dev am: 56e3f60dec am: 5022535781 am: 89d131727c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356599

Change-Id: Id4746d7bc0d46e6294df04db54a92288a5b60016
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 15:01:51 +00:00
TreeHugger Robot
a1c18a04f0 Merge "Add the ripple effect to the highlight background" into tm-dev am: 56e3f60dec am: 7446f16681 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356599

Change-Id: I07358095922c4b054950bf81160fa569680989cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 14:33:31 +00:00
TreeHugger Robot
f5b2d6bf85 Merge "Add the ripple effect to the highlight background" into tm-dev am: 56e3f60dec am: 7446f16681 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356599

Change-Id: I67c2a94cc52dabe6ceeba892a9f7d0bf9ca822ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 14:33:11 +00:00
TreeHugger Robot
89d131727c Merge "Add the ripple effect to the highlight background" into tm-dev am: 56e3f60dec am: 5022535781 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356599

Change-Id: I7f2b9aaa1f03d0bb186021329c44553ff748243f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 14:33:11 +00:00
TreeHugger Robot
7446f16681 Merge "Add the ripple effect to the highlight background" into tm-dev am: 56e3f60dec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356599

Change-Id: I9b553601fe759d0593e7c7522c6bb036f6c0afc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 14:15:57 +00:00
TreeHugger Robot
5022535781 Merge "Add the ripple effect to the highlight background" into tm-dev am: 56e3f60dec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356599

Change-Id: I14897ac1fe5897d9ea26892e5edc7e03de1e8f97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 14:14:10 +00:00
TreeHugger Robot
56e3f60dec Merge "Add the ripple effect to the highlight background" into tm-dev 2022-05-16 13:45:10 +00:00
Treehugger Robot
8347125177 Merge "Settings: Optimize the selected WFD route preference summary" am: 1143a4e8dc am: a312e1f404 am: c158467eaf am: 6315a724f8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2089683

Change-Id: Ieace3ca857cc2bdb5912b5d16ecb4344cef1ba80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 13:31:07 +00:00
Treehugger Robot
6315a724f8 Merge "Settings: Optimize the selected WFD route preference summary" am: 1143a4e8dc am: a312e1f404 am: c158467eaf 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2089683

Change-Id: I2e8c76b3d7b93172af52f83292f4b26b49467e5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 13:14:01 +00:00
Treehugger Robot
c158467eaf Merge "Settings: Optimize the selected WFD route preference summary" am: 1143a4e8dc am: a312e1f404 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2089683

Change-Id: I585e48ec5b375f1bbd9734e423709c150c9a93d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 12:39:36 +00:00
Treehugger Robot
a312e1f404 Merge "Settings: Optimize the selected WFD route preference summary" am: 1143a4e8dc 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2089683

Change-Id: I10970f3d2e7b8c916d2ef6231cb21d59fe6dcd44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 12:01:29 +00:00
Automerger Merge Worker
03c9d79940 Merge "Fix Settings crash when setting a null ringtone am: ec3ae8bb17 am: 8f8b11bce7" into tm-d1-dev-plus-aosp am: d66473c3a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18400413

Change-Id: Ide18a64ca4d8db8b196f97effcc5ca1748e92c2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 11:46:46 +00:00
Arc Wang
70a1b477e3 Fix Settings crash when setting a null ringtone am: ec3ae8bb17 am: 3975972483 am: 928a73c82b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18400413

Change-Id: If39c9c61e974eb69a59d9c13dd758efec33da859
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 11:46:31 +00:00
Treehugger Robot
1143a4e8dc Merge "Settings: Optimize the selected WFD route preference summary" 2022-05-16 11:32:24 +00:00
Automerger Merge Worker
d66473c3a3 Merge "Fix Settings crash when setting a null ringtone am: ec3ae8bb17 am: 8f8b11bce7" into tm-d1-dev-plus-aosp 2022-05-16 11:18:08 +00:00
Arc Wang
0e2485a762 Fix Settings crash when setting a null ringtone am: ec3ae8bb17 am: 3975972483 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18400413

Change-Id: I83b8231f06eb2611fdabb2b171090c0904c5908a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 11:18:04 +00:00
Arc Wang
907ede0c27 Fix Settings crash when setting a null ringtone am: ec3ae8bb17 am: 8f8b11bce7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18400413

Change-Id: Ie101d74c8b36c8f01de869496d75538910cc41e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 11:18:04 +00:00
Arc Wang
928a73c82b Fix Settings crash when setting a null ringtone am: ec3ae8bb17 am: 3975972483 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18400413

Change-Id: I62d726f6228d77cc8f0fac314743e41f7897b714
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 11:18:00 +00:00
Arc Wang
3975972483 Fix Settings crash when setting a null ringtone am: ec3ae8bb17 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18400413

Change-Id: Ibfcbed93b2aeb2d5291b4fd78da3e8092b533430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 10:50:44 +00:00
Arc Wang
8f8b11bce7 Fix Settings crash when setting a null ringtone am: ec3ae8bb17 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18400413

Change-Id: Ie19d5955539861bcbde10461863db5ad43167ea7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 10:49:17 +00:00
Jason Chiu
0c5772fdc4 Add the ripple effect to the highlight background 
Bug: 215267159
Test: visual
Change-Id: I96359342f0b8d40f5cd8dfbe8f1dd8b7d7f1c69b
 2022-05-16 18:33:36 +08:00
TreeHugger Robot
6f3b662abb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: bcd32c74c1 -s ours am: 934a23b5b7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1a8ecb7c4b3ae58da0057568385a4a5b7b26a9f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 09:11:08 +00:00
Bill Yi
5ce154fce2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e958634cc6 -s ours am: 021988e0b5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib38f813c007baf2d95b0bac1ccf1301ec9874a2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 09:10:58 +00:00
TreeHugger Robot
eadeca7ebd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d10c148d38 -s ours am: a607e20ce5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iab21e838082e6cd1e61285c317d39ce7b6ee06f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 09:10:40 +00:00
Bill Yi
9f481ea62f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6aadac2448 -s ours am: af0f88f108 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9e5b9a3d0799e3e1336803021a6600ed131c13a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 09:10:23 +00:00
TreeHugger Robot
934a23b5b7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: bcd32c74c1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0057cd6a06025ac138fd0d32c0753ba6513a2235
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 08:16:22 +00:00
TreeHugger Robot
6e7e95593a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: bcd32c74c1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I729fc21d41ea80d6c25e4d5edaedfdd5934b49b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 08:16:05 +00:00
Bill Yi
021988e0b5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e958634cc6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7d1ebcfad04483a737c455886340eacfdf35f609
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 08:16:00 +00:00
Bill Yi
d2388e01b3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e958634cc6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I93808f2f0a16f2c6f411cddfde07c8941e22cf95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 08:15:50 +00:00
TreeHugger Robot
a607e20ce5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d10c148d38 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I49825190a24c9ca309adccf03d50ccfb496169a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 08:15:41 +00:00
TreeHugger Robot
14e9b89377 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d10c148d38 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia1bed96468d8dc092ae461f5f044cfd4a8280ae5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 08:15:32 +00:00
Bill Yi
af0f88f108 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6aadac2448 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib68c0d4c26747aa7b22f1ef5ef534f76d0ff05f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 08:15:25 +00:00
Bill Yi
74a4376590 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6aadac2448 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I80d358866b19448cf3ff50ca2326ad2b9269291a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 08:15:15 +00:00
TreeHugger Robot
6bc7ea75a7 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-05-16 08:00:24 +00:00
TreeHugger Robot
7b538df037 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-05-16 08:00:24 +00:00
TreeHugger Robot
bcd32c74c1 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-05-16 07:38:50 +00:00