PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
131,833 Commits 1 Branch 0 Tags
66d41802183bb48d6245746cdfcc076bd0f49b7b
Commit Graph

131833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Chaohui Wang
8c37af5ed1 Merge "Use DataUsageLib in DataUsagePreferenceController" 2023-07-05 15:24:45 +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
bc47f1aac5 Merge "Fix test case failure." into udc-qpr-dev am: b2f436f310 am: 721efc0ed5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23902483

Change-Id: I504ea6842af716ef73468b7e7789c983f5e3a540
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-05 10:17:37 +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
Jason Chiu
8ecbe486f8 Merge "Do not finish activity when the input account doesn't exist" 2023-07-05 07:15:22 +00:00
Chaohui Wang
225af2b43f Merge "Remove context from getSupportFeatureProvider" 2023-07-05 03:37:55 +00: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
77fd6aa117 Use DataUsageLib in DataUsagePreferenceController 
DataUsagePreferenceController use DataUsageLib before, and DataUsageLib
and com.android.settingslib.net.DataUsageUtils has same functionality.

com.android.settingslib.net.DataUsageUtils will be clean up, so use
DataUsageLib again.

Bug: 286082055
Test: m Settings
Change-Id: I6227f973ec38e5b0520f54a41ac2ede2929a1bcc
 2023-07-04 19:08:46 +08:00
Chaohui Wang
c4ffa7d504 Fix DataUsagePreferenceController ANR am: d42cc8e5e2 am: a51e013746 am: d4b80ec424 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896225

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

Change-Id: I2b24b59f1d0bcd2b02359128d474f36a74eb367e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-04 10:28:19 +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
Jason Chiu
e01a9b6039 Do not finish activity when the input account doesn't exist 
This is to avoid the caller getting the existing account list because
the prompt respond reveals that the input account does not exist.

Bug: 249981091
Test: robotest
Change-Id: I4bb8ecead8233780443b1cd1a8780983b7e4d5de
 2023-07-04 17:31:13 +08: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
da796d80f1 Remove context from getSupportFeatureProvider 
Bug: 286764889
Test: m Settings
Change-Id: I5635c7a809fd24d59da377993c7d1435d0c839e3
 2023-07-04 13:22:48 +08:00
Daniel Huang
47262484c9 Merge "Log metrics for PK settings topics" into udc-qpr-dev am: 114d068fbb am: 0b95f9562a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23593768

Change-Id: I2bf912114ace589032df9d08b4d11e57be1a736e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-04 04:10:38 +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
Chaohui Wang
778c2dc3d5 Remove context from applicationFeatureProvider 
ApplicationFeatureProvider is created by using application context,
no need pass context in when get.

Bug: 286764889
Test: m Settings
Change-Id: I7f8dfe5716b7b55e0ff984f7603875d7896e2313
 2023-07-03 13:54:26 +08: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
Yuyang Huang
de771725c4 Merge "Enable/Disable ASHA profile with LE audio toggle" 2023-06-30 18:16:28 +00:00
Allen Su
ceb95b1dce [automerger skipped] Merge "[Panlingual]Log metrics for App's locale from the suggested" into udc-qpr-dev am: 5d207a7b4b am: 477102b991 -s ours 
am skip reason: Merged-In I007c0e76d8b88f08518ba2696d42bd1db194f5b7 with SHA-1 e93f6cd9e6 is already in history

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

Change-Id: I8ca6a7f8e751b0444e1b4b6efbee8f208007da66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 17:22:27 +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
Treehugger Robot
b57e265116 Merge "Check P2P channel before requesting network info" into udc-qpr-dev am: dc98948cc1 am: fedd6b35a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23869864

Change-Id: I96bde9d35a3299555fafbbcffefe5722b99d5787
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 16:18:52 +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
48faaab788 Merge changes from topic "cherrypick-volume-gar-chain-" into udc-qpr-dev am: c156b6c427 am: 0d1b67b73e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830401

Change-Id: I5793b74a6737ad920bbdf1dd49667adf231b2e5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 14:34:07 +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
55e6446579 Merge "Clean up Kotlin FeatureFactory.getFactory(context)" 2023-06-30 12:46:54 +00:00
Treehugger Robot
90325d87cb Merge "[Settings] Fix inactive SIM show display name with subectiption id." into udc-qpr-dev am: 369a1097c8 am: 063ba027f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23844846

Change-Id: Idbedec3b88650b6a64c944bc6d62d2c1124dbb7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 08:15:39 +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
1ff6971261 Merge "[Regional Preference] Add content descripiton to the img for Talkback" into udc-qpr-dev am: 3a7c5d9fa1 am: 63a3e0056a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23840845

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

Change-Id: I8f6f0e0c2553ffe213f9694983eab58c69358928
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 05:45:24 +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
8791bfced8 [automerger skipped] Merge "Fix pattern rotation header text." into udc-d1-dev am: 04b1932b25 -s ours am: 81edf4d6f1 -s ours am: 38f7beae49 -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: I52c3c1cf860a5f9acb58350ba10598b2b7e9181e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 01:29:29 +00:00
Hao Dong
ead5fdc72a [automerger skipped] Fix pattern rotation header text. am: 7b99d92464 -s ours am: d69fbd1daa -s ours am: 07f6bede3e -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: I80d8108ce789b7655faa548858d0ef2c13edb192
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 01:29:26 +00:00