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
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
c79146f0e4
Merge "Fix Live Caption does not follow caption size if caption is not enabled" into tm-dev am: 1ce6beb80f
am: 86b7b541c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859333
Change-Id: Ia07708a483017cf91aca1d2ad873a1eb154a249c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 13:42:02 +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
86b7b541c8
Merge "Fix Live Caption does not follow caption size if caption is not enabled" into tm-dev am: 1ce6beb80f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859333
Change-Id: I6a57775ebb2b49067e6488c8f9526d069abc9ca9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 13:25:23 +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
1ce6beb80f
Merge "Fix Live Caption does not follow caption size if caption is not enabled" into tm-dev
2022-04-21 13:06:30 +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
TreeHugger Robot
5ff02d62de
Merge "[Settings] Code refactor for Lifecycle listening" into tm-dev am: a7e03159cb
am: c3ea2c20d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859345
Change-Id: I5015dec25f994cce0193da3c9a87c14a94dc3593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 09:41:40 +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
TreeHugger Robot
c3ea2c20d2
Merge "[Settings] Code refactor for Lifecycle listening" into tm-dev am: a7e03159cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859345
Change-Id: Ifa819b3296a90f9b15ff0246ada10530fb6534db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 09:18:20 +00: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
menghanli
0d47c548d9
Fix Live Caption does not follow caption size if caption is not enabled
...
Root cause: Changing captions style without turning on the preference WHILE Live Caption is running works when it shouldn't.
Solution: Turn on the show caption if users change caption size and style by UX suggestion.
Bug: 221051127
Test: Manual testing
1. Turning on/off Live Caption and Caption Manager
2. Changing styles when Caption Manager is off
Change-Id: Ie6cfb9e0b7325c2e469ac8b6a7d359b843cc173a
2022-04-21 17:01:15 +08:00
Neil Fuller
131d297dbd
Merge "Fix logic used for auto time zone settings" into tm-qpr-dev
2022-04-21 08:33:06 +00:00
TreeHugger Robot
a7e03159cb
Merge "[Settings] Code refactor for Lifecycle listening" into tm-dev
2022-04-21 08:07:49 +00:00
Stanley Wang
2b7cadac12
Fix the problem that apps can read SIM card information through
...
screenshots.
Fix: 217377618
Test: manually test and review the UI
Change-Id: I645c4acc9943a17430889dfeee064a42178870ec
2022-04-21 14:02:11 +08:00
Joshua McCloskey
10d0cd52d6
Modified Fp -> Face setup flow
...
Test: Skip FP, Enroll Face, hit back button, observe that you will go
back to Fingerprint enrollment.
Test: Verify that after completing a biometric enroll we no longer
show the introduction activity with a "Done" button.
Fixes: 229813512
Change-Id: Ie0d7ce5d5cef084b3614afce10e05dc72c86b492
2022-04-21 03:59:39 +00: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
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
Menghan Li
8b1f3b0628
Merge "Fix quick settings tooltip changed when color correction fab clicked" into tm-dev am: ef9178146c
am: bf9232739a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799712
Change-Id: I7e00f6edb80abef178d39f8eda3016de35632a00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 21:46:36 +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
Menghan Li
bf9232739a
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: I94c80193a6e51effbb21fcb53d4126628f352172
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 21:28:32 +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
Bonian Chen
81d230b250
[Settings] Code refactor for BroadcastReceiver under Lifecycle
...
This is an implementation of BroadcastReceiver which supported by
LifecycleCallbackConverter.
Registration of BroadcastReceiver only take place when Lifecycle in
RESUME status.
Bug: 229689535
Test: unit test
Change-Id: Ia2af82d5cbb391034627e5259a9e0c8683a0c5a1
(cherry picked from commit c2030898ef
)
2022-04-20 16:54:41 +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
Bonian Chen
3856ac4be9
[Settings] Code refactor for async Lifecycle listening
...
This is an extension of LifecycleCallbackAdapter.
A postResult(T) and a Consumer<T> is designed for supporting pass result
back to UI thread, and is invoked only when required.
Bug: 229689535
Test: unit test
Change-Id: I0ef5afc31cd23aa865a2dd1d05f9b212242c2e41
(cherry picked from commit 5d2a76cbb4
)
2022-04-20 12:47:39 +00:00
Bonian Chen
37a326bd3e
[Settings] Code refactor for Lifecycle listening
...
This is an abstract class for building a set of callback behavior
based on Lifecycle status change.
Through extending this class, the implemented methods are invoked
only when required.
Bug: 229689535
Test: unit test
Change-Id: I7534393546f821738a63ebde121a5a88ee03b23b
(cherry picked from commit 9a4c66d23b
)
2022-04-20 12:46:26 +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
TreeHugger Robot
b52b7e797a
Merge "Check null BT profile to prevent crash" into tm-dev am: f792528a8f
am: 7906685ce3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822265
Change-Id: I5ffe17cbfb8f0ce475866c786d8423e9ac11ccae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 12:23:32 +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 Yi
338893d6bf
[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: 15e7eb7203
-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: Ic19659624c96c7a82383ed59eeaf130e92a0f726
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 12:15:57 +00:00
Bill Yi
01d9af3b7b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 442f62eb55
-s ours am: 5e99e584f5
-s ours am: a20fed1d1c
-s ours am: a3f7f1e2d3
-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: I47800129ad56b6c4aaa505793f8b92efe3f42cc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 12:15:55 +00:00
Bill Yi
bd48eefab5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64a0937f54
-s ours am: 9d597ae5b0
-s ours am: cc6641c043
-s ours am: a9d2537dd3
-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: I19284e0bcf5d1ad7e7d0a66a8e98993044efacbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 11:49:08 +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
7906685ce3
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: If973fe7c16a0e95e427d9a8ac87dda932ce836eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 09:17:21 +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
Bill Yi
15e7eb7203
[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: Ie58a8685aa939716c4ef151c77806e8ae8c8484e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 09:15:28 +00:00
Bill Yi
a3f7f1e2d3
[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: Ia6b36eadbe9b183987fcbf3fd4dec6f34938e721
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 09:15:27 +00:00
Bill Yi
a9d2537dd3
[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: Ib3032d5101f8e2f2b2f7e4a199811f818e878d27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 09:10:42 +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