Tsung-Mao Fang
32c1fc76d8
Fix unable to scroll to the bottom page
...
We should set padding for root view instead of margin.
Test: Verify the behavior is correct in single pane
and two panes mode.
Fix: 221422906
Change-Id: I17a63be6e536ffcf39744b2e98dc1ea2723ebf1d
2022-03-01 11:51:03 +00:00
Tsung-Mao Fang
27bef200be
Merge "Media permission update for Android T" into tm-dev
2022-03-01 03:27:00 +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
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
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
969625bc8e
Merge "Add setting for showing the vibrate icon in status bar" into tm-dev
2022-02-28 15:10: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
7e24127f12
Merge "Home Controls: Add Device Controls settings" into tm-dev
2022-02-25 16:19:30 +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
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
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
d3a7ec88a0
Merge "Refine A11y Tile Service javadoc" into tm-dev
2022-02-24 21:22:18 +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
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
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
31a5b89eef
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84
am: 3913e56dd9
-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: Id72c779f290a0e76622bc5dda67dca65c5c63998
2022-02-24 18:26:06 +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
TreeHugger Robot
a18ff15076
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2022-02-24 18:05:30 +00:00
TreeHugger Robot
24bd47eda7
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-02-24 18:00:29 +00:00
Lucas Silva
5e91b7eab3
Allow other layouts to be passed into the dream view adatper.
...
This will let the OOBE flow use a different layout than the regular
Settings view.
Bug: 221227402
Test: locally on device
Change-Id: I27545b7dad1d789adcae8589480d29bc5231c98c
2022-02-24 16:45:03 +00:00
Lucas Silva
c7709aebb3
Add dream descriptions to dream settings UI.
...
The dream descriptions will now be shown underneath the title, if the
dream has provided one.
We also cleaned up the icon view, instead merging it with the title view
to ensure proper alignment between the icon and title.
Bug: 221078654
Test: locally on device
Test: atest DreamPickerControllerTest
Change-Id: I00fd69c294f1a5fbcbc5392eba342f2896f6d9ed
2022-02-24 16:25:24 +00:00
Julia Reynolds
1d15b24da2
Merge "Remove unnecessary async" into tm-dev
2022-02-24 15:30:02 +00:00
TreeHugger Robot
fd9774a633
Merge changes from topic "presubmit-am-517a2e2cb73c439791517b439db33212" into sc-mainline-prod am: 2555e0d2e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934955
Change-Id: I6c5a360d12c0b093f960a4916173d6e58549cfbd
2022-02-24 13:56:58 +00:00
Bill Yi
23bac2fa39
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c
am: 8e58f10261
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934955
Change-Id: Ic540fe2f3bf75422c829fb89b022e69cc9535fad
2022-02-24 13:56:47 +00:00
Bill Yi
fd463afb87
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 41068978bb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934952
Change-Id: Iad43b14f466e956f7d7df3e6ff3cbff9b195d448
2022-02-24 13:52:48 +00:00
PETER LIANG
78310383b0
Merge "Polish and humanize the summary for Display/Font size." into tm-dev
2022-02-24 13:28:17 +00:00
Peter_Liang
e9b6679971
Polish and humanize the summary for Display/Font size.
...
Fix: 220071533
Test: manual test
Change-Id: Id09e97f23263bd118c461b6570165f55d62f9881
2022-02-24 13:26:13 +00:00
Marie Matheson
aa43d6f06b
Merge "Rename safety source ids to match format from other apps." into tm-dev
2022-02-24 12:56:23 +00:00
Yuri Ufimtsev
d27a463baf
Merge "Use FakeFeatureFactory in SafetySourceBroadcastReceiverTest" into tm-dev
2022-02-24 08:54:01 +00:00
Peter_Liang
f93bb8c7e8
Override the text size attribute of "Preview" in the text and reading options.
...
Fix: 220265332
Test: manual test
Change-Id: Ic06e3dd8b7464b1c09745b10c063a4cafbaf0e2d
2022-02-24 15:49:10 +08:00
Xiao Ma
2771fcaa8e
Merge "Adapt new EthernetManager APIs in Settings." am: 3340b8e3c3
am: b3fedd0633
am: 397b3fe978
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1968461
Change-Id: Ie5150b1987653c52d922af1a057df39553ccf7b4
2022-02-24 06:07:48 +00:00
Xiao Ma
397b3fe978
Merge "Adapt new EthernetManager APIs in Settings." am: 3340b8e3c3
am: b3fedd0633
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1968461
Change-Id: Ifd244bd60e65937c510a5447c9642225be400e3f
2022-02-24 05:46:28 +00:00
Xiao Ma
b3fedd0633
Merge "Adapt new EthernetManager APIs in Settings." am: 3340b8e3c3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1968461
Change-Id: Icc3b8d9fd42ee9712cfc81c74ae886576695ee2a
2022-02-24 05:22:10 +00:00
Xiao Ma
3340b8e3c3
Merge "Adapt new EthernetManager APIs in Settings."
2022-02-24 04:58:26 +00:00