Commit Graph

110999 Commits

Author SHA1 Message Date
TreeHugger Robot
472d540799 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: I3909dc2869abf972835d159545f1c3e79360045a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 14:14:37 +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
12a30b9511 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-05-16 13:35:19 +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
Automerger Merge Worker
76fcaf0052 Merge "Fix Settings crash when setting a null ringtone am: ec3ae8bb17 am: 8f8b11bce7" into tm-d1-dev-plus-aosp am: d66473c3a3 am: 03c9d79940
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18400413

Change-Id: Ib714e89611e10b8416e9c5db95422fe778b63394
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 12:39:55 +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
Arc Wang
bf6d4704af Fix Settings crash when setting a null ringtone am: ec3ae8bb17 am: 3975972483 am: 928a73c82b am: 70a1b477e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18400413

Change-Id: I293b5bfa6578b050f6cb4359f07e91172bdcbb12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 12:39:20 +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
7b14f3130c 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: Id020d2d587d7a1ab31a95e809e2e0e5e124f86d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 10:49:42 +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
TreeHugger Robot
673ba1d114 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-05-16 10:44:19 +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
c48cdd12b6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: bcd32c74c1 -s ours am: 934a23b5b7 -s ours am: 6f3b662abb -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: I44fb30680dde741538dfa8c6c5f744e96cc5f21d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 09:38:53 +00:00
Bill Yi
eb430537b2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e958634cc6 -s ours am: 021988e0b5 -s ours am: 5ce154fce2 -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: I2fdb88824b0861950220901640b7a587feb9d662
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 09:38:44 +00:00
TreeHugger Robot
0490f05394 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d10c148d38 -s ours am: a607e20ce5 -s ours am: eadeca7ebd -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: I5a13e0d27653cb37952939dd6407e3b39b0c9c77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 09:38:28 +00:00
Bill Yi
4b8b60e89d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6aadac2448 -s ours am: af0f88f108 -s ours am: 9f481ea62f -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: I26ec2542df926daa244ae9e9cecbc24d5ad2e61b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 09:38:08 +00: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
299fcbf5dc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 1b69400552 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id02c4f6418a31001b766682034eac0807037e47c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 08:14:19 +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
Edgar Wang
f3270e5c1c Recalculate view's height when tab is selected
Viewpager2 created view based on the first tab height, when tab is
selected, viewpager2 should recalculate height.

But this solution may not suitable for App list, so we only enable
for Location Settings which have different items in personal & work
profile.

Bug: 224521665
Test: manual
Change-Id: Ib19b30cb82b8b4f13f651795906289da53ded4ed
2022-05-16 15:59:21 +08:00
TreeHugger Robot
1b69400552 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-05-16 07:39:30 +00:00
TreeHugger Robot
a695fbef26 Merge changes from topic "tc_change_22051519_20"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 5a8474686f
  Import translations. DO NOT MERGE ANYWHERE
2022-05-16 07:39:30 +00:00
TreeHugger Robot
bcd32c74c1 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-05-16 07:38:50 +00:00
TreeHugger Robot
d10c148d38 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-05-16 07:38:50 +00:00
Yi-Ling Chuang
11065bfb10 Merge "Make sure loading extra info once" into tm-dev am: 14d31677d6 am: cb652d47e3 am: 33e4d8dc5a am: 54891b0c0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18350202

Change-Id: Ia3278ebdc6c395fe69cd0c6ca05f666a3158d8f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 06:56:22 +00:00
Yi-Ling Chuang
c5e8d5d759 Merge "Make sure loading extra info once" into tm-dev am: 14d31677d6 am: c481752bf6 am: 2e707d1191 am: 869953ba31
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18350202

Change-Id: I427b2657badb4e467ebf2288225778e798d6d033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 06:56:15 +00:00
KUAN WANG
24f10956e2 Merge "Reset Optimization Mode of apps when users reset app settings." into tm-qpr-dev am: 614d2dfc0b am: 166c0633aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18309249

Change-Id: Iee4d76992c4b18a08adbece2536a1c332f804d3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 06:56:07 +00:00
Yi-Ling Chuang
c7f651c35c Merge "Make sure loading extra info once" into tm-dev am: 14d31677d6 am: c481752bf6 am: 6bafe542fe am: 27171f5fc5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18350202

Change-Id: Iac3035745db9c8e5ffee4fbc64fbf7631853aac6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 06:55:36 +00:00