Commit Graph

25970 Commits

Author SHA1 Message Date
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
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
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
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
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
Bill Lin
426f8a58e1 Merge "Set IME_FLAG_NO_EXTRACT_UI for ImeAwareEditText" into tm-dev 2022-04-20 06:17:35 +00:00
Peter_Liang
3954a79773 Prevent cutting the thumb of the LabeledSeekBarPreference from different themes.
Add the attribute “clipChildren” as false to avoid cutting.

Bug: 219415822
Test: manual test
Change-Id: I0c565896279111e65600d1b41c576106a8de7136
2022-04-20 13:18:56 +08:00
Menghan Li
4d749fca2b Merge "Fix wrong glifLayout padding for tablet resolution" into tm-dev am: 4d1e327457 am: 901c166927
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799717

Change-Id: I9d28328428f5720c6059de0c03ef01aa972714ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 04:33:12 +00:00
Menghan Li
52eeac802d Merge "Fix wrong glifLayout padding for tablet resolution" into tm-dev am: 4d1e327457 am: 88f77b41a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799717

Change-Id: I60e162d8889d087b091985c32be9542483944e36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 04:32:02 +00:00
Menghan Li
901c166927 Merge "Fix wrong glifLayout padding for tablet resolution" into tm-dev am: 4d1e327457
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799717

Change-Id: I98e81cc16c1b4790f864ac85d31c7608f9ea13ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 04:07:21 +00:00
Menghan Li
4d1e327457 Merge "Fix wrong glifLayout padding for tablet resolution" into tm-dev 2022-04-20 03:36:56 +00:00
Bill Lin
93d68ac7b5 Merge "Remove redundant margin from SudContentFrame" into tm-dev am: dc9df4db50 am: 3eb3923248
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799709

Change-Id: I54886bcc2c2464eb63fe5dd40c86a9bd3cb4bbaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 01:49:56 +00:00
Bill Lin
5b6017febb Merge "Remove redundant margin from SudContentFrame" into tm-dev am: dc9df4db50 am: 7acf8c21d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799709

Change-Id: I1542e4e22b2b8123f282574e193175d77d01d339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 01:49:31 +00:00
lbill
6a45659d7b Set IME_FLAG_NO_EXTRACT_UI for ImeAwareEditText
Without IME_FLAG_NO_EXTRACT_UI, device launch ChooseLockPassword
in some cases, mPasswordEntry will go to extrac UI which is
not compliance UI/UX design.

Test: make and check visual of com.android.settings.password
      ChooseLockPassword & SetupChooseLockPassword activities.
Bug: 222219535
Change-Id: I19777954b5edbc9064a8e930b84d2b4e8337c34a
2022-04-20 09:22:14 +08:00
Bill Lin
3eb3923248 Merge "Remove redundant margin from SudContentFrame" into tm-dev am: dc9df4db50
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799709

Change-Id: Ia8fc650c1cc7943b38aa8bb5d7470b9fbfb272b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 01:18:00 +00:00
Bill Lin
dc9df4db50 Merge "Remove redundant margin from SudContentFrame" into tm-dev 2022-04-20 01:15:18 +00:00
TreeHugger Robot
228c26e21a Merge "Remove config_showOperatorNameInStatusBar" into tm-dev am: 883f14f01a am: 952408cabe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17821437

Change-Id: I5bb7d93944b4c2ce482e178118b59335075b36b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 00:47:28 +00:00
TreeHugger Robot
6d8c5ea4af Merge "Remove config_showOperatorNameInStatusBar" into tm-dev am: 883f14f01a am: aed3b7950f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17821437

Change-Id: I7c621a8d3bf46f33f5e283439af49a44d2950cf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 00:47:25 +00:00
TreeHugger Robot
a5d6861390 Merge "Update auto-rotate strings/toggles for better accessibility" into tm-dev am: 07950adad9 am: 3f7f5386c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17767144

Change-Id: I56f2d65fadf3e9a0143e55532f71501a5d804dcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 00:32:23 +00:00
TreeHugger Robot
952408cabe Merge "Remove config_showOperatorNameInStatusBar" into tm-dev am: 883f14f01a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17821437

Change-Id: I5bb5e77892ef34b5528a4ea2b419234da1f96350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 00:24:26 +00:00
TreeHugger Robot
3f7f5386c5 Merge "Update auto-rotate strings/toggles for better accessibility" into tm-dev am: 07950adad9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17767144

Change-Id: I283f489b4422f5cbab61626214e575ac2255d25c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 00:24:08 +00:00
Abel Tesfaye
c4c027a89d Add accessibility string description for auto rotate
Bug: 221191444

Change-Id: Id82aed3dd648c2b116e831488a0c23fa3efe3ee3
2022-04-20 00:11:46 +00:00
TreeHugger Robot
883f14f01a Merge "Remove config_showOperatorNameInStatusBar" into tm-dev 2022-04-20 00:03:18 +00:00
TreeHugger Robot
07950adad9 Merge "Update auto-rotate strings/toggles for better accessibility" into tm-dev 2022-04-19 23:44:38 +00:00
Abel Tesfaye
238b2cc721 Update auto-rotate strings/toggles for better accessibility
This change will update some strings for smart-auto-rotate and replace
the activity based switchbar with SettingsMainSwitchPreference. The
switchbar had to be replaced to allow the new text to appear above the main toggle.

Test: locally with flame and with resolver service enabled & disabled

Bug: 220182618
Change-Id: I4b60bf006bdde9e47b33a52c7719ec770caf5746
Merged-In: I4b60bf006bdde9e47b33a52c7719ec770caf5746
2022-04-19 21:21:34 +00:00
Yasin Kilicdere
cdc0f7213d Merge "Revert "Revert "Remove the fallback AddSupervisedUserActivity.""" 2022-04-19 15:37:34 +00:00
Niklas Lindgren
87e2471ab6 Remove config_showOperatorNameInStatusBar
config_showOperatorNameInStatusBar has moved to
CarrierConfigManager.KEY_SHOW_OPERATOR_NAME_IN_STATUSBAR_BOOL

Bug: 116847905
Test: Build Product
Change-Id: Ia5e7b5e498ce33ffe58ff922ab3799a1b263a88b
2022-04-19 14:21:38 +00:00
menghanli
e488927e34 Fix wrong glifLayout padding for tablet resolution
Root cause: Override the padding by phone padding to caues inconsisstent
behahvior.
Solution: Remove the attributes

Bug: 229106829
Test: Manual testing in t6 (tablet) and raven (phone)
Change-Id: I583626a00088d36bda311087e8830f47e49a1152
2022-04-19 13:36:45 +08:00
Bill Yi
1feb4cf122 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-04-19 00:31:46 +00:00
Bill Yi
e0d214cabd Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-04-19 00:26:14 +00:00
Bill Yi
445dd2bd45 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-04-19 00:25:12 +00:00
Bill Yi
b9dd1a3a2d Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-19 00:22:17 +00:00
Bill Yi
168e7677f7 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-04-19 00:20:30 +00:00
TreeHugger Robot
db7228fd26 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-19 00:17:15 +00:00
TreeHugger Robot
647f7e081f Merge "Update dream settings strings with sensible char limits." into tm-qpr-dev am: 455bf0c881
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17802107

Change-Id: Iefd89ab4ac8f439915d6caf5ce87cae63571a671
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 22:06:54 +00:00
TreeHugger Robot
455bf0c881 Merge "Update dream settings strings with sensible char limits." into tm-qpr-dev 2022-04-18 21:50:38 +00:00
Peiyong Lin
fa6ecc7857 Merge "Clean up extra app info." into tm-dev am: bd26c3c747 am: fceaaa80a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17757962

Change-Id: Id490733f3fed747546e80d96031bc71508f32748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:44:47 +00:00
Peiyong Lin
9709e05a66 Merge "Clean up extra app info." into tm-dev am: bd26c3c747 am: f71c92bbb6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17757962

Change-Id: Ib6e82ca9a61dd489737f7044bd09c37ddc436861
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:44:20 +00:00