PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,575 Commits 1 Branch 0 Tags
792e514bd01ed2e44d4f3207dfb504f4d1f603c3
Commit Graph

100575 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
792e514bd0 Merge "Update dream preview button text color" into tm-dev am: 3afc9399f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17015304

Change-Id: I2a5a4554e4d316903679fb5bd4a322f67d75e8e9
 2022-02-25 21:49:36 +00:00
TreeHugger Robot
3afc9399f7 Merge "Update dream preview button text color" into tm-dev 2022-02-25 21:11:19 +00:00
Aaron Liu
9a0139b7d2 Merge "Home Controls: Add Device Controls settings" into tm-dev am: 7e24127f12 am: bb197a869a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16991609

Change-Id: Iff3565d6b3833423f1a82c71b398c99f495e03b1
 2022-02-25 20:15:49 +00:00
Lucas Silva
3ebbeeb83b Merge "Allow other layouts to be passed into the dream view adatper." into tm-dev am: 7565dfb999 am: e0f4e4a55e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17002670

Change-Id: I90c1fd73fbbff792b2c3a361e0376737590fef7f
 2022-02-25 20:00:14 +00:00
Lucas Silva
f939e8e1a4 Merge changes from topic "dreams-oobe" into tm-mainline-prod am: fa09bca0db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17002670

Change-Id: If88d0fec8cb463691f0e4fa02d7a2570d12b083f
 2022-02-25 20:00:04 +00:00
TreeHugger Robot
f5128a5e6b Merge "[Panlingual] Fix duplicated locale show on suggested group" into tm-dev am: cfd4c68d94 am: 18582d64a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17005475

Change-Id: I33d1b1091f45a5a2f7af11251869bbb5307f5cd1
 2022-02-25 19:59:54 +00:00
Lucas Silva
25c774c286 Merge "Allow other layouts to be passed into the dream view adatper." into tm-dev am: 7565dfb999 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17002670

Change-Id: I7df07963c009d3afa7e4a9b83bc41586ad70a025
 2022-02-25 19:43:20 +00:00
TreeHugger Robot
39697f86e7 Merge "[Panlingual] Fix duplicated locale show on suggested group" into tm-dev am: cfd4c68d94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17005475

Change-Id: Ie3dda91506593620e0de659793924d9669536813
 2022-02-25 19:42:06 +00:00
PETER LIANG
d090ac2a30 Merge "Override the text size attribute of "Preview" in the text and reading options." into tm-dev am: c872615dff am: 49f772581c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16996813

Change-Id: Ifc01861df702e6e320fbad47287cbffd90491dc8
 2022-02-25 19:33:44 +00:00
Menghan Li
2e35afa0ba Merge "Refine A11y Tile Service javadoc" into tm-dev am: d3a7ec88a0 am: 8743339526 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16932278

Change-Id: I3512b51a95237859f131921233dcc2709fc0eefe
 2022-02-25 19:14:40 +00:00
Lucas Silva
5b19c1200f Update dream preview button text color 
Bug: 219761637
Test: locally on device
Change-Id: I6b98b400c31ca5a296f5ed095b52ff7d8ea36c44
 2022-02-25 13:13:59 -05:00
Aaron Liu
bb197a869a Merge "Home Controls: Add Device Controls settings" into tm-dev am: 7e24127f12 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16991609

Change-Id: I368f1594f353c1da16a446d92d96e33c99b69864
 2022-02-25 16:50:13 +00:00
Aaron Liu
7e24127f12 Merge "Home Controls: Add Device Controls settings" into tm-dev 2022-02-25 16:19:30 +00:00
Lucas Silva
e0f4e4a55e Merge "Allow other layouts to be passed into the dream view adatper." into tm-dev am: 7565dfb999 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17002670

Change-Id: I91622c5abbd52a553583822df89d01ba80ed493b
 2022-02-25 15:29:04 +00:00
Lucas Silva
fa09bca0db Merge changes from topic "dreams-oobe" into tm-mainline-prod 
* changes:
  [automerge] Allow other layouts to be passed into the dream view adatper. 2p: 5e91b7eab3
  Allow other layouts to be passed into the dream view adatper.
 2022-02-25 15:07:20 +00:00
Lucas Silva
7565dfb999 Merge "Allow other layouts to be passed into the dream view adatper." into tm-dev 2022-02-25 15:07:20 +00:00
Lucas Silva
4d8565dfa9 Merge changes from topic "dreams-oobe" 
* changes:
  [automerge] Allow other layouts to be passed into the dream view adatper. 2p: 5e91b7eab3 2p: c8c07f4ac7
  [automerge] Allow other layouts to be passed into the dream view adatper. 2p: 5e91b7eab3
  Allow other layouts to be passed into the dream view adatper.
 2022-02-25 15:07:20 +00:00
TreeHugger Robot
18582d64a3 Merge "[Panlingual] Fix duplicated locale show on suggested group" into tm-dev am: cfd4c68d94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17005475

Change-Id: I460c9ce2fa19885e2720541982123ab4440cb8de
 2022-02-25 12:01:41 +00:00
TreeHugger Robot
cfd4c68d94 Merge "[Panlingual] Fix duplicated locale show on suggested group" into tm-dev 2022-02-25 11:31:56 +00:00
PETER LIANG
49f772581c Merge "Override the text size attribute of "Preview" in the text and reading options." into tm-dev am: c872615dff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16996813

Change-Id: I123675c76501ec062ac87c0b30897a6a379a56ec
 2022-02-25 10:30:43 +00:00
PETER LIANG
c872615dff Merge "Override the text size attribute of "Preview" in the text and reading options." into tm-dev 2022-02-25 10:06:57 +00:00
tom hsu
62a8514d1b [Panlingual] Fix duplicated locale show on suggested group 
- When User select 2 same locale but different region, current logic
   will also check 2 times and add these same results into cache.
 - Use hashSet to resolve this problem

Bug: 220804297
Test: local
Test: atest pass
Change-Id: I60c63a1eb570373fd714cf9b29ed926d15b2daa7
 2022-02-25 09:35:51 +00:00
Lucas Silva
4b3131bbf6 Merge "Add dream descriptions to dream settings UI." into tm-dev am: 4b6efee1a3 am: caa3d0c437 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16989262

Change-Id: Ibe10e8d116d4caf3ccb898559b7477132d4cd5a3
 2022-02-24 23:57:01 +00:00
TreeHugger Robot
c7892b961c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a18ff15076 -s ours am: b3efaa654e -s ours am: 50b53a1c58 -s ours am: 950a131827 -s ours am: 8838e249ac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id6c5820b652d33fb6f670ac7ce5d4c36529b29f0
 2022-02-24 23:56:42 +00:00
Bill Yi
b3c16ac91c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc83e2a05a -s ours am: 3d349c1688 -s ours am: 340aa20e39 -s ours am: 8b2c75107f -s ours am: 9e11adf975 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5417ce9116f4ee21949c5d5b0e85676318ac367c
 2022-02-24 23:56:39 +00:00
Bill Yi
a0c48f5bdc [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84 am: 3913e56dd9 -s ours am: 31a5b89eef -s ours am: 30a5c5bf0a -s ours am: 91c6687b8d -s ours am: 9e6d0e191d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I162b0d639d94fc029cab9911bb28fa02d024d8ff
 2022-02-24 23:56:20 +00:00
Bill Yi
764f371b4d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 674c4b2104 -s ours am: 8bcdd557ad -s ours am: b4fb92af4b -s ours am: 95cc19bcdc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibe4f09e898f5d910c341d5b6405c23e22998ce3f
 2022-02-24 23:56:05 +00:00
TreeHugger Robot
67af9ce371 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 24bd47eda7 -s ours am: 7b4af603b6 -s ours am: a56f67de96 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I845397d94e1a891a06640b725c0a61ff8385ba51
 2022-02-24 23:20:44 +00:00
Bill Yi
b1222f4557 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3ce34203a -s ours am: 4c23b861ce -s ours am: 5d831202b5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I79e721bc9eaadff461c5f606e9a6d7e18e330c60
 2022-02-24 23:20:41 +00:00
Menghan Li
8743339526 Merge "Refine A11y Tile Service javadoc" into tm-dev am: d3a7ec88a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16932278

Change-Id: I8c308d9cca65765de769dfde277376f05f9976b8
 2022-02-24 21:32:43 +00:00
Menghan Li
d3a7ec88a0 Merge "Refine A11y Tile Service javadoc" into tm-dev 2022-02-24 21:22:18 +00:00
Lucas Silva
bafbbf4fdc Merge "Add dream descriptions to dream settings UI." into tm-dev am: 4b6efee1a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16989262

Change-Id: I2dac154f7a7b45dd1c7843193c4a22880a596b7a
 2022-02-24 20:39:52 +00:00
Bill Yi
421f150b35 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84 am: 85de1c63a0 -s ours am: 1f54a37763 -s ours am: 49b531be9c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4987c04b9325a3d09bd49863dde79a9a37ab94fa
 2022-02-24 19:44:17 +00:00
Lucas Silva
caa3d0c437 Merge "Add dream descriptions to dream settings UI." into tm-dev am: 4b6efee1a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16989262

Change-Id: I6c6e86c6812de1dee8b0219d5ef3cded2865093a
 2022-02-24 19:43:47 +00:00
Lucas Silva
4b6efee1a3 Merge "Add dream descriptions to dream settings UI." into tm-dev 2022-02-24 19:34:55 +00:00
TreeHugger Robot
8838e249ac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a18ff15076 -s ours am: b3efaa654e -s ours am: 50b53a1c58 -s ours am: 950a131827 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iec013bc7a1f4f67cea08b5fc3337bed05f3dcab0
 2022-02-24 19:31:48 +00:00
Bill Yi
9e11adf975 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc83e2a05a -s ours am: 3d349c1688 -s ours am: 340aa20e39 -s ours am: 8b2c75107f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I334a3b40973fcc36153a74306fcea05ad248ed43
 2022-02-24 19:31:48 +00:00
Bill Yi
9e6d0e191d [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84 am: 3913e56dd9 -s ours am: 31a5b89eef -s ours am: 30a5c5bf0a -s ours am: 91c6687b8d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I904adb3ee1853f44c2aca82c5f28f10301638a25
 2022-02-24 19:31:39 +00:00
Bill Yi
95cc19bcdc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 674c4b2104 -s ours am: 8bcdd557ad -s ours am: b4fb92af4b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic3562f9803108f9cda6532ef76d1cbabbb79d7ff
 2022-02-24 19:31:32 +00:00
TreeHugger Robot
68ad2ce621 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a18ff15076 -s ours am: b3efaa654e -s ours am: 50b53a1c58 -s ours am: 950a131827 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I512ae908011164f188a28a8befb50542e2f69b38
 2022-02-24 19:05:22 +00:00
Bill Yi
5cb4595be4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc83e2a05a -s ours am: 3d349c1688 -s ours am: 340aa20e39 -s ours am: 8b2c75107f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9988feb70308f562bd93496325e5544f183c54c5
 2022-02-24 19:05:21 +00:00
Bill Yi
f446b700a2 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84 am: 3913e56dd9 -s ours am: 31a5b89eef -s ours am: 30a5c5bf0a -s ours am: 91c6687b8d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If993d229eae2f3820b4e25f53ac5f846d296334b
 2022-02-24 19:05:14 +00:00
Bill Yi
91859b0853 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 674c4b2104 -s ours am: 8bcdd557ad -s ours am: b4fb92af4b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifff0716f27d23fc78d64a09a54b52770ea511a2e
 2022-02-24 19:04:33 +00:00
TreeHugger Robot
637ff8a720 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 24bd47eda7 -s ours am: 7b4af603b6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7ed14fd6f982b4570fe15cf296aa85485f229bd3
 2022-02-24 19:04:16 +00:00
Bill Yi
9d87ccd670 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3ce34203a -s ours am: 4c23b861ce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibe351b4744fee6ca004f488266f50b482f49a94f
 2022-02-24 19:04:15 +00:00
Bill Yi
f4a111cdcf [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84 am: 85de1c63a0 -s ours am: 1f54a37763 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iacb71005a26e2918a715925d4f739412e5319b8d
 2022-02-24 19:03:33 +00:00
TreeHugger Robot
950a131827 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a18ff15076 -s ours am: b3efaa654e -s ours am: 50b53a1c58 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieca92a3de4bf92b268b37408689821d3e2291a5b
 2022-02-24 19:03:23 +00:00
Bill Yi
8b2c75107f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc83e2a05a -s ours am: 3d349c1688 -s ours am: 340aa20e39 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If46ab67657eddcf52094c39690d5267795c21697
 2022-02-24 19:03:21 +00:00
Bill Yi
91c6687b8d [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84 am: 3913e56dd9 -s ours am: 31a5b89eef -s ours am: 30a5c5bf0a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I98aeb0a1043ebf20c998e2d59d30600b4e795142
 2022-02-24 19:02:42 +00:00
Bill Yi
b4fb92af4b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 674c4b2104 -s ours am: 8bcdd557ad -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic09273a1108e7c9942dea93c8b8800d4d3c7417a
 2022-02-24 19:01:27 +00:00