PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
125,089 Commits 1 Branch 0 Tags
c4272f8d7b87d111d5eb69331b7f08547494b215
Commit Graph

125089 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Viesturs Zarins
c4272f8d7b 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 am: e6a708e0a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262238

Change-Id: I73e641eb833ce94de481e897da06caa75729e570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-25 20:35:12 +00:00
Viesturs Zarins
e6a708e0a6 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: I6801b2b87bad63dad61a739025e99dd3425180c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-25 19:44:48 +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
Chaohui Wang
aac2015cc7 Merge "Improve the loading time of DataSaverSummary" into udc-qpr-dev am: b04b977cac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405371

Change-Id: I1ffdee026aa86e7b31b963d8d7ef62613df4fb6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-25 10:10:40 +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
1a777429d6 Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb am: 0d065f7913 am: 506b8af1b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373

Change-Id: Iaa2952f655065661890b47723594ba8730eb76b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-25 08:17:17 +00:00
Chaohui Wang
ad92fd238c Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb am: a9a229665b am: 516503df0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018

Change-Id: I4832b1dc0837c6d71157e172e69ec452bc16b65d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-25 08:16:55 +00:00
Treehugger Robot
e6095db454 Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb am: 48355b8b24 am: e2aea57de4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373

Change-Id: Id5549b198f9a5d9cb6925af97ac9f45302122da3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-25 08:12:07 +00:00
Chaohui Wang
b02cf9562a Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb am: f976ff3f06 am: 6d2caf2e52 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018

Change-Id: Iee83ddb0f09f5f05f922e7949782a7c838538d3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-25 08:12:00 +00:00
Treehugger Robot
22acfebdb9 Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb am: 0d065f7913 am: 2299f35385 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373

Change-Id: Ifb5a172d9977287ab725510a0b2faa4fae33c7a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-25 08:11:53 +00:00
Chaohui Wang
3ca754c35c Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb am: a9a229665b am: 85365bf381 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018

Change-Id: I33a4bfa4535cfe87156b77b7f58fb54ad5e34ba2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-25 08:11:18 +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
Treehugger Robot
e2aea57de4 Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb am: 48355b8b24 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373

Change-Id: I3b4ef57a77546a6078e62eb696fae80363b90d4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-25 07:32:19 +00:00
Chaohui Wang
6d2caf2e52 Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb am: f976ff3f06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018

Change-Id: Ia7b7be32a800e70aa117f43717e04cddbadb3370
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-25 07:32:05 +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
2299f35385 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: Ied812c9a81d5945d7a1c3157ef345e359b8c0c88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-25 07:27:45 +00:00
Chaohui Wang
85365bf381 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: Ic4f862141920da6b3d392c48158fd94eadf1758e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-25 07:27:38 +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
48355b8b24 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: I68dd6ae9bd91519b126cbacb8cba1fb4909524a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-25 06:41:09 +00:00
Chaohui Wang
f976ff3f06 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: I271981812af20ac9d666465edea064fba0a2642e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-25 06:40:44 +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
TreeHugger Robot
8163f3d93b Merge "Add a footer message for battery cycle count" into udc-qpr-dev am: 810659f82d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23419678

Change-Id: I906471b83c8554e65de2ba3d4e34468cdb6a5c02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-25 06:23:46 +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
d740dc9d66 Fingerprint Error Dialog am: 71dd391e4d am: 565ce9eaae am: 573a59f8d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197

Change-Id: I90dae0854c194b8cfbbf4dc1754c87cc602a86a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 21:46:58 +00:00
Diya Bera
0e03a069f7 Fingerprint Error Dialog am: 71dd391e4d am: 87cba95c68 am: e204664790 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197

Change-Id: Ie323538a81480049def27d3317a92ec130fe81ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 21:23:47 +00:00
Diya Bera
e196e903b3 Fingerprint Error Dialog am: 71dd391e4d am: 565ce9eaae am: f868f3fdda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197

Change-Id: Ic2e7cbf81d6893d3a6f921c808374e4327718ea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 21:22:03 +00:00
Diya Bera
e204664790 Fingerprint Error Dialog am: 71dd391e4d am: 87cba95c68 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197

Change-Id: I9a0be0d0788e3bba3329074d5f97334c4aa0ba1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 20:59:26 +00: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
f868f3fdda Fingerprint Error Dialog am: 71dd391e4d am: 565ce9eaae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197

Change-Id: Iea6e58fda55aadc31aef0aca6736f874e9c9ed1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 20:56:45 +00:00
Diya Bera
87cba95c68 Fingerprint Error Dialog am: 71dd391e4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197

Change-Id: Idf0e083fe7702e63ce899f6976c7c713be2078b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 20:15:48 +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
f3c68e300f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: dc4c6cf07c -s ours am: ae5e86f283 -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: I019a9c893af8214bcbd337e4975800aadca1f546
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 18:02:24 +00:00
Bill Yi
4e2592b4f1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26b373a3e4 -s ours am: 2affec9bb9 -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: Ic76a84fc81b349dd236cd6b9ec29dbaa21b4b06a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 18:02:22 +00:00
Bill Yi
2041b90637 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5ee6cbb95c -s ours am: f8bc9d8d44 -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: Ib842aee6375c8376030d3d2a584b4c6607bf665f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 18:02:16 +00:00
Bill Yi
63b9f34873 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 853e7ddba0 -s ours am: 85cad646c1 -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: I71f4213180df8b13fa3edbd459f2cd82540b9c8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 18:01:48 +00:00
Bill Yi
1fda5b526f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 62106c3d13 -s ours am: 8fd4e1cc3e -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: I6aaa8d706a1d3593acd0f95cd9631101d343a3a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 18:01:21 +00:00
Bill Yi
77be6c4eea [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11ab2c74b9 -s ours am: 7af5bff35e -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: I0ce354e6d654ee5f6f5cd78a4f2c8a5c84d6a55b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 18:00:59 +00:00
Bill Yi
378937dd4b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: dc4c6cf07c -s ours am: 57f926c95d -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: I18986dc3ec1ee5f4245bc59428490994a7dfcc01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:56:40 +00:00
Bill Yi
f96b2f4688 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26b373a3e4 -s ours am: b531e765fb -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: I3eb07a2706cf837f344d21659daaac419065d6af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:56:37 +00:00
Bill Yi
9d96de691b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5ee6cbb95c -s ours am: 9ed3697c68 -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: I907e0ac5cc78c5a1d589e2be47ed20677f3edce7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:56:31 +00:00
Bill Yi
6520274437 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 853e7ddba0 -s ours am: bc52047a0d -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: I39a0adf6cc90fea2204c1735dc4a3f160e6d5fb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:56:02 +00:00
Bill Yi
4a00be5d4b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 62106c3d13 -s ours am: d54daa1c26 -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: I5f9110e01971fabe18cff2dd0a2b836036161e5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:55:36 +00:00
Bill Yi
7c529a17f4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11ab2c74b9 -s ours am: d9d4ed48e7 -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: I296f350fe6381f636293d64a77e7863a488b569a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:55:14 +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