Bill Yi
8a9c502802
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3ec36ec5c1
-s ours am: 9ea6d0e609
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17837668
Change-Id: Ie39ff0e257acab9d06fb32f8f4e296728e7d768d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:21:16 +00:00
Bill Yi
4061677234
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f7be3a07f
-s ours am: 8c88568430
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17837668
Change-Id: I7645079f4dcb9d80f320713d12e672dc619f4721
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:20:55 +00:00
TreeHugger Robot
ac7f4cf8c5
Merge "[Settings] Code refactor for async Lifecycle listening" into tm-dev am: 49cc66afd3
am: 21a233b016
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859346
Change-Id: Idbee1f13bcc52dfdbc664ed25e411ae79f6df8bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:20:06 +00:00
TreeHugger Robot
5c7d0155a8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 226baf6f25
-s ours am: 7d5cc42c81
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024
Change-Id: Ie68d6b19f8c300ed29b40d45f4e50cf92718a5ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:19:41 +00:00
Bill Yi
e74c40fc84
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af08983841
-s ours am: f1b797ac9b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024
Change-Id: I4826b58bb2c00972c0ed25f0db452c6fd37914d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:19:22 +00:00
Bill Yi
297c6c02a8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: bfd3ced372
-s ours am: 430feee676
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17838663
Change-Id: I7c829039a1ef8ef60d645905d1e878b91b00fb9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:05:25 +00:00
Bill Yi
f9cd80a484
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e14416d5a3
-s ours am: a4dc078791
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17838663
Change-Id: Ic47f946233130e410cab93845956c298a2c615a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:04:57 +00:00
Bill Yi
e6e9f5cf87
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3ec36ec5c1
-s ours am: 304ef2074f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17837668
Change-Id: I774e118ec5f55034787c12c1a6eb95d4a7dc7613
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:04:39 +00:00
Bill Yi
a1be6fe405
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f7be3a07f
-s ours am: 4a4c5fd413
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17837668
Change-Id: I6607b2cb58c573607fc214e8c2c3defd79aa5c80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:04:23 +00:00
TreeHugger Robot
56c72e3ede
Merge "[Settings] Code refactor for async Lifecycle listening" into tm-dev am: 49cc66afd3
am: fb74f218a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859346
Change-Id: Idd9710b2a3c346e2da1d024d526fc422e8d14d22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:01:44 +00:00
TreeHugger Robot
46f1b16545
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 226baf6f25
-s ours am: 7d5cc42c81
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024
Change-Id: I21c5b9f71dcba7f7eb9a394b8f9bd7fad1aa920d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:00:57 +00:00
Bill Yi
2affff9747
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af08983841
-s ours am: f1b797ac9b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024
Change-Id: Icd45906eb216359a6235529f1ac58ca594d8384a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:00:41 +00:00
Bill Yi
896ea5769a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: bfd3ced372
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17838663
Change-Id: I89a39ec5b73a75bcac87834ec4aff57b4f44b557
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 07:54:21 +00:00
Bill Yi
de73de0c47
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e14416d5a3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17838663
Change-Id: Ia981adacd8291bf34a0cdd7efe50efe4dc19798a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 07:53:54 +00:00
Bill Yi
9ea6d0e609
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3ec36ec5c1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17837668
Change-Id: I5464636ed72692b8443643142e9fe58e45221888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 07:53:34 +00:00
Bill Yi
8c88568430
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f7be3a07f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17837668
Change-Id: I4edc606820da1429054292718c70341fc122cb0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 07:53:18 +00:00
TreeHugger Robot
7d5cc42c81
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 226baf6f25
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024
Change-Id: Id2024b4c9ab3d5bc9efd2985847f0396112ef464
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 07:52:28 +00:00
Bill Yi
f1b797ac9b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af08983841
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024
Change-Id: I1d0c3fd484331c7cd7e1d55106fd1c89c67da57e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 07:52:01 +00:00
TreeHugger Robot
21a233b016
Merge "[Settings] Code refactor for async Lifecycle listening" into tm-dev am: 49cc66afd3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859346
Change-Id: I9ce1f767afec1b5d10e0e4520fd3cc1a4d936ba6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 07:51:06 +00:00
Bill Yi
430feee676
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: bfd3ced372
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17838663
Change-Id: I62ec2e91e1d51fb3c9a3a5e636e78b8cb52fc65f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 06:20:57 +00:00
Bill Yi
a4dc078791
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e14416d5a3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17838663
Change-Id: I8b55d3a10035d8cb4ce739b8f50eb528c65ab07d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 06:20:34 +00:00
Bill Yi
304ef2074f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3ec36ec5c1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17837668
Change-Id: Iea16fb21d7e78772acedc67c4e708b89edbf6035
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 06:20:11 +00:00
Bill Yi
4a4c5fd413
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f7be3a07f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17837668
Change-Id: I8c0972874eee8d0018a39d9c477a40806eed9f81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 06:19:50 +00:00
Bill Yi
bfd3ced372
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-04-22 06:17:37 +00:00
Bill Yi
3ec36ec5c1
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-04-22 06:17:37 +00:00
TreeHugger Robot
fb74f218a9
Merge "[Settings] Code refactor for async Lifecycle listening" into tm-dev am: 49cc66afd3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859346
Change-Id: Ia682eb788f6ecc8c7f7f9b1533f1e78d0b8c93b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 06:08:49 +00:00
TreeHugger Robot
49cc66afd3
Merge "[Settings] Code refactor for async Lifecycle listening" into tm-dev
2022-04-22 05:50:05 +00:00
Mill Chen
5d33ca9120
Remove loading spinner from Premium SMS access
...
The loading spinner in the page is displayed by default, regardless of
whether or not how many apps are in the page. This change is trying to
remove the loading spinner from the page since this page doesn't have
many apps in it.
Bug: 222441974
Test: visual verify
Change-Id: I9b2b031122e6b6d521466ccf53e39185cfcab687
2022-04-22 13:41:45 +08:00
TreeHugger Robot
226baf6f25
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-04-22 03:59:00 +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
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
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
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
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
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
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