Tom Hsu
a035dfae6c
Merge "[Settings] Add data roaming observer" into udc-dev am: b1b4e25f33
am: 15ea70cfa2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429460
Change-Id: I9e25905caa56f3a1b6bd185dae8e4f3b8374708e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 14:19:53 +00:00
Tom Hsu
15ea70cfa2
Merge "[Settings] Add data roaming observer" into udc-dev am: b1b4e25f33
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429460
Change-Id: I4c8aed17f14a9a73d82ca7ad33f50cb471f86503
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 12:53:13 +00:00
Tom Hsu
b1b4e25f33
Merge "[Settings] Add data roaming observer" into udc-dev
2023-05-26 11:56:20 +00:00
Treehugger Robot
3ac1f9ec66
Merge "[Settings] After APM on, do not show the page result in Settings search" into udc-dev am: d3b41aa905
am: 624922703b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442441
Change-Id: I37634274b6f8b5f7f90ced16c3ac1e97102083f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 08:16:13 +00:00
tom hsu
499a2fa16d
[Settings] Add data roaming observer
...
- Data roaming can be controlled by SettingsProvider, it shall be
listen the change and set the change state to repository.
Bug: 278822324
Test: Manual test passed.
Test: atest passed
Change-Id: I6eb5330ba643c485c5d12eb879af1e0e8f7baed7
2023-05-26 16:13:09 +08:00
Chaohui Wang
97963e8389
Merge "Move unrestricted data summary to DataSaverController" into udc-qpr-dev
2023-05-26 07:50:45 +00:00
Treehugger Robot
624922703b
Merge "[Settings] After APM on, do not show the page result in Settings search" into udc-dev am: d3b41aa905
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442441
Change-Id: I910a6b2976d8a5beeb5c2131a667446090ccc445
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 07:31:06 +00:00
TreeHugger Robot
bf08be55a0
Merge "Fixed unable to enable hotspot with Security None" into udc-dev am: 52d2daf3b3
am: 89b497a051
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442438
Change-Id: I1c9beadacb0731dfb425932a077cb7354d924cd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 07:09:34 +00:00
Treehugger Robot
d3b41aa905
Merge "[Settings] After APM on, do not show the page result in Settings search" into udc-dev
2023-05-26 06:53:16 +00:00
TreeHugger Robot
89b497a051
Merge "Fixed unable to enable hotspot with Security None" into udc-dev am: 52d2daf3b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442438
Change-Id: I46d36e32cdb36b47eaa3c62005e65666c9fe94bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 06:26:29 +00:00
TreeHugger Robot
52d2daf3b3
Merge "Fixed unable to enable hotspot with Security None" into udc-dev
2023-05-26 05:43:02 +00:00
tom hsu
d75bd52982
[Settings] After APM on, do not show the page result in Settings search
...
Bug: 249520846
Test: Manual test
Change-Id: I51df50f244649a406449449a0b2d39164ad5e218
2023-05-26 13:42:39 +08:00
Chaohui Wang
3e35cff7ba
Move unrestricted data summary to DataSaverController
...
DataSaverController currently used in 2 pages,
- Network & internet > Data Saver
- Apps > Special app access
This helps unify the logic, and instead of showing on "Special app
access", this summary shows on "Unrestricted data" is make more sense.
Bug: 280280596
Test: Manually on above pages
Test: Unit test
Change-Id: Ia151ed8179a250f8f20cc5041f9383fffebdab10
2023-05-26 13:05:48 +08:00
Weng Su
f7d8f0481d
Fixed unable to enable hotspot with Security None
...
- Due to the design adjustment, the default value of SoftApConfiguration is not Security None, so the update of Security None cannot be omitted.
Bug: 283762826
Test: Manual test
atest -c WifiTetherSettingsTest
Change-Id: I07d18b8f73ab8190152332c01814a4bd72cf28d6
2023-05-26 12:26:31 +08:00
Tom Hsu
233665d47c
Merge "[Settings] Avoid settings crash from NPE of TelephonyManager." into udc-dev am: 69caf6fbe4
am: 86db37ddcc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429462
Change-Id: I2a71646abcb9264fec4820230718a18f20243efe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 03:29:03 +00:00
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
d8fbd089d8
Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev am: 67c72c01cb
am: f783947615
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23360519
Change-Id: I7d2cfa1bb297eab9ff0b06ed10d628153ae1c40c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 19:48:28 +00:00
Viesturs Zarins
cd6409b84c
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 am: 8e9955a4f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262238
Change-Id: I2829a6386bc5e9b710e2e4dc62636aa9493a6f8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 19:47:56 +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
Chaohui Wang
b04b977cac
Merge "Improve the loading time of DataSaverSummary" into udc-qpr-dev
2023-05-25 09:38:35 +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
506b8af1b1
Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb
am: 0d065f7913
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373
Change-Id: I0ba5cc6eb2112440a4b2063f1347fed9406f5ad5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 07:33:25 +00:00
Chaohui Wang
516503df0a
Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb
am: a9a229665b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018
Change-Id: Ia5aaf1c116abef625c43a63619636b18cfe6515f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 07:31:52 +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
TreeHugger Robot
810659f82d
Merge "Add a footer message for battery cycle count" into udc-qpr-dev
2023-05-25 05:53:19 +00:00
Yi-Ling Chuang
20c5966bf4
Add a footer message for battery cycle count
...
Bug: 276399056
Test: rebuild
Change-Id: I3aea252ace55edbde117698c17f1b4e0ab601b89
2023-05-25 12:24:24 +08: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
573a59f8d0
Fingerprint Error Dialog am: 71dd391e4d
am: 565ce9eaae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197
Change-Id: Ia96b5aa1a9cd700b15ddf9aa986856ff4aee5f83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 20:59:04 +00: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
Bill Yi
ae5e86f283
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: dc4c6cf07c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379723
Change-Id: I004622940f7cd703d8a300e5445478c33023c3f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 17:39:24 +00:00
Bill Yi
2affec9bb9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26b373a3e4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379723
Change-Id: If5c641f24bace7be5df568522e143cee790cdad7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 17:39:18 +00:00
Bill Yi
f8bc9d8d44
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5ee6cbb95c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379720
Change-Id: I0b71c76b8ddaa27509076c335f3551440617cbe9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 17:39:14 +00:00
Bill Yi
85cad646c1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 853e7ddba0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379720
Change-Id: Ifb4872706fa2cb3f5e5560cc202eeb1a8b82c7e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 17:38:40 +00:00
Bill Yi
8fd4e1cc3e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 62106c3d13
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379719
Change-Id: I8d0f764b1d8447d6b39e1f5d9c0b6bd08dd42458
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 17:38:17 +00:00
Bill Yi
7af5bff35e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11ab2c74b9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379719
Change-Id: I74dff6cfaf6c162c1c7fa32636b23b5d74428da7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 17:37:58 +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
40a0d96640
Merge "The BluetoothDevicePreference register the MetadataChanged" into udc-dev am: 71a5715e3e
am: 535a91afff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405361
Change-Id: I4a30565d621e5e4535da4c7e0ac5dd22bee5da42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 10:56:58 +00: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