SongFerng Wang
a7a5061f08
Merge "Gray out the network mode UI before the carrier config is ready" into tm-dev am: 564c88485a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903598
Change-Id: Iaea308bce7c671764a8a8922cd7559849f253d5b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 07:48:48 +00:00
Prabal Singh
9fa00378f7
Merge "Use settingslib util methods for work policy info" into tm-dev am: 591c2c3b38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17915088
Change-Id: I367725b607bc93181341a14a06d376ef50f59521
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 07:48:39 +00:00
SongFerng Wang
564c88485a
Merge "Gray out the network mode UI before the carrier config is ready" into tm-dev
2022-04-25 07:40:43 +00:00
Prabal Singh
591c2c3b38
Merge "Use settingslib util methods for work policy info" into tm-dev
2022-04-25 07:33:09 +00:00
Arc Wang
fec02dd404
Fix 'Documents & other' missing problem am: 03b1b23c74
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910929
Change-Id: I5cd5ff4c3c8a5a00a9e286d6f831c82812f91366
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 03:53:06 +00:00
Arc Wang
03b1b23c74
Fix 'Documents & other' missing problem
...
Should check if 'Documents & other' is visible
when mVolume is updated.
Bug: 230215783
Test: manual visual
Settings -> Storage
Change-Id: Ife36b71bee66ff16802e352785824e10c17dceb8
2022-04-24 15:30:16 +08:00
Bill Yi
eec01885fe
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-04-23 23:26:53 +00:00
Bill Yi
f5ea12c99d
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-04-23 23:26:53 +00:00
Prabal Singh
67007e5933
Use settingslib util methods for work policy info
...
Bug: b/229889270
Test: make ROBOTEST_FILTER=EnterprisePrivacyFeatureProviderImplTest RunSettingsRoboTests -j40
Change-Id: I0d968732a4dd601955e18b2ebb2af365638b450f
2022-04-23 20:35:41 +01:00
Ricky Wai
3ab907b968
Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240
Change-Id: I6a88065f868d567bd7771a8e44ac65e23ee12999
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 15:18:19 +00:00
Ricky Wai
fd7153ed39
Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev
2022-04-22 14:53:00 +00:00
SongFerngWang
b76feffe4f
Gray out the network mode UI before the carrier config is ready
...
Bug: 202167671
Test: atest EnabledNetworkModePreferenceControllerTest
Change-Id: Ib502ac19ea2c19dae95025302dd82aa2b1c7ff88
2022-04-22 19:28:13 +08:00
TreeHugger Robot
2b2fab41f2
[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: I52f5e12c78b60eccf6adde49a51b7cde996b6d2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:18:41 +00:00
Bill Yi
52294cceea
[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: I7306e7016fe40a97f23d2072b657112e1a83a1f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:18:24 +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
Bill Yi
77893f9b81
[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: I837f50c29d924b84ae438fd630813338a0d50e5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 06:20:10 +00:00
Bill Yi
772186e057
[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: If2a2da1244c5302bc3421db1a5570cb5a674cffb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 06:19:42 +00:00
Bill Yi
cfd4e0e395
[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: Ie301565e0ffb8d2630c42235d47c1afa64e85be9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 06:19:17 +00:00
Bill Yi
602b5c15c6
[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: Id0b0a3aa83056874bec89d994838716846914c99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 06:18:57 +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
df93d794dc
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: I18251815257f45eccb7e02d3b20c103272007201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 06:07:43 +00:00
TreeHugger Robot
49cc66afd3
Merge "[Settings] Code refactor for async Lifecycle listening" into tm-dev
2022-04-22 05:50:05 +00: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
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
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
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
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
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
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
TreeHugger Robot
6e1d390e2f
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: I56837b44d3a33b846fe1e44ea969cc3166081360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 09:15:53 +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
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
PETER LIANG
a70eecc2b3
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: Iad200b4be8e8f4e819f60e431f9b0cb7e35da1f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 02:03:21 +00:00
PETER LIANG
50a6b46f51
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: I2e7d352611f8ee628ec532fdda5e82431a2dca0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 02:03:10 +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
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