Chaohui Wang
f94aedc6a3
Merge "Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver" into tm-dev am: 932d5deaff
am: 1dd8117b21
am: 921f561964
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835758
Change-Id: Iea3c0da40719f23c3cfe236ba6f6bce4a297f285
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 03:38:50 +00:00
Stanley Wang
d883e54c6f
Merge "Fix the problem that apps can read SIM card information through screenshots." into tm-dev am: 2e2a484a88
am: 1f2337d627
am: 8d3cf3efba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859356
Change-Id: I9ce1e3124523d1f3cf48a4666241315cb44f8f21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 03:38:26 +00:00
Chaohui Wang
f1848c19f5
Merge "Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver" into tm-dev am: 932d5deaff
am: 956f0a8cc2
am: 148b586d1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835758
Change-Id: I3070e0e29ecdd920b970dec2e428e108773effd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 03:37:37 +00:00
Stanley Wang
baf930a104
Merge "Fix the problem that apps can read SIM card information through screenshots." into tm-dev am: 2e2a484a88
am: 18206def81
am: c57825f409
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859356
Change-Id: I20f32ff5034893ee2df88751c18851c02719d355
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 03:36:39 +00:00
Chaohui Wang
62702c7c6c
Merge "Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver" into tm-dev am: 932d5deaff
am: 956f0a8cc2
am: e6adea223c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835758
Change-Id: I04b164c903cc125b0a7e3cd12fef43d0ed2eff51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 03:27:23 +00:00
Stanley Wang
275f73f0f2
Merge "Fix the problem that apps can read SIM card information through screenshots." into tm-dev am: 2e2a484a88
am: 18206def81
am: 0f2adc2166
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859356
Change-Id: I55a0802d79317ee9ccf037e19e9121122bf606b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 03:26:54 +00:00
Chaohui Wang
921f561964
Merge "Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver" into tm-dev am: 932d5deaff
am: 1dd8117b21
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835758
Change-Id: I18c6371fbce27bf756f7b909f824bc50ab35b8db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 03:11:49 +00:00
Stanley Wang
8d3cf3efba
Merge "Fix the problem that apps can read SIM card information through screenshots." into tm-dev am: 2e2a484a88
am: 1f2337d627
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859356
Change-Id: I231576223d8b68923b2234bd6c73edfdd22c02a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 03:11:43 +00:00
Chaohui Wang
e6adea223c
Merge "Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver" into tm-dev am: 932d5deaff
am: 956f0a8cc2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835758
Change-Id: I5e359cdb6af0e6845544c03dba06d1fd2b8cf520
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 03:11:39 +00:00
Chaohui Wang
148b586d1a
Merge "Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver" into tm-dev am: 932d5deaff
am: 956f0a8cc2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835758
Change-Id: I0debef41eb3f5da06f7c875ed4d787dd3b013557
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 03:11:39 +00:00
Stanley Wang
0f2adc2166
Merge "Fix the problem that apps can read SIM card information through screenshots." into tm-dev am: 2e2a484a88
am: 18206def81
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859356
Change-Id: I56cca0c9d5d7baf8b316a22ba6e5125874cb5395
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 03:11:33 +00:00
Stanley Wang
c57825f409
Merge "Fix the problem that apps can read SIM card information through screenshots." into tm-dev am: 2e2a484a88
am: 18206def81
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859356
Change-Id: I63e119964d7b9b99c7bb1d4d0bafc4cf13745390
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 03:11:32 +00:00
Chaohui Wang
956f0a8cc2
Merge "Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver" into tm-dev am: 932d5deaff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835758
Change-Id: I36dbc24d358252cbc935eec76e23287e774823dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 02:35:55 +00:00
Stanley Wang
18206def81
Merge "Fix the problem that apps can read SIM card information through screenshots." into tm-dev am: 2e2a484a88
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859356
Change-Id: Ia0b0ec3b7a772d241112cc7f45d42a677de4a827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 02:35:46 +00:00
Chaohui Wang
1dd8117b21
Merge "Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver" into tm-dev am: 932d5deaff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835758
Change-Id: Ib5d994aa207584d817e4a06036727edb1113d47d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 02:34:27 +00:00
Stanley Wang
1f2337d627
Merge "Fix the problem that apps can read SIM card information through screenshots." into tm-dev am: 2e2a484a88
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859356
Change-Id: Id91cf96b271c50600936e35c39cddafc10b8d33d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 02:34:14 +00:00
Chaohui Wang
932d5deaff
Merge "Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver" into tm-dev
2022-04-22 02:15:23 +00:00
Stanley Wang
2e2a484a88
Merge "Fix the problem that apps can read SIM card information through screenshots." into tm-dev
2022-04-22 02:08:12 +00:00
Xiaowen Lei
54b996c88b
Merge "Set "screensaver" as synonym of "Screen saver" for Settings search." into tm-qpr-dev am: d06a66be9f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17890050
Change-Id: I0389695bfb0210181963a6c6507524b00f6f9884
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 01:45:48 +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
3d592e4b7a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9896cc4089
-s ours am: 6fcdbbeac5
-s ours am: e2f0df2e2b
-s ours am: 5ff67942e7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17845819
Change-Id: Ic13ecff661de7d1fe4163800cb28511d5fb7b535
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 22:45:53 +00:00
Bill Yi
5ff67942e7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9896cc4089
-s ours am: 6fcdbbeac5
-s ours am: e2f0df2e2b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17845819
Change-Id: Id41039c2f2cad58516035cfa28d8255b36a6cd05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 22:21:54 +00:00
Bill Yi
e2f0df2e2b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9896cc4089
-s ours am: 6fcdbbeac5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17845819
Change-Id: I3b7bd4377446fe3aa6ff6f45ffeabbec177f243d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 21:52:59 +00:00
Abel Tesfaye
8814d96884
Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver
...
Controllers are automatically bound to a lifecycle if registered in the xml file. Manually binding a lifecycle can cause multiple receivers to be unregistered/registered. Removing the manual binding will prevent this case from causing a potential exception.
Bug: 227762968
Test: none
Change-Id: I9c8ddc6f82b19cd4a9c8a4aec3c9c744935cd542
2022-04-21 21:31:03 +00:00
Bill Yi
6fcdbbeac5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9896cc4089
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17845819
Change-Id: Iccbbd4929788c7a64c6b3aeb9a318684054eb07e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 21:29:09 +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
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