TreeHugger Robot
d16c71ad9a
Merge "Enable touch feedback settings when the phone is in silent mode" into tm-dev am: f73af73a1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16980963
Change-Id: I8006ca90c64caceec0452bbda22e8aeeeedecac5
2022-02-28 22:54:33 +00:00
TreeHugger Robot
f73af73a1a
Merge "Enable touch feedback settings when the phone is in silent mode" into tm-dev
2022-02-28 22:46:22 +00:00
TreeHugger Robot
33b385157e
Merge "Change dream icon color to be the same as the text color." into tm-dev am: 090e1d395a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17015305
Change-Id: I8f76801f746a44d09c8f4e778d71fb55933306ef
2022-02-28 21:16:37 +00:00
Yuri Lin
fb5cec2c79
Merge "Revert "Rename Do Not Disturb -> Priority Mode"" into tm-dev am: bf643f9276
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17034508
Change-Id: Ib79d31b6d53d22c79f158a18b63f365216657353
2022-02-28 21:13:34 +00:00
TreeHugger Robot
090e1d395a
Merge "Change dream icon color to be the same as the text color." into tm-dev
2022-02-28 20:41:56 +00:00
Yuri Lin
bf643f9276
Merge "Revert "Rename Do Not Disturb -> Priority Mode"" into tm-dev
2022-02-28 20:20:23 +00:00
Joe Bolinger
afc6079973
Merge "Persist state of no thanks button." into tm-dev am: 72f84a96d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17016922
Change-Id: I5ab77858324c3017f0f172c7be2dd78a8e3eb4a6
2022-02-28 18:19:57 +00:00
Joe Bolinger
72f84a96d8
Merge "Persist state of no thanks button." into tm-dev
2022-02-28 18:02:28 +00:00
Yuri Lin
f26a246f5a
Revert "Rename Do Not Disturb -> Priority Mode"
...
Revert submission 16632971-yl-prioritymode
Reason for revert: We're not launching this change with T, so this will revert all the relevant string changes.
Reverted Changes:
I5eff72db8:Rename Do Not Disturb -> Priority Mode
Ie7a9e35e6:Rename Do Not Disturb -> Priority Mode
I7bb74d2fd:Rename Do Not Disturb -> Priority Mode
Id17942024:Rename Do Not Disturb -> Priority Mode
Ib8efd7289:Rename Do Not Disturb -> Priority Mode
Ia1b77f9ee:Rename Do Not Disturb -> Priority Mode
Bug: 190180868
Test: TH
Change-Id: I7516c97809c7968f999d7caa8885f0cb5cdc844f
Merged-In: I7516c97809c7968f999d7caa8885f0cb5cdc844f
2022-02-28 16:33:33 +00:00
Evan Laird
95184c72dd
Merge "Add setting for showing the vibrate icon in status bar" into tm-dev am: 969625bc8e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986239
Change-Id: Ife07955ce96448e9641a32c838b5178fad7a63cf
2022-02-28 15:34:21 +00:00
Evan Laird
969625bc8e
Merge "Add setting for showing the vibrate icon in status bar" into tm-dev
2022-02-28 15:10:23 +00:00
TreeHugger Robot
5aa1a810b1
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: I0d3d60c2a8acdbaf302d6f1162cac91234ed97a5
2022-02-25 21:49:23 +00:00
Joe Bolinger
017545c6d1
Persist state of no thanks button.
...
Fix: 207724636
Test: manual (scroll to bottom and rotate device)
Change-Id: I5ef486dc49abd22387b5f6edf67eedaacc9ded4a
2022-02-25 21:42:36 +00:00
TreeHugger Robot
3afc9399f7
Merge "Update dream preview button text color" into tm-dev
2022-02-25 21:11:19 +00:00
Lucas Silva
9548af2cc8
Change dream icon color to be the same as the text color.
...
Bug: 220120729
Test: locally on device
Change-Id: I60de6ba18c0ee46fa1e578e8a7b4c68206024913
2022-02-25 13:39:43 -05: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
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
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
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
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
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
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
TreeHugger Robot
a56f67de96
[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: Ie4594afe0eb4a0585fc8ee9cb44e2f4cebbf9c9e
2022-02-24 18:50:49 +00:00
Bill Yi
5d831202b5
[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: I40a67e26671680aa33c5f48c48f16c5025067ee9
2022-02-24 18:50:47 +00:00
Bill Yi
49b531be9c
[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: I047034a51ff408c903e9932170f468d635a81094
2022-02-24 18:49:05 +00:00
TreeHugger Robot
50b53a1c58
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a18ff15076
-s ours am: b3efaa654e
-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: Ic1f4c1cb5357a491c77bdf93d340d98d59e059b4
2022-02-24 18:38:40 +00:00
Bill Yi
340aa20e39
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc83e2a05a
-s ours am: 3d349c1688
-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: Ie1a4136bce85ad506e47f66f8806f6af86a4918e
2022-02-24 18:38:38 +00:00
Bill Yi
30a5c5bf0a
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84
am: 3913e56dd9
-s ours am: 31a5b89eef
-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: I4bfb833ef6a25a62bdabc4aa251d0a8930bf22e4
2022-02-24 18:38:22 +00:00
Bill Yi
8bcdd557ad
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 674c4b2104
-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: Ica0ed6810627f1fd0d72ca966f1096285ef2e40e
2022-02-24 18:37:13 +00:00
TreeHugger Robot
7b4af603b6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 24bd47eda7
-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: I08953b72649f22b940aa71035fd74d5f168143c9
2022-02-24 18:26:32 +00:00
Bill Yi
4c23b861ce
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3ce34203a
-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: Idec4de9dc19f222445eb564a4ddaf75425f96f14
2022-02-24 18:26:30 +00:00
TreeHugger Robot
b3efaa654e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a18ff15076
-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: I8850b59a5b02dd11a1f8ffaeeb8bb2ef0fabca90
2022-02-24 18:26:27 +00:00
Bill Yi
3d349c1688
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc83e2a05a
-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: Ia0f31cd384cdea4944f63a73a0ec8793a21b11f9
2022-02-24 18:26:24 +00:00
Bill Yi
1f54a37763
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84
am: 85de1c63a0
-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: I7933a10f4846837ef65d4cb98a0e896bef9db840
2022-02-24 18:26:06 +00:00