Abel Tesfaye
6cda44f810
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: I2d2fe276a2d0841da10c15e6a3a7dada1dc69d9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 21:36:44 +00:00
Abel Tesfaye
3adc967449
Merge "Add accessibility string description for auto rotate" into tm-dev
2022-04-20 21:31:23 +00:00
Menghan Li
caf42f2cc7
Merge "Fix quick settings tooltip changed when color correction fab clicked" into tm-dev am: ef9178146c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799712
Change-Id: I7a88099ca0aac552e8608bf3d066ff1030f9f1d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 21:27:14 +00:00
Menghan Li
ef9178146c
Merge "Fix quick settings tooltip changed when color correction fab clicked" into tm-dev
2022-04-20 21:05:29 +00:00
PETER LIANG
eff73403b7
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: I543d48929fffe3e7da4f218bcf99a7feeca143e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 15:01:57 +00:00
TreeHugger Robot
a02cd9a9a6
Merge "Check null BT profile to prevent crash" into tm-dev am: f792528a8f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822265
Change-Id: I4da83ee7f9175771ae83660daacffd9528911e40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 14:58:39 +00:00
Bill Lin
2f571e625b
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: If52256798af1ea847e4106939a424695c8ca27e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 14:56:37 +00:00
Bill Yi
1387d55ef6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 052970997d
-s ours am: c88b882013
-s ours am: 2e39766a1f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801571
Change-Id: Idd019c9a58d2d6c6ae77e7cbb7fe49caab4a969c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 14:54:39 +00:00
Bill Yi
e40f48737c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 442f62eb55
-s ours am: 5e99e584f5
-s ours am: a20fed1d1c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801571
Change-Id: Ifbbfd334549063018382a15eadf92793eefe1df1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 14:54:38 +00:00
Bill Yi
58b1768062
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64a0937f54
-s ours am: 9d597ae5b0
-s ours am: cc6641c043
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801771
Change-Id: I1a275c4accf1366db2fe012dc11202a1ab30bfb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 14:51:11 +00:00
Xin Li
f6cf1a9647
[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 99d834b0b8
-s ours am: 024fe4b39a
-s ours am: 39e1357748
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17805671
Change-Id: I32af4fccfe0a22eeac73c78cf6420a2b0f5bc77d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 13:05:28 +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
menghanli
a9e6e8c811
Fix quick settings tooltip changed when color correction fab clicked
...
Root cause: Users click on color correction fab to make foreground activity recreate. When recreated, the ag/13472947 makes the MainSwitch updates to ON status and get the callback for #onPreferenceToggled. It pops up the direct-use style tooltip rather than the edit style tooltip.
Soluton: Reference #updateSwitchBarToggleSwitch to early returns if values are same.
Bug: 229167631
Test: Manual testing
Change-Id: I6781fd509db7538898ad6ff0ae47124c9b9e1bc5
2022-04-20 19:18:43 +08:00
TreeHugger Robot
f792528a8f
Merge "Check null BT profile to prevent crash" into tm-dev
2022-04-20 07:43:49 +00: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
Bill Yi
2e39766a1f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 052970997d
-s ours am: c88b882013
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801571
Change-Id: I2edb7f5be9795a90d85fe3a328c870df2278a761
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 06:12:31 +00:00
Bill Yi
a20fed1d1c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 442f62eb55
-s ours am: 5e99e584f5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801571
Change-Id: I754ea0efc92ac2178e7d6b64773e46536109897f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 06:12:30 +00:00
Bill Yi
cc6641c043
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64a0937f54
-s ours am: 9d597ae5b0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801771
Change-Id: I7ecd596c4f3d96940cca64a5296acc451039d79c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 06:06:21 +00:00
Hugh Chen
76e230918f
Check null BT profile to prevent crash
...
Bug: 229802811
Test: build pass
Change-Id: Idf9f32ec08793784fbce05d34c53cdf53cddb312
2022-04-20 04:53:23 +00:00
Xin Li
39e1357748
[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 99d834b0b8
-s ours am: 024fe4b39a
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17805671
Change-Id: I129b65c2db67aa72a0f3d4de00b598e2fa64e09f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 04:47:34 +00:00
Menghan Li
88f77b41a0
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: Iba1caf88eff20ea946c5869a9f862c8dac7f3350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 04:06:41 +00:00
Menghan Li
4d1e327457
Merge "Fix wrong glifLayout padding for tablet resolution" into tm-dev
2022-04-20 03:36:56 +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
7acf8c21d8
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: Iaab47c22d99b09b861745f98d7daaf795c8e4637
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 01:17:12 +00:00
Arc Wang
5202c0db9e
Merge "Fix ManageStoragePreferenceController always consume click event" into tm-dev am: 96491e1ea9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799722
Change-Id: I34d9dbd74d2c11fdd721bb0308920b706065ce9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 01:16:54 +00:00
Bill Lin
dc9df4db50
Merge "Remove redundant margin from SudContentFrame" into tm-dev
2022-04-20 01:15:18 +00:00
Arc Wang
96491e1ea9
Merge "Fix ManageStoragePreferenceController always consume click event" into tm-dev
2022-04-20 00:54:15 +00:00
TreeHugger Robot
aed3b7950f
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: Ib53561fb5d6ae2f92663b2262a3c5a178e882568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 00:24:26 +00:00
TreeHugger Robot
50c155b5f5
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: I36122846bbb6146f1861f62420d5891c4e05c50d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 00:23:25 +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
TreeHugger Robot
527f4141a4
Merge "Not relaunch BiometricEnrollActivity durng SUW" into tm-dev am: cc27e34330
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799708
Change-Id: I7daba8645a67bf284a42ad673673c60c10b22c31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 17:28:21 +00:00
TreeHugger Robot
cc27e34330
Merge "Not relaunch BiometricEnrollActivity durng SUW" into tm-dev
2022-04-19 17:02:54 +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
Arc Wang
ea4260c0e7
Fix ManageStoragePreferenceController always consume click event
...
ManageStoragePreferenceController should only consume click
event when its preference key matches the key of the clicked
preference.
Bug: 228970667
Test: atest ManageStoragePreferenceControllerTest
Change-Id: Ia6c62cf457fc4cadc27dc160dbd9b04ec3392d68
2022-04-19 17:35:05 +08:00
TreeHugger Robot
2a85dfb5f4
Merge "Fix UiBlcoker regression" into tm-dev am: 0f23863e33
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799706
Change-Id: I7ecfd7962d090f413c420e44843e64a803afc7fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 09:33:53 +00:00
TreeHugger Robot
0f23863e33
Merge "Fix UiBlcoker regression" into tm-dev
2022-04-19 09:11:51 +00:00
Tsung-Mao Fang
11979785a6
Merge "Do not expose wifi slice when no permission" into tm-dev am: ccb8855b98
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17536305
Change-Id: I76677681736cd4677c5f2b253374bda03b406a81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 08:13:05 +00:00
TreeHugger Robot
48086b485a
Merge "Fix transparency seekbar is enabled while fade feature is disabled." into tm-dev am: fbaa9f3faa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799714
Change-Id: Ic75a7db85df442e83a5d34aeb2e1ceb76d36105b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 08:12:58 +00:00
Tsung-Mao Fang
ccb8855b98
Merge "Do not expose wifi slice when no permission" into tm-dev
2022-04-19 08:12:37 +00:00
Tsung-Mao Fang
821608c5be
Do not expose wifi slice when no permission
...
Prior to this cl, slice provider always exposes wifi slice
to calling package without confirming any wifi permissions.
For current solution, we will check calling package's permission state
and decide whether slice provider should expose wifi slice or not.
Because settings search is a part of settings app,
this permission checker won't be applied to settings intelligence.
Test: manual, robotest, cts
Also run manul
Bug: 178014725
Change-Id: I2770b5b43366a5aa65c7519efc4243d350a21b26
2022-04-19 08:07:35 +00:00
TreeHugger Robot
fbaa9f3faa
Merge "Fix transparency seekbar is enabled while fade feature is disabled." into tm-dev
2022-04-19 07:52:35 +00:00
Yi-Ling Chuang
61022c6419
Fix UiBlcoker regression
...
We determine if the visibility should be updated by mIsFirstLaunch, and
mIsFirstLaunch is set to false in onStop(). This breaks the updatability
if there's a change before onStop() gets called.
So we move the value assignment to the end of checkUiBlocker() because
at that time, all blocker work should be either finished or timeout.
Also remove mIsFirstLaunch since mUiBlockerFinished can cover the
determination with the new design.
Fixes: 229565193
Test: Toggle Use Location in the location page and see the Recent used
section react accordingly.
Change-Id: Id6005e5b8b29cb8a6309068d0a2177489a3fb2f4
2022-04-19 15:12:29 +08: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
TreeHugger Robot
d3631c74f9
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-04-19 05:14:46 +00:00
Milton Wu
a4f30404f0
Not relaunch BiometricEnrollActivity durng SUW
...
Biometric fingerprint flow is abnormal because BiometricEnrollActivity
is relaunched during SUW because diplay or orientation is changed.
Bug: 205059704
Bug: 228812876
Test: atest BiometricEnrollActivityTest
Test: Before clicking "No thanks" manully unfold or rotate device on the
fingerprint setup screen of SUW
Change-Id: If0abe785c74c7fb40da779af166d79eeba6ad57f
2022-04-19 03:48:22 +00:00
TreeHugger Robot
0e3e447e11
Merge "Read CarrierConfig to get operator name" into tm-dev am: b1bdc42d52
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17800680
Change-Id: Ib92b74a86651a2f5df36b5584ad06305197f99b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 02:15:43 +00:00