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
78e47ccfa1
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: I688bfcc7872b7865631e9f96ecffe02bc16f9d75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 02:44:52 +00:00
Stanley Wang
a5bc0fd0db
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: I9eaec2b8a7cc4ff7838f259e4c059b3be52fba45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 02:44:09 +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
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
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
8bae7abc6a
[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: 3d592e4b7a -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: I06c165a663aade2f509b1e9bc15ebeda4cea67af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 23:15:02 +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
1aa06e3def
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9896cc4089 -s ours am: 6fcdbbeac5 -s ours am: e2f0df2e2b -s ours am: fba53c2569 -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: If24623272f61cb4414c7ddd7be84f80b7307378f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 22:45:26 +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
fba53c2569
[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: I05e379c071f17ba69facf60f301a46a5e9a018e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 22:20:51 +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
441b939fdb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f8009a8a13 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17845822
Change-Id: I4107999026e302ca9745fc107c79868c6e6cb2b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 20:18:03 +00:00
Bill Yi
6c24a77a6a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6d15f05d2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17845822
Change-Id: I4078cf7c1ee0138e810b24583d4b4bc90bffcfb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 20:17:34 +00:00
Bill Yi
7dd0963f58
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 6e3dbf4e89 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17845817
Change-Id: I1c2ae5a5a950bd1c311bd8b4b2ceafa7c824fb09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 20:17:15 +00:00
Bill Yi
eb215294d8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9381013a1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17845817
Change-Id: Ia3bfacb3b22077d5e2ad427f40abb48bb1ed8e39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 20:16:59 +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
3e01d3ba27
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 am: 483b735da8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886043
Change-Id: I05e424213ad6e12b209802578a159714ee38eac2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 16:59:32 +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
8242402834
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: I4de70cc4063af21a3263c0a0e5f32e10912241b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 16:19:19 +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
00e4cec078
Merge "Fix Live Caption does not follow caption size if caption is not enabled" into tm-dev am: 1ce6beb80f am: 86b7b541c8 am: c79146f0e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859333
Change-Id: I9c8b33cce94305bda200404ad73a1080c18bcd40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 13:57:43 +00:00
Menghan Li
9ce35ab472
Merge "Fine tune Caption size and style preview height for tablet" into tm-dev am: 2090748195 am: 3209314649 am: d80402cb69
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886944
Change-Id: I1b15efc23639c04b35206bf90f739f195978e086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 13:57:35 +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
c8ad8d1095
Merge "Fix Live Caption does not follow caption size if caption is not enabled" into tm-dev am: 1ce6beb80f am: d14121e919
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859333
Change-Id: I1326f80afb4db7ac3dbce3b44bf93b9138a813e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 13:41:44 +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
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
d14121e919
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: I490ca541e33e0c65ecac53700c2d248fcd496f04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 13:24:29 +00:00
Menghan Li
be78d76b8b
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: I76c9b76862f6a9c416acbc83f434610f18f69c6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 13:24:00 +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