Abel Tesfaye
3fb18c1505
Merge "Merge auto-rotate comment/style fixes from tm-dev that couldn't be cherry picked into master"
2022-04-29 00:02:36 +00:00
Lais Andrade
82a3146c23
Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev am: 9c8d1e94fb
am: c09c49fcf2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914337
Change-Id: I4a46a73c2901720829056efa3c5d70ad89fb1114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 00:15:40 +00:00
TreeHugger Robot
930315e23a
Merge "Make the checkbox item large enough to click." into tm-dev am: 9fd4377ddb
am: f468355b99
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950068
Change-Id: I172be05706cc279e66485496360403ebd6bec731
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 00:12:21 +00:00
TreeHugger Robot
a5ffbc5862
Merge "Fix collapsing toolbar can't collapse problem" into tm-dev am: 5395a4eb28
am: 505a0b8798
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944164
Change-Id: I3cd7fc454d81ac28ebb997d9b02b43ffe5755201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 00:11:13 +00:00
Lais Andrade
9c8d1e94fb
Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev
2022-04-27 13:54:13 +00:00
TreeHugger Robot
9fd4377ddb
Merge "Make the checkbox item large enough to click." into tm-dev
2022-04-27 13:51:14 +00:00
TreeHugger Robot
5395a4eb28
Merge "Fix collapsing toolbar can't collapse problem" into tm-dev
2022-04-27 12:46:52 +00:00
Sunny Shao
d790fa2800
Fix collapsing toolbar can't collapse problem
...
- Use the NestedScrollView instead of ScrollView.
Fixes: 216276444
Test: manual test
Change-Id: I3872bcc2f165ba8cf55f1782aa76f59adde5d3aa
2022-04-27 15:51:45 +08:00
Angela Wang
11dc02d115
Make the checkbox item large enough to click.
...
When checkbox display contents in a single line, the clickable area is
less than 48dp and making it hard to click. Setting the minimum height to 48dp can ensure the clickable area is large enough.
Bug: 226538268
Test: manual test
Change-Id: I341455bc98415bfe9292ff5ba4cf6c2153d487d7
2022-04-27 06:30:59 +00:00
TreeHugger Robot
37c4a74b27
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-04-27 02:31:39 +00:00
Chaohui Wang
815ee3779b
Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0
am: 334335bc6a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523
Change-Id: I87294478784f6518f58e57aaeba0eef5af5b0297
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 07:26:55 +00:00
Chaohui Wang
1a39660de0
Merge "Update Personal / work selection UI." into tm-dev
2022-04-26 06:34:37 +00:00
Jason Chiu
704689ab04
Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed
am: 50893331e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935
Change-Id: I0ded6982be5c1d1334eaf8157de629505a1ebcf8
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 06:27:38 +00:00
Jason Chiu
81ee2037ed
Merge "Renew the highlight state color" into tm-dev
2022-04-26 06:08:40 +00:00
Hugh Chen
00a8568b1b
Merge "Implement advanced vpn ui in vpn settings"
2022-04-26 05:33:27 +00:00
Abel Tesfaye
939e0e0d9d
Merge auto-rotate comment/style fixes from tm-dev that couldn't be cherry picked into master
...
Test: none
Bug: 230378938
Change-Id: Ia0e9e5bf25d005aa6b8ccaa07a1901779b88588c
2022-04-25 23:16:45 +00:00
Lais Andrade
cc8790f7b3
Create separate On/Off string resources for Vibration & haptics
...
Some translators need to be able to adapt the text for On/Off preference
state to match the preference title "Vibration & haptics", which
requires a different inflection and plural form on some languages.
This change separates this resource string from the more generic one
that was used before to allow this flexible translation.
Fix: 228342641
Fix: 229060423
Test: VibrationPreferenceControllerTest
Change-Id: Ib46b3e0d0a980ff57e91f55c73348c440327bad7
2022-04-25 17:15:39 +01:00
Chaohui Wang
f250493787
Update Personal / work selection UI.
...
Implement the new-look by using AlertDialog's
custom title and custom view.
Using the RecyclerView so we can display profile
horizontally.
Bug: 174626616
Test: manual & robolectric
Change-Id: I9f5a7685d9217fc62e01799ad73f9b9a3ddbf19a
2022-04-25 19:12:38 +08:00
Betty Chang
dc9c797a2f
Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev am: 662a45bc0a
am: 38ca4482f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684389
Change-Id: Id806faaff3aada169a9deadc2cbdd4298f6a315f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 10:58:00 +00:00
Betty Chang
662a45bc0a
Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev
2022-04-25 10:39:42 +00:00
Hugh Chen
cf210dd00b
Implement advanced vpn ui in vpn settings
...
Bug: 220684478
Test: atest -c VpnSettingsTest
Change-Id: If89de16d02cb8b1f387b8f388f8fcf82ad39066b
2022-04-25 07:59:13 +00:00
Jason Chiu
880471a1b0
Renew the highlight state color
...
Fix: 230283855
Test: visual
Change-Id: I725422518d07a0b0676731bd9da8384ab149ab1b
2022-04-25 15:34:42 +08:00
changbetty
d1d9798a5d
[LE Audio] Add entry point in Media Volume slice for broadcast sink
...
Bug: 228274114
Test: make RunSettingsRoboTests
Test: Manual test
Change-Id: I331232c30291348faf7166d4de8060a1cfe12bff
2022-04-25 02:42:46 +00:00
Bill Yi
3f51a847ff
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic5d11353374e71949e9ef2300c55c90958c2cb06
2022-04-24 09:15:34 +00:00
TreeHugger Robot
6585a18362
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-04-22 22:29:26 +00:00
TreeHugger Robot
642cacec6a
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-04-22 22:29:26 +00:00
Bill Yi
bfd3ced372
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-04-22 06:17:37 +00:00
Bill Yi
3ec36ec5c1
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-04-22 06:17:37 +00:00
Xiaowen Lei
5d3b0f46e3
Merge "Set "screensaver" as synonym of "Screen saver" for Settings search." into tm-qpr-dev am: d06a66be9f
am: 54b996c88b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17890050
Change-Id: I5f07563d7879226c84c8017fa058267d7cee1729
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 02:26:22 +00:00
Xiaowen Lei
d06a66be9f
Merge "Set "screensaver" as synonym of "Screen saver" for Settings search." into tm-qpr-dev
2022-04-22 00:49:40 +00:00
Bill Yi
f8009a8a13
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-04-21 19:20:03 +00:00
Bill Yi
6e3dbf4e89
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-04-21 19:20:03 +00:00
PETER LIANG
483b735da8
Merge "Fine-tune the location and style of the reset button in the “Display size and text” page." into tm-dev am: 8c78bad4e6
am: 73dcf5c0f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886043
Change-Id: Ia8246891c13f375cd3655f3432bdab967ac469de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 16:43:14 +00:00
PETER LIANG
3360338081
Merge "Fine-tune the location and style of the reset button in the “Display size and text” page." into tm-dev am: 8c78bad4e6
am: 8242402834
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886043
Change-Id: Ia62ea383c3c8cbb32a62f592cf645b8b5df4f83b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 16:42:53 +00:00
Xiaowen Lei
8b6e115629
Set "screensaver" as synonym of "Screen saver" for Settings search.
...
Also set android:id attribute for Screen saver preference screen.
When the attribute is unset, the search result is removed.
Bug: 229106045
Fix: 229106045
Test: on device. Forced Settings search re-indexing.
Change-Id: Ibaff9baacb28ecc5b41ac9c1e264b4ab28a83ce9
2022-04-21 16:27:33 +00:00
PETER LIANG
73dcf5c0f0
Merge "Fine-tune the location and style of the reset button in the “Display size and text” page." into tm-dev am: 8c78bad4e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886043
Change-Id: I03f2f2ef3ff5f65c0a3b714abbdd090af8396d8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 16:20:14 +00:00
PETER LIANG
8c78bad4e6
Merge "Fine-tune the location and style of the reset button in the “Display size and text” page." into tm-dev
2022-04-21 16:06:44 +00:00
Menghan Li
d80402cb69
Merge "Fine tune Caption size and style preview height for tablet" into tm-dev am: 2090748195
am: 3209314649
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886944
Change-Id: I2dbf2925d57a3cc7fef3708fc365f0c437d187ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 13:41:56 +00:00
Menghan Li
ec2bf30db9
Merge "Fine tune Caption size and style preview height for tablet" into tm-dev am: 2090748195
am: be78d76b8b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886944
Change-Id: I693b7b52baf23cf0980b41766a9d0179e1856920
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 13:41:26 +00:00
Menghan Li
3209314649
Merge "Fine tune Caption size and style preview height for tablet" into tm-dev am: 2090748195
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886944
Change-Id: I85691ff2e25e3fc10ccec6d5e09cdfb864655752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 13:24:58 +00:00
Menghan Li
2090748195
Merge "Fine tune Caption size and style preview height for tablet" into tm-dev
2022-04-21 13:06:13 +00:00
menghanli
d44da3b959
Fine tune Caption size and style preview height for tablet
...
Root cause: We introduce the material design illustration in Android S. The most of illustration preview height is 300dp, but the SubTitleView preview keep 200dp in the phone and 150dp in tablet. The value is defined in 2017.
Solution: Align material design illustration height which looks a lot closer to an actual video, without pushing too much content below the screen.
Bug: 227264630
Test: Manual testing
Change-Id: I1a9040f50dfb6fb95c1cadbe4e7e4d24ff8ab058
2022-04-21 17:24:37 +08:00
Peter_Liang
7f67e278ca
Fine-tune the location and style of the reset button in the “Display size and text” page.
...
Bug: 222419452
Test: manual test
Change-Id: I9099f13c715ce29cce8d52f6ca9cc47a4fa22306
2022-04-21 17:09:10 +08:00
PETER LIANG
b68aa851ea
Merge "Prevent cutting the thumb of the LabeledSeekBarPreference from different themes." into tm-dev am: e774a70cba
am: 01655dec4f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822266
Change-Id: I18239a84c15f1c9ea078afe885533a8983adc619
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 02:32:23 +00:00
PETER LIANG
e12ddd0efb
Merge "Fix that the color of each option and subtext of Display size and text has the color difference." into tm-dev am: 62be1f278c
am: 9e608223e2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822268
Change-Id: I87eddeac1b52dffbffacf9278780fef676dff09f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 02:32:17 +00:00
PETER LIANG
4c4e06bf4e
Merge "Prevent cutting the thumb of the LabeledSeekBarPreference from different themes." into tm-dev am: e774a70cba
am: a70eecc2b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822266
Change-Id: Id49cce5ab448b64a6a6cf12e9136d7591d0db440
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 02:31:50 +00:00
PETER LIANG
3bdd82f75b
Merge "Fix that the color of each option and subtext of Display size and text has the color difference." into tm-dev am: 62be1f278c
am: 50a6b46f51
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822268
Change-Id: I939a5bde83a2e23aa1c20b5e726a974e6c648b38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 02:31:28 +00:00
PETER LIANG
01655dec4f
Merge "Prevent cutting the thumb of the LabeledSeekBarPreference from different themes." into tm-dev am: e774a70cba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822266
Change-Id: Ia6502d8639ef27d0a70a10217797a39dfe9dff47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 02:04:14 +00:00
PETER LIANG
9e608223e2
Merge "Fix that the color of each option and subtext of Display size and text has the color difference." into tm-dev am: 62be1f278c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822268
Change-Id: I04cd5142410af1d2d948cc33abe0c83ea8f4900b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 02:04:00 +00:00
PETER LIANG
e774a70cba
Merge "Prevent cutting the thumb of the LabeledSeekBarPreference from different themes." into tm-dev
2022-04-21 01:35:25 +00:00