PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
140,091 Commits 1 Branch 0 Tags
63742cabe4d94b51c39488880be032fe4a49a89e
Commit Graph

21960 Commits

Author SHA1 Message Date
Mill Chen
63742cabe4 Merge "Deprecated Wifi panel and relevant objects" into main 2024-05-08 01:28:15 +00:00
Mill Chen
42ef04eb80 Merge "Deprecate Nfc panel and relevant objects" into main 2024-05-08 01:27:49 +00:00
Mill Chen
cd1537ee05 Merge "Deprecate Volume panel and relevant objects" into main 2024-05-08 01:27:11 +00:00
Mill Chen
cf28a1bd8e Merge "Redirect Volume Panel to settings page" into main 2024-05-07 23:58:33 +00:00
Chaohui Wang
33df5bb68b Fix isInCallFlow when no active subscription am: c63f06d4c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27205448

Change-Id: I5a58046c3e7ed2a1164648516248b39ee4feb5ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-07 14:48:55 +00:00
Treehugger Robot
0212b6770e Merge "Fix AppStateAppBatteryUsageBridge test fail" into main 2024-05-07 13:46:15 +00:00
Chaohui Wang
c63f06d4c8 Fix isInCallFlow when no active subscription 
Direct emit false in this case to fix.

Fix: 338484668
Test: manual - on SIMs
Test: unit test
Change-Id: I5286701160d95b1c06e577db6232f7e70f040cdb
 2024-05-07 10:57:24 +00:00
Yiling Chuang
eda8e23f78 Merge "Update strings for charging optimization mode." into main 2024-05-07 08:48:29 +00:00
Wesley Wang
9b68d1b5fb Fix AppStateAppBatteryUsageBridge test fail 
- Remove mock context to fix the component cast issue

Bug: 337417563
Fix: 337417563
Test: atest SettingsUnitTests
Change-Id: I2d375a4828d2a7b020f15535383c07e4f017bb84
 2024-05-07 16:38:12 +08:00
Yiling Chuang
7b77729db6 Update strings for charging optimization mode. 
Update the battery settings summary and the charging string on the Battery settings page if charging optimization mode is applied.

Bug: 329020954
Test: atest SettingsRoboTests
Change-Id: Ie906a010d70bcef7fafe235f0287b289ea934705
 2024-05-07 06:34:24 +00:00
Pawan Wagh
412739469c Merge "Show persistent notification for page-agnostic mode" into main am: 4795662e6a am: e84cce90b3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3073296

Change-Id: I886b3bdfcc3ea8d554862002aa8c89f4d63b1a0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-07 02:43:24 +00:00
Pawan Wagh
4795662e6a Merge "Show persistent notification for page-agnostic mode" into main 2024-05-07 02:13:53 +00:00
Mill Chen
f4d7fe3082 Deprecate Volume panel and relevant objects 
Bug: 328529042
Test: robotest
Change-Id: I462ddb72b2f764a016d957cc4195fc8298c5f21d
 2024-05-06 22:33:06 +00:00
Mill Chen
840aa5e40b Deprecate Nfc panel and relevant objects 
Bug: 328528962
Test: robotest
Change-Id: Ia2acf4268e9a444d8b4cfe36c6eb2bd198f4be64
 2024-05-06 22:27:02 +00:00
Mill Chen
4c061771b7 Deprecated Wifi panel and relevant objects 
Bug: 328529085
Test: robotest
Change-Id: I960718acbdf1d2be6c3b6b396cf2ac69d4aa3046
 2024-05-06 22:22:52 +00:00
Pawan Wagh
a697fba513 Show persistent notification for page-agnostic mode 
When device enters page-agnostic mode using 16KB developer
options, show notification to user using boot receiver and service.
On clicked on notification, show detailed instructions on how to
get back to production mode. Removing OEM carrier unlock allowed
condition.

Bug: 295035851
Bug: 338139755
Bug: 302600682
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Change-Id: Ib7a57af4c6151d2a8da1ec94130532d10b1679aa
 2024-05-06 22:16:27 +00:00
Mill Chen
e4f785c773 Redirect Volume Panel to settings page 
Flag: com.android.settings.flags.slices_retirement
Bug: 328529042
Bug: 202262476
Test: manual test
adb shell am start -a android.settings.panel.action.VOLUME

Change-Id: I54f30d18eb10db864dcf5ee745b168b03e388b14
 2024-05-06 18:13:37 +00:00
Eric Biggers
9ab4bf20f7 Merge changes I20f2330d,Iaca5b20c into main am: 790e28c431 am: 231766c463 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3061866

Change-Id: I66a91364d8211acf73310d55997bd5f6d08e2ae8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-06 18:09:47 +00:00
Eric Biggers
790e28c431 Merge changes I20f2330d,Iaca5b20c into main 
* changes:
  Remove unused class ShadowKeyStore
  Use KeyProperties.UID_SELF instead of KeyStore.UID_SELF
 2024-05-06 17:36:00 +00:00
Chaohui Wang
ffcbbd375a Clean up MobileNetworkSummaryStatus 
Fix: 338904413
Test: m Settings
Change-Id: Ic26bf7833c8fbdbeffc4f47dcd6dcd6191394e1b
 2024-05-06 07:26:06 +00:00
Fan Wu
45cf636b1a Merge "Update test looper mode to INSTRUMENTATION" into main 2024-05-06 03:08:27 +00:00
Pajace Chen
c7f595814b Merge "Fix test case failed issue" into 24D1-dev am: df8dc5dc61 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27200838

Change-Id: I988aa8852b922f9a05a2352850d803ea3feb7e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-03 02:37:33 +00:00
Jason Chiu
41bd910d11 Merge "Check whether the user is a sub profile before starting Settings homepage" into main 2024-05-03 02:14:26 +00:00
Pajace Chen
df8dc5dc61 Merge "Fix test case failed issue" into 24D1-dev 2024-05-03 02:08:09 +00:00
pajacechen
1d03a55ea8 Fix test case failed issue 
This test case is not really failed, it doesn't break the functionality
of production code. The reason for failure is caused by the timeZone.
A different timezone could result in a different time string.
So, ignore this test case for now.

Test: Unit Test
Fix: 338343937
Change-Id: Iab0f6f2d454f226568ac09a49ae5372f3a9bc88f
 2024-05-03 01:59:40 +00:00
Jason Chiu
bd74caeb99 Check whether the user is a sub profile before starting Settings homepage 
Fix: 336449492
Test: atest SettingsHomepageActivityTest LocationInjectedServicesPreferenceControllerTest UserDetailsSettingsTest ActionDisabledByAdminDialogHelperTest ProfileSelectFragmentTest ProfileSelectLocationFragmentTest
- Start a managed app's info page
- Start a private app's info page
- Switch to a secondary user and start Settings
- Switch to the guest user and start Settings

Change-Id: I1c7c95d95c4739d70839a742ebc4e72b59b1d555
 2024-05-02 10:17:28 +08:00
Treehugger Robot
72ba6ec2ca Merge "Rename Multiple users page to Users" into main 2024-05-01 09:47:56 +00:00
Treehugger Robot
b48c66ebea Merge "settings: Make use of ACTION_NETWORK_PROVIDER_SETTINGS" into main 2024-04-30 21:44:24 +00:00
Joshua Mccloskey
968015c4e6 Merge "Restart fingerprint auth on cancel." into main 2024-04-30 20:51:44 +00:00
Tetiana Meronyk
177e852ea9 Rename Multiple users page to Users 
Ensure it is still searchable by "multiple users" prompt.

Bug: 336764972
Test: manual
Change-Id: I1126bfe601b75532882d6158d82be1a3b566aefc
 2024-04-30 18:48:40 +00:00
Chaohui Wang
ad9c64fcdc Merge "Reapply "Create CallStateRepository.isInCallFlow"" into 24D1-dev am: bbc3a352e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27150958

Change-Id: I8398dcad2f0c0da66cf9c579c5adb5f4c91c2e98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-30 08:12:16 +00:00
Chaohui Wang
bbc3a352e3 Merge "Reapply "Create CallStateRepository.isInCallFlow"" into 24D1-dev 2024-04-30 07:47:30 +00:00
Tom Hsu
219fb8a3f6 Merge "Revert^2 "Add a new warning dialog for Satellite mode"" into 24D1-dev am: 0a8d830616 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27150955

Change-Id: I02b98dfea84be429e9a46dc8d0e3846dda29f203
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-30 07:24:09 +00:00
Tom Hsu
0a8d830616 Merge "Revert^2 "Add a new warning dialog for Satellite mode"" into 24D1-dev 2024-04-30 07:05:49 +00:00
Chaohui Wang
7bbd8fa4e3 Reapply "Create CallStateRepository.isInCallFlow" 
This reverts commit 93e4c65d3d.

Fixed the test by cherry-pick change
I7a3d27cb53c930a56ab0f0896b545807bf4f9dc0.

Bug: 336209156
Test: manual - on MobileNetworkSwitchController
Test: atest SubscriptionInfoListViewModelTest
Change-Id: Id606d6ee90acd8a98de706d8533fed0aac96bff4
 2024-04-30 12:33:54 +08:00
Chaohui Wang
f97e76bc3f Fix SubscriptionInfoListViewModelTest 
Fix: 329160337
Test: unit test
Change-Id: I7a3d27cb53c930a56ab0f0896b545807bf4f9dc0
(cherry picked from commit 10f5bdabb4)
Merged-In: I7a3d27cb53c930a56ab0f0896b545807bf4f9dc0
 2024-04-30 03:32:08 +00:00
Tom Hsu
1b308f5df8 Revert^2 "Add a new warning dialog for Satellite mode" 
This reverts commit 15c90207e2.

Reason for revert: ag/27138142 shall fix the crash instead of reverted one.

Change-Id: Icf46fda7af9c9bb6921bc10de0f9c93926f42fac
 2024-04-30 02:17:15 +00:00
Priyanka Advani
fe0eedf1e3 Merge "Revert "Create CallStateRepository.isInCallFlow"" into 24D1-dev am: 134635786f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27145129

Change-Id: Ica49442da20fcea404ad95a2591506991a8e55b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-29 22:48:38 +00:00
Joshua McCloskey
4efd4c16f9 Restart fingerprint auth on cancel. 
Test: atest FingerprintSettingsFragmentTest
Fixes: 336572954
Change-Id: Ie64d509caf052271a141e466f5c840e92f5dc119
 2024-04-29 22:30:23 +00:00
Priyanka Advani
93e4c65d3d Revert "Create CallStateRepository.isInCallFlow" 
This reverts commit 6142ad927e.

Reason for revert: Droid-monitor created revert due to Build breakage in b/337914519. Will be verifying through ABTD before submission.

Change-Id: I300d5397de156fd0815965cfd99f0814f1365ffc
 2024-04-29 20:31:15 +00:00
Chaohui Wang
e4e6f0ecf4 Merge "Create CallStateRepository.isInCallFlow" into 24D1-dev am: ac55241fc5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27139248

Change-Id: Ie5cde4ca5e04167a63fd41adfb5ccd1376a0d870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-29 12:51:24 +00:00
Tom Hsu
b5391d1d3f Merge "Revert "Add a new warning dialog for Satellite mode"" into 24D1-dev am: 45549d928b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27139078

Change-Id: Ib7b007734f3916b5caf652a79708f20f8df90bf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-29 12:51:08 +00:00
Tom Hsu
45549d928b Merge "Revert "Add a new warning dialog for Satellite mode"" into 24D1-dev 2024-04-29 12:34:55 +00:00
Manish Singh
0f4d761d93 Merge "Don't send data for non-main users" into main 2024-04-29 11:51:46 +00:00
ELIYAZ MOMIN
15c90207e2 Revert "Add a new warning dialog for Satellite mode" 
This reverts commit 680d062c77.

Reason for revert: <Potential culprit for b/337796129  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
>

Change-Id: I6fbb7a0587fbb474012e1a97a75c036420500f99
 2024-04-29 11:37:35 +00:00
Tom Hsu
71e0980f4c Merge "Add a new warning dialog for Satellite mode" into 24D1-dev am: cec2f402a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27113656

Change-Id: I4962f1906eb66b54385d459fc2a3cc987ee74b84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-29 11:17:30 +00:00
Tom Hsu
cec2f402a9 Merge "Add a new warning dialog for Satellite mode" into 24D1-dev 2024-04-29 10:57:55 +00:00
Chaohui Wang
6142ad927e Create CallStateRepository.isInCallFlow 
Which will emit true if any active sub is in call.

And also create SubscriptionActivationRepository to use isInCallFlow.

Bug: 336209156
Test: manual - on MobileNetworkSwitchController
Test: unit test
Change-Id: I75460bf17961349557ac1e19e7f6b15249f3d7b0
 2024-04-29 10:15:13 +00:00
tomhsu
680d062c77 Add a new warning dialog for Satellite mode 
Bug: 337154438
Test: atest pass.
Test: Maunal test pass.
Change-Id: I33dbf3502c780cedd5422e2b44678ecb9a22a662
 2024-04-29 08:37:28 +00:00
Ivan Chiang
dade97f27c Merge "Add the different summary for the app store details" into main 2024-04-29 04:26:18 +00:00