PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
127,028 Commits 1 Branch 0 Tags
797bd60ddeb9bc2ed74b7624e0daf1f153f3524c
Commit Graph

127028 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tetiana Meronyk
70bdc38d4a Merge "Fix "Allow guest to use telephony" toggle not updating its value" into udc-qpr-dev am: 8141b10269 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23899169

Change-Id: I44ca0e373d432ab38e8a3fe8a19a4676ca31a771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-06 14:01:26 +00:00
Tetiana Meronyk
8141b10269 Merge "Fix "Allow guest to use telephony" toggle not updating its value" into udc-qpr-dev 2023-07-06 13:17:36 +00:00
Rhed Jao
a357341837 Merge "Update strings for the repair mode lock password screen" into udc-qpr-dev am: 2070808a62 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23874782

Change-Id: I72588a3e8ff494cd31f72531ada1baef867fb7cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-06 02:51:45 +00:00
Rhed Jao
2070808a62 Merge "Update strings for the repair mode lock password screen" into udc-qpr-dev 2023-07-06 02:36:45 +00:00
Quang Luong
e90bb0aedc Merge "Use speed string from WifiEntry" into udc-qpr-dev am: 062c4b634d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23783053

Change-Id: Ica238c0140af95a1fc3a42a6ded4838bd03d7412
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-06 02:28:36 +00:00
Quang Luong
062c4b634d Merge "Use speed string from WifiEntry" into udc-qpr-dev 2023-07-06 01:49:56 +00:00
Michael Mikhail
1ccbd3966b Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563 am: 7c53d299a2 am: 8f88d32f18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044

Change-Id: Iedb8ee79c516ebb582c27f3b6584782c6887fa2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-05 17:16:59 +00:00
Michael Mikhail
b1c8541600 Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563 am: f7b82efb83 am: c2ddd3e581 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044

Change-Id: I6648eb8daf07a81653d7e5be316239a1e8cec4ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-05 17:11:39 +00:00
Michael Mikhail
5e9026aa80 Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563 am: 7c53d299a2 am: 1db4bc3676 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044

Change-Id: Ie88d511f8c1fb4047a62425e49cd2b120062b5f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-05 17:11:30 +00:00
Michael Mikhail
c2ddd3e581 Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563 am: f7b82efb83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044

Change-Id: I4a9b2877ea13e7bd6ce6d187d416d233141560a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-05 16:34:28 +00:00
Michael Mikhail
8f88d32f18 Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563 am: 7c53d299a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044

Change-Id: Ia4c82cc1a96ab511fe58aa3747082931304fc68d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-05 16:33:59 +00:00
Michael Mikhail
1db4bc3676 Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563 am: 7c53d299a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044

Change-Id: I95fc65d5a3fd0ef2962742769927deacfd92620d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-05 16:29:52 +00:00
Michael Mikhail
7c53d299a2 Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044

Change-Id: I978498d9acbb734534bf2ad1dad7e5cfb2434237
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-05 15:51:23 +00:00
Michael Mikhail
f7b82efb83 Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044

Change-Id: If9ced263d3b60723d39ec471d1e32f800334c046
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-05 15:47:08 +00:00
Michael Mikhail
83c13d6563 Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev 
* changes:
  Trigger talkback for notification volume change
  Add content description to volume title in settings.
 2023-07-05 15:11:09 +00:00
Treehugger Robot
721efc0ed5 Merge "Fix test case failure." into udc-qpr-dev am: b2f436f310 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23902483

Change-Id: I7e3bcef9a4dc00d76c934ce2c55759089179f99a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-05 09:35:31 +00:00
Treehugger Robot
b2f436f310 Merge "Fix test case failure." into udc-qpr-dev 2023-07-05 08:44:06 +00:00
Yi-Ling Chuang
434a04b32c Fix test case failure. 
Fix the test failure of BatterySettingsFeatureProviderImplTest. The
actual method call can't be passed with an argument matcher. Use the
real object instead.

Fixes: 289737082
Test: robotests
Change-Id: Ia48e7b67ba94a8bb67ac1d26c502894a664c2b70
 2023-07-05 15:43:34 +08:00
Tetiana Meronyk
b88bad678d Fix "Allow guest to use telephony" toggle not updating its value 
Bug: 283004333
Test: atest GuestTelephonyPreferenceControllerTest
Change-Id: I2f13a989bbe6a925c0e88350dbc215f6f188fe17
 2023-07-04 15:32:14 +00:00
Chaohui Wang
d4b80ec424 Fix DataUsagePreferenceController ANR am: d42cc8e5e2 am: a51e013746 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896225

Change-Id: Ibcb0a2bc04b0c19f036bcb2039cfa93663b1ec6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-04 09:46:48 +00:00
Rhed Jao
6c7e4560a2 Update strings for the repair mode lock password screen 
Bug: 289325981
Test: build
Change-Id: I347397fa0445436a231bc82529215c6031e4d80d
 2023-07-04 09:44:50 +00:00
Chaohui Wang
e76ff6ffa5 Fix DataUsagePreferenceController ANR am: d42cc8e5e2 am: eb8948e309 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896225

Change-Id: I3e6b70cb33a51348b9504226787de2e149af5870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-04 09:41:58 +00:00
Chaohui Wang
a51e013746 Fix DataUsagePreferenceController ANR am: d42cc8e5e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896225

Change-Id: Ia0463b25a848a1b65f10bfb3950b7875bc3498b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-04 09:03:56 +00:00
Chaohui Wang
eb8948e309 Fix DataUsagePreferenceController ANR am: d42cc8e5e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896225

Change-Id: I6893681f93746af66e6566d2a642c2e1a93aef51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-04 08:59:57 +00:00
Chaohui Wang
d42cc8e5e2 Fix DataUsagePreferenceController ANR 
Offload calculation work from main thread to fix.

Fix: 286082055
Test: manual - on Mobile Settings page
Test: unit test
Change-Id: I7865823d6af2c812afa35d047bd79b60ae4b0fb7
 2023-07-04 12:06:53 +08:00
Daniel Huang
0b95f9562a Merge "Log metrics for PK settings topics" into udc-qpr-dev am: 114d068fbb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23593768

Change-Id: I6360dd0b9ced21331d5e04a54ef91b7612d35c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-04 03:29:21 +00:00
Daniel Huang
114d068fbb Merge "Log metrics for PK settings topics" into udc-qpr-dev 2023-07-04 02:26:13 +00:00
Hao Dong
fefda226f7 Add super call in FingerprintEnrollEnrolling onConfigurationChanged. 
Test: N/A - fix a crash
Bug: 289458339

Change-Id: Id34b1036fe12079b14cd3aaa0a85eecc138e6b17
 2023-06-30 21:29:07 +00:00
Allen Su
477102b991 Merge "[Panlingual]Log metrics for App's locale from the suggested" into udc-qpr-dev am: 5d207a7b4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23832124

Change-Id: Ied97c0d79cbea42830b43b6a2240ac9e5b376f0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 16:41:03 +00:00
Allen Su
5d207a7b4b Merge "[Panlingual]Log metrics for App's locale from the suggested" into udc-qpr-dev 2023-06-30 16:08:25 +00:00
Treehugger Robot
fedd6b35a4 Merge "Check P2P channel before requesting network info" into udc-qpr-dev am: dc98948cc1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23869864

Change-Id: I661f8298b34ef531038006e4881b7caf984bd4d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 15:36:49 +00:00
Treehugger Robot
dc98948cc1 Merge "Check P2P channel before requesting network info" into udc-qpr-dev 2023-06-30 14:48:12 +00:00
Michael Mikhail
0d1b67b73e Merge changes from topic "cherrypick-volume-gar-chain-" into udc-qpr-dev am: c156b6c427 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830401

Change-Id: Ied51926e720f598bceb21bae336d77d4313b6724
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 13:52:36 +00:00
Michael Mikhail
c156b6c427 Merge changes from topic "cherrypick-volume-gar-chain-" into udc-qpr-dev 
* changes:
  Trigger talkback for notification volume change
  Add content description to volume title in settings.
 2023-06-30 12:56:45 +00:00
Treehugger Robot
063ba027f7 Merge "[Settings] Fix inactive SIM show display name with subectiption id." into udc-qpr-dev am: 369a1097c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23844846

Change-Id: Icbb09dc1917780104f35e797bffd5b2c51f6ec5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 07:34:05 +00:00
Treehugger Robot
369a1097c8 Merge "[Settings] Fix inactive SIM show display name with subectiption id." into udc-qpr-dev 2023-06-30 06:55:47 +00:00
tom hsu
0b3da89a91 [Settings] Fix inactive SIM show display name with subectiption id. 
- Cached active SIM' display name with last 4 digits phone number to
   avoid that this active SIM change to inactive SIM then show the
   display name with subscription id.

Bug: 271567615
Test: Manual test passed
Test: atest passed
Change-Id: I119d60ab4e92b1f04fb42f96df10bc81aa378a7c
 2023-06-30 05:51:40 +00:00
Zoey Chen
63a3e0056a Merge "[Regional Preference] Add content descripiton to the img for Talkback" into udc-qpr-dev am: 3a7c5d9fa1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23840845

Change-Id: I3d080a3a007ebd0e379d193e6ae60efd853ffa35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 05:02:33 +00:00
Zoey Chen
35920cd80f [Panlingual] Change the metric's string in Languages am: 6358f613cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23869863

Change-Id: I1c657933cad5e0d7fc20d7ce323cf9045e8fdb65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 05:02:21 +00:00
Zoey Chen
3a7c5d9fa1 Merge "[Regional Preference] Add content descripiton to the img for Talkback" into udc-qpr-dev 2023-06-30 04:18:16 +00:00
Quang Anh Luong
36d71f8785 Check P2P channel before requesting network info 
WifiP2pSettings requests network info from WifiP2pManager whenever it
gets onDeviceInfoAvailable, but sChannel may be null causing an
IllegalArgumentException. Check that sChannel is not null before
requesting network info.

Bug: 289004627
Test: atest WifiP2pSettingsTest
Change-Id: Ied8c3f8a894683d7b8e368e5c52343adb7d05e4b
 2023-06-30 12:21:30 +09:00
Zoey Chen
6358f613cf [Panlingual] Change the metric's string in Languages 
Bug: 279915462
Test: manual
Change-Id: I8e59f9acb068640da64d2a29cc6074b388994554
 2023-06-30 02:59:10 +00:00
Hao Dong
38f7beae49 [automerger skipped] Merge "Fix pattern rotation header text." into udc-d1-dev am: 04b1932b25 -s ours am: 81edf4d6f1 -s ours 
am skip reason: Merged-In I36ec325b46d7a7f583d94dc26f9962cadc3874cd with SHA-1 35ebdefcd8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23833033

Change-Id: I0236a5520778f69fd0eff6a9c8a8564fe1894c1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 00:56:45 +00:00
Hao Dong
07f6bede3e [automerger skipped] Fix pattern rotation header text. am: 7b99d92464 -s ours am: d69fbd1daa -s ours 
am skip reason: Merged-In I36ec325b46d7a7f583d94dc26f9962cadc3874cd with SHA-1 35ebdefcd8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23833033

Change-Id: I832437e38bfdd2fa334ac8a8c70fbaf64e395851
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 00:56:42 +00:00
Hao Dong
180742fd49 [automerger skipped] Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-d1-dev am: 72f2058d3e -s ours am: 83e4a8a32d -s ours 
am skip reason: Merged-In Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec with SHA-1 2eadf68438 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830605

Change-Id: I1ff672348e593bb1f9e832f0e4052f988ab73179
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 00:56:19 +00:00
Hao Dong
84f8ea7113 [automerger skipped] Fix Fingerprint enrollment UI when display size is largest. am: 2ca3f3232c -s ours am: e0aa02b138 -s ours 
am skip reason: Merged-In Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec with SHA-1 2eadf68438 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830605

Change-Id: Ib631d00d752f865fc574d6af787f6948c4ab6526
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 00:56:16 +00:00
Automerger Merge Worker
b08f0ff404 Merge "[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: e0b9249359 -s ours" into udc-dev-plus-aosp am: e4b8bdcead -s ours am: 902b39c57d -s ours 
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f1af8c5292 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246

Change-Id: Ic08657c3269e570dbffa62806e987ed6ac07f04d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 00:53:19 +00:00
Matías Hernández
599217999a [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: e0b9249359 -s ours am: a2c213f4f6 -s ours am: d5d0ba64cd -s ours 
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246

Change-Id: Iad6b42c372cd6b40d6fb67d44c3b46d3aef4d38a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 00:53:17 +00:00
Matías Hernández
58ef7bf643 [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: ebb5bf9f1a -s ours am: 97062b969e -s ours am: 721c4098e8 -s ours 
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246

Change-Id: I587152ec2e15c0cab4fcb6aced9049c09b75d4b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 00:52:13 +00:00
Hao Dong
dc21a409fe [automerger skipped] Merge "Fix pattern rotation header text." into udc-d1-dev am: 04b1932b25 am: b911186928 -s ours 
am skip reason: Merged-In I36ec325b46d7a7f583d94dc26f9962cadc3874cd with SHA-1 35ebdefcd8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23833033

Change-Id: I0fca28be9994212bca22a6f29ee4a67fd0658f54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 00:52:03 +00:00