PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,491 Commits 1 Branch 0 Tags
d0a8df6667882eff2d65586cb35f5febf89af93c
Commit Graph

104491 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
8a4420f4a6 Merge "Update dream settings categories, to fix padding." into tm-dev am: dc8b0a5e2d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17760488

Change-Id: I0487097adc087bc2b9aa540de02fa49c600ee487
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 21:39:35 +00:00
TreeHugger Robot
7d8a2c0978 Merge "Update dream settings categories, to fix padding." into tm-dev am: dc8b0a5e2d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17760488

Change-Id: I9806d5a0a35cda34662ec03d81472fb950f7e6da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 21:38:26 +00:00
TreeHugger Robot
dc8b0a5e2d Merge "Update dream settings categories, to fix padding." into tm-dev 2022-04-14 21:21:22 +00:00
TreeHugger Robot
ee85c5ba8f Merge "Set Active dream to not be clickable when active." into tm-dev am: 2f178cfdf3 am: 89fdd90031 am: 008a6bf002 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17760486

Change-Id: Id2c8db14f0d76aaac608f1f8afe831ed3c2825ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 21:01:32 +00:00
TreeHugger Robot
008a6bf002 Merge "Set Active dream to not be clickable when active." into tm-dev am: 2f178cfdf3 am: 89fdd90031 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17760486

Change-Id: I0d7eac15bb2d358517550111b2634b25e871c673
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 20:44:48 +00:00
TreeHugger Robot
5b8ba0b768 Merge "Set Active dream to not be clickable when active." into tm-dev am: 2f178cfdf3 am: 1a83cbde6d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17760486

Change-Id: I7d0dfc26c91e24bbae3f3458d44215856cec5537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 20:43:42 +00:00
TreeHugger Robot
89fdd90031 Merge "Set Active dream to not be clickable when active." into tm-dev am: 2f178cfdf3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17760486

Change-Id: I7627384562f1382494f857c8baee444ba9e3539b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 20:08:17 +00:00
TreeHugger Robot
1a83cbde6d Merge "Set Active dream to not be clickable when active." into tm-dev am: 2f178cfdf3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17760486

Change-Id: I8d698fa9b66d38751155cc03d5cbfc6b9a5165e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 20:07:17 +00:00
TreeHugger Robot
280ae3e061 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 940c2d25fb -s ours am: d22b43c6a5 -s ours am: a5a1c5710e -s ours am: a0e140b728 -s ours am: 39c44e1f75 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I890180ada26d344b330dc8f5f929f685617544ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 19:51:27 +00:00
Bill Yi
b0f9799f2b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e658709ef2 -s ours am: 812e79c8cf -s ours am: db2dfb95da -s ours am: a14e9514c3 -s ours am: 17e37dda74 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1d7e1b495c2ae5aa2824361b48c2b7f9be8581ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 19:51:27 +00:00
TreeHugger Robot
1c99f3bd79 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b299745a6c -s ours am: c53da610b2 -s ours am: f26007c8ef -s ours am: c0473f683a -s ours am: a647630996 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id591438e5bdb9790c0febd8d3920830ec1620812
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 19:50:02 +00:00
Bill Yi
64a010bc01 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca510b1550 -s ours am: 57b6374513 -s ours am: 006db32086 -s ours am: d975bfd607 -s ours am: 4a6742b964 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I931b949f140688e98c205c02ba0c2003c2f17624
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 19:50:01 +00:00
TreeHugger Robot
2f178cfdf3 Merge "Set Active dream to not be clickable when active." into tm-dev 2022-04-14 19:41:32 +00:00
TreeHugger Robot
39c44e1f75 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 940c2d25fb -s ours am: d22b43c6a5 -s ours am: a5a1c5710e -s ours am: a0e140b728 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0013303c804f05b284dd1acfeb75c816615917d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 19:26:52 +00:00
Bill Yi
17e37dda74 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e658709ef2 -s ours am: 812e79c8cf -s ours am: db2dfb95da -s ours am: a14e9514c3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I592f88ed869f8ee5710d24526bb6783fc46fc05d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 19:26:51 +00:00
TreeHugger Robot
2a432ad89c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 940c2d25fb -s ours am: d22b43c6a5 -s ours am: a5a1c5710e -s ours am: edfab288ee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If485ca1366d2287a342fbc364feb0a134f8f6533
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 19:26:12 +00:00
Bill Yi
7edc91c3d1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e658709ef2 -s ours am: 812e79c8cf -s ours am: db2dfb95da -s ours am: 51bb20b3d5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6c67dfbf73937717828280dd12e5585246d92075
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 19:26:11 +00:00
TreeHugger Robot
a647630996 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b299745a6c -s ours am: c53da610b2 -s ours am: f26007c8ef -s ours am: c0473f683a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I24c658939b4b35d619e0243563a2e80dd8dc1f4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 19:26:00 +00:00
Bill Yi
4a6742b964 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca510b1550 -s ours am: 57b6374513 -s ours am: 006db32086 -s ours am: d975bfd607 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3cc80ddd50f67339e13625db9284ee4d38a487b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 19:25:59 +00:00
TreeHugger Robot
5ad32a042f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b299745a6c -s ours am: c53da610b2 -s ours am: f26007c8ef -s ours am: e7eaab7e60 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I357435b6f3f3b7bb26b656a3c2124761c12a04bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 19:24:25 +00:00
Bill Yi
b29dded01c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca510b1550 -s ours am: 57b6374513 -s ours am: 006db32086 -s ours am: 8aed68a1e6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic8854e19bcdfebf663803b6702b8f1b53695bdb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 19:24:24 +00:00
Abel Tesfaye
26bd5d74ba Merge "Add accessibility string description for auto rotate" 2022-04-14 19:07:05 +00:00
Lucas Silva
d8b90650d3 Update dream settings categories, to fix padding. 
The extra PreferenceCategory is adding some unnecessary padding, so
removing it. Instead of using a preference category to enable/disable
all items, we just iterate through all the preferences when
enabling/disabling items.

Bug: 227139218
Test: locally on device
Change-Id: I403295fbccb7b135b7d603cd1fc713c4c0189569
 2022-04-14 18:59:53 +00:00
Bill Yi
67a0f15f49 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: b67694c1cb -s ours am: 20efc0cc64 -s ours am: 57e6a29f1a -s ours am: 1b81748070 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I82de40213e56a9829013bbc9762f5e9d52700450
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:58:30 +00:00
Bill Yi
f2190ed871 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 76f5b29384 -s ours am: 4b073cf421 -s ours am: d700cfe212 -s ours am: a4d9b83149 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8fc3de607737e3c7f173e915d6ab2063ff51fa9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:58:29 +00:00
TreeHugger Robot
1501a5ee96 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: e3b581c350 -s ours am: 0312b67407 -s ours am: 1fd59e05d9 -s ours am: efed78d9fc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I46159f1ff07496f7e35eca25f99b2b72ada506bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:58:22 +00:00
Lucas Silva
46ad7f8581 Merge "Add hyphenation to customize button text." into tm-dev am: b31dbbb1cf am: f8c7a84eb8 am: 86d973a79c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17758405

Change-Id: I0701d5ac9a1fe41878e29b218c3aeda313eed33b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:58:15 +00:00
TreeHugger Robot
6715e00db7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2212edb907 -s ours am: e9c60d9d72 -s ours am: b6e489cd56 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I82b3e17c6259cd782a95776993f4cfbd57cd533e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:58:06 +00:00
Bill Yi
a5347a2508 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23f2bfb3a3 -s ours am: 942891fc3c -s ours am: e2a173d3a8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia5b00a6bc8195826f6ee4c2ae93d9096b018b7b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:58:03 +00:00
TreeHugger Robot
bd32beb820 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2880f9c765 -s ours am: 0ec6ee3588 -s ours am: b614bf28ad -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I81836e98d7ce7b52b10610d30f0843eda1db2a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:57:48 +00:00
Bill Yi
6fcade372e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b31a221ace -s ours am: da6144dcbd -s ours am: f0890308c5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6ec3e6a3c7e0e1953c250231947479e05a0b10eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:57:47 +00:00
TreeHugger Robot
01768c181f Merge changes from topic "presubmit-am-5e82c0fb6c2a413f9587cafc2046d978" into tm-dev am: 55e91da24e am: fe3d04de86 am: 69929e2dcd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745184

Change-Id: I88f5c3ddda6cd00666374ead67a334e59b77d62a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:55:05 +00:00
Bill Yi
15099574fe [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 17b4bfa5b0 am: 5a7f4fcb00 -s ours am: 7044a2ee63 -s ours am: 204786c737 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icde7af29a030c1aa02e13f76ddea9a915d5e4d64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:55:04 +00:00
Bill Yi
4cda8d653b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 89a0c5fb00 -s ours am: 4801f9a9aa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icde201bf92379fa34acecc80310a251eccf5c2d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:44:08 +00:00
Bill Yi
949f1aa25f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8fac9ad72b -s ours am: 98baf75c26 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib200de46ac154aea627f3fac5b7891bc3e1d4478
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:44:06 +00:00
Bill Yi
1bff32b2c0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 08549ed959 -s ours am: ee6033af75 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I618cfc03f54ad96e1a585de8b611c353a0c96d4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:39:50 +00:00
Bill Yi
369f30ab9e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5491463fe6 -s ours am: 01ef39c8b1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I502816906a2a211a64a9231ec80b760f937b5c99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:39:49 +00:00
TreeHugger Robot
a0e140b728 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 940c2d25fb -s ours am: d22b43c6a5 -s ours am: a5a1c5710e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5dbab8c22aa49cfed736a1ef24e739b3e70acc90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:37:17 +00:00
Bill Yi
a14e9514c3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e658709ef2 -s ours am: 812e79c8cf -s ours am: db2dfb95da -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4ab2b23eb3b46e580cc43d0ca3afc149631c81d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:37:16 +00:00
TreeHugger Robot
c0473f683a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b299745a6c -s ours am: c53da610b2 -s ours am: f26007c8ef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic25e06d7ff34f2d46236d40b25a3b6d2e5336c6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:36:31 +00:00
Bill Yi
d975bfd607 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca510b1550 -s ours am: 57b6374513 -s ours am: 006db32086 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifb5919cb0820eb6489fca924977c81612cbc3b7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:36:28 +00:00
TreeHugger Robot
edfab288ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 940c2d25fb -s ours am: d22b43c6a5 -s ours am: a5a1c5710e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ide621c4e166819a8536b3a90cc867f5133ba5b9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:35:51 +00:00
Bill Yi
51bb20b3d5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e658709ef2 -s ours am: 812e79c8cf -s ours am: db2dfb95da -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I21e6b1da5e9f34d8d7ac15e7b9df806eaa0cf817
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:35:50 +00:00
TreeHugger Robot
e7eaab7e60 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b299745a6c -s ours am: c53da610b2 -s ours am: f26007c8ef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iccbf6d891e5ce1d1c79aa5aa99a0a5e6b827d0b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:35:17 +00:00
Bill Yi
8aed68a1e6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca510b1550 -s ours am: 57b6374513 -s ours am: 006db32086 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If26e9374379b7748fd4aae371d07b62b92f7231f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:35:16 +00:00
Bill Yi
1b81748070 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: b67694c1cb -s ours am: 20efc0cc64 -s ours am: 57e6a29f1a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I62b36e9375cc4bbc6035444498332eba81cb015f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:19:27 +00:00
Bill Yi
a4d9b83149 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 76f5b29384 -s ours am: 4b073cf421 -s ours am: d700cfe212 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7e93993b9c4031bc071da3ba83faa8fe1b965855
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:19:26 +00:00
TreeHugger Robot
efed78d9fc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: e3b581c350 -s ours am: 0312b67407 -s ours am: 1fd59e05d9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id65e97c0a8085b93ce05cc97bbaa5f42d1650d85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:19:07 +00:00
Lucas Silva
86d973a79c Merge "Add hyphenation to customize button text." into tm-dev am: b31dbbb1cf am: f8c7a84eb8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17758405

Change-Id: Ie5e66a433141ff2273c9d6cbdf140d3424fe0d47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:18:54 +00:00
TreeHugger Robot
b6e489cd56 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2212edb907 -s ours am: e9c60d9d72 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I67c36a32fd6af0572d278e978fd38233a821ae2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:18:21 +00:00