Commit Graph

26009 Commits

Author SHA1 Message Date
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
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
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
PETER LIANG
62be1f278c Merge "Fix that the color of each option and subtext of Display size and text has the color difference." into tm-dev 2022-04-21 01:28:10 +00:00
Abel Tesfaye
cf601f574b Merge "Add accessibility string description for auto rotate" into tm-dev am: 3adc967449 am: 6aa417f742
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835757

Change-Id: I02147541619d5d5220687ddedf59bf33b2681a86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 21:46:46 +00:00
Abel Tesfaye
6aa417f742 Merge "Add accessibility string description for auto rotate" into tm-dev am: 3adc967449
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835757

Change-Id: Ic7821af2b92a2d93dac0533ee9b13e9ff8babf4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 21:37:53 +00:00
Abel Tesfaye
3adc967449 Merge "Add accessibility string description for auto rotate" into tm-dev 2022-04-20 21:31:23 +00:00
PETER LIANG
b579c1aa43 Merge "Should popup the confirmation toast after clicking the reset button." into tm-dev am: 8cb0439d9c am: cc4af05607 am: 37fa12e2d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822267

Change-Id: I078115b77edc9cd16a8ac4c5eb56f88b2048f2d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 14:07:51 +00:00
Bill Lin
be2b0b652e Merge "Set IME_FLAG_NO_EXTRACT_UI for ImeAwareEditText" into tm-dev am: 426f8a58e1 am: 7f0e76eed5 am: b8e2c1c1d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799713

Change-Id: I7d2ece7318a9b2364265d8c564ecc75d03b6b38b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 14:00:54 +00:00
PETER LIANG
37fa12e2d6 Merge "Should popup the confirmation toast after clicking the reset button." into tm-dev am: 8cb0439d9c am: cc4af05607
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822267

Change-Id: I74bb43797299b183a40f9050b6256e768361c7d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 13:20:24 +00:00
PETER LIANG
cc4af05607 Merge "Should popup the confirmation toast after clicking the reset button." into tm-dev am: 8cb0439d9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822267

Change-Id: I14be163454ca16655f88e1d9195e891e065c21bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 13:01:07 +00:00
PETER LIANG
8cb0439d9c Merge "Should popup the confirmation toast after clicking the reset button." into tm-dev 2022-04-20 12:37:22 +00:00
Bill Lin
b8e2c1c1d7 Merge "Set IME_FLAG_NO_EXTRACT_UI for ImeAwareEditText" into tm-dev am: 426f8a58e1 am: 7f0e76eed5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799713

Change-Id: I826e1d904b99e0f378bd5b2d51cc4516b583ba61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 12:17:15 +00:00
Bill Lin
7f0e76eed5 Merge "Set IME_FLAG_NO_EXTRACT_UI for ImeAwareEditText" into tm-dev am: 426f8a58e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799713

Change-Id: Id4c92e867feaeadef932fdbe49523c24a56d48d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 09:16:45 +00:00
Peter_Liang
c5551dc974 Fix that the color of each option and subtext of Display size and text has the color difference.
Change the android:selectable from false to true to avoid the title and summary impacted by color style.

Fix: 229560847
Test: manual test
Change-Id: Iec2ba560538a4f69f79198015bf6a24fb9a7caca
2022-04-20 16:29:36 +08:00
Peter_Liang
b833fe1bad Should popup the confirmation toast after clicking the reset button.
Goal: Users may not notice what the change after resetting all settings configs in the Text and reading options. So we will use the toast to give nice feedback for them.

Fix: 220126995
Test: make RunSettingsRoboTests  ROBOTEST_FILTER=TextReadingPreferenceFragmentTest
Change-Id: Ife42b0c9d8a0241d7b8c3e5dbe7f9f1e2a6d759a
2022-04-20 15:39:11 +08:00