Tom Hsu
86db37ddcc
Merge "[Settings] Avoid settings crash from NPE of TelephonyManager." into udc-dev am: 69caf6fbe4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429462
Change-Id: Id715f0645548dc225cfcc1a3396e0e81bd06fbdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 02:46:16 +00:00
Tom Hsu
69caf6fbe4
Merge "[Settings] Avoid settings crash from NPE of TelephonyManager." into udc-dev
2023-05-26 02:08:13 +00:00
Yuxin Hu
f783947615
Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev am: 67c72c01cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23360519
Change-Id: I55082fed74d343f8c1daab93e7fb73d093853d68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 19:02:31 +00:00
Viesturs Zarins
8e9955a4f3
Merge "Fix missing Activity embedding allowlisting for Assistant. The normal settings fragments are already allowlisted via SubSettingActivity. ManageApplications fragment based activities are not compatible with that however." into udc-d1-dev
2023-05-25 18:49:59 +00:00
Yuxin Hu
67c72c01cb
Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev
2023-05-25 18:08:10 +00:00
tom hsu
06c3ae5e82
[Settings] Avoid settings crash from NPE of TelephonyManager.
...
Bug: 233783567
Test: atest passed
Change-Id: Ie0ed8fa3b87b8e130396cf4d918295403ae43501
2023-05-25 14:37:51 +00:00
Viesturs Zarins
ac347eddd9
Fix missing Activity embedding allowlisting for Assistant.
...
The normal settings fragments are already allowlisted via SubSettingActivity.
ManageApplications fragment based activities are not compatible with that however.
The ManageApplications fragment has several modes that are selected by the activity name, hence cannot use the SpringboardSettings activity to launch just the fragment.
For more context, see
go/conversational-care-activity-embedding-allowlisting
BUG: 282921726
Change-Id: I65872b574ce6272fbd33ab7bd100504a6536f340
2023-05-25 08:43:07 +00:00
Treehugger Robot
0d065f7913
Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373
Change-Id: I46331c040344bcf47c7ce59f37a8ce5378eee961
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 06:45:29 +00:00
Chaohui Wang
a9a229665b
Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018
Change-Id: Ieb36ee51360a0406d62fa500e518be0b4e6dddd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 06:45:21 +00:00
Treehugger Robot
1fd77775cb
Merge "[Settings] Use background thread to get VoNr state." into udc-dev
2023-05-25 06:25:55 +00:00
Chaohui Wang
5b042e2feb
Merge "Fix crash of PictureInPicture" into udc-dev
2023-05-25 06:02:59 +00:00
tom hsu
97a1fc643e
[Settings] Use background thread to get VoNr state.
...
- TelephonyManager#isVoNrEnabled may not send back the result in time,
so use different thread and timer to prevent ANR.
Bug: 282876876
Test: atest passed
Change-Id: Ie6cc0f8a459f5ebed930e457dacb9b742df70fad
2023-05-25 10:56:03 +08:00
Diya Bera
565ce9eaae
Fingerprint Error Dialog am: 71dd391e4d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197
Change-Id: I614f3cbc3845d463c83605bb62c007180408834d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 20:14:53 +00:00
Diya Bera
71dd391e4d
Fingerprint Error Dialog
...
Add "Try Again" for UNABLE_TO_PROCESS error. Change default title
string. Custom strings for Settings and Setup.
Bug: 280786940
Test: Try to enroll fingerprint, trigger a corresponding error and check
the error dialog
Change-Id: I5975d169e1d33cff87f58fb8882261bb1bd3520e
2023-05-24 10:15:52 -07:00
Bill Yi
dc4c6cf07c
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-05-24 17:14:01 +00:00
Bill Yi
5ee6cbb95c
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-05-24 17:14:01 +00:00
Bill Yi
62106c3d13
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-05-24 17:14:01 +00:00
Chaohui Wang
ce56dcc30b
Fix crash of PictureInPicture
...
This follows change I3115cf1b99a305efef192a0dcf3e809eb7903d0a
PackageManager.getPackageInfoAsUser() will throw exceptions when the
package is too large which is a known issue to PackageManager but very
low priority given resourcing constraints. As per the PackageManager
team suggestion, catch the exception on the app side to alleviate the
impact to the PictureInPicture & App info page.
Fix: 283076353
Fix: 283354211
Test: Unit test
Change-Id: Iad2bf9fbfca6ee7f604fec1c4afa1b9382f6ec7e
2023-05-24 19:41:20 +08:00
SongFerng Wang
535a91afff
Merge "The BluetoothDevicePreference register the MetadataChanged" into udc-dev am: 71a5715e3e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405361
Change-Id: I5480462b9262f5d8ee51f23a97d3bde7ab39082c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 10:14:58 +00:00
SongFerng Wang
71a5715e3e
Merge "The BluetoothDevicePreference register the MetadataChanged" into udc-dev
2023-05-24 09:42:17 +00:00
Jason Hsu
8d3885408e
Merge "Remove 'Media' type Audio output in Hearing devices settings" into udc-dev am: fe00702ab3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382078
Change-Id: If6543b0d84f5399010b97693e87007aa8b0e1bd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 08:09:13 +00:00
Jason Hsu
fe00702ab3
Merge "Remove 'Media' type Audio output in Hearing devices settings" into udc-dev
2023-05-24 07:38:09 +00:00
SongFerngWang
1872151b4f
The BluetoothDevicePreference register the MetadataChanged
...
The bluetooth device preference needs to refresh UI after MetadataChanged
Fix: 282877247
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDevicePreferenceTest
Change-Id: I02cb07a6b255242e4877089ce2f3b7559ce02362
2023-05-24 04:49:41 +00:00
Bill Yi
0714fceee2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 07b6109a0f
-s ours am: 128036a053
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379717
Change-Id: I302a9b8335448809a80ccfc83be95adc49926bba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 03:12:33 +00:00
Bill Yi
7389f5fc2b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4cc2b888b
-s ours am: affa411d4e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379717
Change-Id: If306c1e68711847a9ea27b79b49d6cc413d4ef86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 03:12:28 +00:00
Bill Yi
128036a053
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 07b6109a0f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379717
Change-Id: I48a6bc9f16fcae2bb4ccaeff9f11e68d236f74a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 02:28:19 +00:00
Bill Yi
affa411d4e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4cc2b888b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379717
Change-Id: I078f8199a995e10e791117c367bfcc68f5e0905a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 02:28:03 +00:00
Bill Yi
07b6109a0f
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-05-24 01:54:48 +00:00
Daniel Huang
35d25a92d1
Merge "Update summary for Languages and Keyboard" into udc-dev am: e51bbfcbbd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382079
Change-Id: I622fae34b50f1a07963d2ada5e6b0d5445d3635c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 01:47:42 +00:00
Yuxin Hu
0183cfd816
Fix "Enable ANGLE" switch behavior when Developer Option Switch is off
...
Fix below bugs:
1) When developer option switch is turned off,
"Enable ANGLE" switch is not disabled. Fixed it in
GraphicsDriverEnableAngleAsSystemDriverController::update().
2) When user turns off developer option switch,
a restart is not always mandatory. However, we should ask
user to restart the device is "Enable ANGLE" is forced to
change due to developer option switch turning off.
Fixed it in DevelopmentSettingsDashboardFragment::onSwitchChanged().
3) When user turns off developer option switch and
the reboot dialog pops up, user can dismiss the dialog by
not clicking either POSITIVE_BUTTON or NEGATIVE_BUTTON.
We should enforce user to click the button and disallow the
option to dimiss the dialog by touching screen areas
outside the window's bounds.
Fixed it in DisableDevSettingsDialogFragment.java.
Did a few clean-up and in
GraphicsDriverEnableAngleAsSystemDriverController.java, and updated
unit test to reflect new code behavior.
Bug: b/270994705
Test: m; flash and device can boot.
Test: atest -c GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest
Test: atest GraphicsDriverEnableAngleAsSystemDriverControllerTest
Test: atest SettingsRoboTests:FreeformWindowsPreferenceControllerTest
Test: atest SettingsRoboTests:DesktopModePreferenceControllerTest
Change-Id: I199b2fe59b6ad948b753793254c822a293d8b40d
2023-05-24 01:37:35 +00:00
Daniel Huang
e51bbfcbbd
Merge "Update summary for Languages and Keyboard" into udc-dev
2023-05-24 01:09:38 +00:00
Bill Yi
d2bd70c172
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 02863edd4e
-s ours am: c40e106be2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379713
Change-Id: I8e3796f0a823a3f5e02f8a378667c84917c7075e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:51:37 +00:00
Bill Yi
e379726b51
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27d96e91e7
-s ours am: 789290be46
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379721
Change-Id: I51fa5399aee84218d0f5153fcd043b08b99c5da3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:49:17 +00:00
Bill Yi
1187b059e5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c2e4800c6
-s ours am: c5a289d530
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379721
Change-Id: Ic45ae1c350a0080ee29dbf3440ff5eaecf3e5986
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:48:54 +00:00
Bill Yi
c40e106be2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 02863edd4e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379713
Change-Id: I9c6c9f25681b90088183001886e90201f6a3cee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:48:48 +00:00
Bill Yi
425f03d8c2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c13633d1d0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379996
Change-Id: I6c5aee25f196299a420d4ee38abca33e1c98ca7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:34:40 +00:00
Bill Yi
0ff2acd74e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2e8c8077b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379996
Change-Id: I89e16e27a437bffab025f596c2867707615d7805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:34:36 +00:00
Bill Yi
851cd09273
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 67553d6348
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379722
Change-Id: Iff1f5aa8165a82565818a9e78f2584043a3a5c1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:34:31 +00:00
Bill Yi
90323d459e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 197ad03f9e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379722
Change-Id: Idefdc227aadcda4c4793e04db6a30b9cfd53e689
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:34:06 +00:00
Bill Yi
6f9dae1c63
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: dd664531a5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379718
Change-Id: I2640800318de23e73f14caf0a9eb3b9ec9a0d941
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:33:44 +00:00
Bill Yi
c02f810e09
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81564a8384
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379718
Change-Id: Iadc3952765dbe96b9be66fdca437c96ecb12be25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:33:24 +00:00
Bill Yi
789290be46
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27d96e91e7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379721
Change-Id: Id43e7b6ad2a44a63517ba4d6ef18e4fef367bb78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:32:02 +00:00
Bill Yi
c5a289d530
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c2e4800c6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379721
Change-Id: Iec87273cf2cd0cee417d4eb7e10e1b0327d3f9aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:31:27 +00:00
Bill Yi
c13633d1d0
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-05-23 23:05:26 +00:00
Bill Yi
67553d6348
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-05-23 23:05:26 +00:00
Bill Yi
dd664531a5
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-05-23 23:05:26 +00:00
Bill Yi
27d96e91e7
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-05-23 23:01:47 +00:00
Bill Yi
5640cd61f6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0229581abb
-s ours am: dbee886a9a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379715
Change-Id: I4beb1bea66860ecc9b7b63ac01228d376ac6f2cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 17:13:09 +00:00
Bill Yi
dbee886a9a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0229581abb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379715
Change-Id: I0fe484d0ba8eb4210731201c9f317ae59e1bb6a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 17:10:14 +00:00
danielwbhuang
d591a0ee2c
Update summary for Languages and Keyboard
...
move speech to Languages
Bug: 283744490
Test: manual
Change-Id: I2df0aff11bb8e9b78f9816cd0ae1d1d56c438898
2023-05-23 17:24:32 +08:00