Yiling Chuang
eda8e23f78
Merge "Update strings for charging optimization mode." into main
2024-05-07 08:48:29 +00:00
Mill Chen
f472d99145
Merge "Redirect NFC Panel to settings page" into main
2024-05-07 08:18:42 +00:00
Treehugger Robot
f671734c1b
Merge "Disallow turning off developer options in page-agnostic mode" into main am: 0d124654ca
am: 74da70de2d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3073278
Change-Id: I985bf4d4f78e2d17915d330430eae5818e7fb44b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-07 07:03:35 +00:00
Treehugger Robot
74da70de2d
Merge "Disallow turning off developer options in page-agnostic mode" into main am: 0d124654ca
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3073278
Change-Id: I87d83efc72a97bd942b522716d799efd6e5ed033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-07 06:44:32 +00: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
Treehugger Robot
0d124654ca
Merge "Disallow turning off developer options in page-agnostic mode" into main
2024-05-07 06:30:59 +00:00
Treehugger Robot
ecfed70bb3
Merge "[Install-unknown-apps] not include all the apps that have OP_REQUEST_INSTALL_PACKAGES granted" into main
2024-05-07 06:21:55 +00:00
Pawan Wagh
e4b9c69442
Disallow turning off developer options in page-agnostic mode
...
When device is in page-agnostic mode, it would be OEM unlocked and
filesystem will be different than production. Don't allow to turn
off developer options in that state.
Bug: 329657279
Bug: 295035851
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Change-Id: I9b8a9dbaf8192bb3758c53501450eb45e2fe8d9c
2024-05-07 05:30:23 +00:00
SongFerng Wang
ceda48c70c
Merge "Add the OtherSection for NetworkCellularGroupProvider" into main
2024-05-07 04:58:28 +00:00
SongFerng Wang
3131ed3cef
Merge "Show sim onboarding for user when insert sim and no DDS" into main
2024-05-07 04:54:19 +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
8bd4c730fd
Merge "Make links in dialog text clickable" into main am: 12ff1e2422
am: f224840b37
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3072263
Change-Id: Ida544e3b0fd77e62b9a7e47f7a140705cf4d1471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-07 02:43:09 +00:00
Pawan Wagh
e84cce90b3
Merge "Show persistent notification for page-agnostic mode" into main am: 4795662e6a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3073296
Change-Id: Ic8c971596e79dd0fd54ba6c22b0c003cbd8564f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-07 02:29:30 +00:00
Pawan Wagh
f224840b37
Merge "Make links in dialog text clickable" into main am: 12ff1e2422
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3072263
Change-Id: Id907c80bdb3f090ea83bd7c74f3df329142b46cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-07 02:29:12 +00:00
Pawan Wagh
4795662e6a
Merge "Show persistent notification for page-agnostic mode" into main
2024-05-07 02:13:53 +00:00
Pawan Wagh
12ff1e2422
Merge "Make links in dialog text clickable" into main
2024-05-07 02:13:30 +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
Treehugger Robot
94291dfd2d
Merge "Redirect Wifi Panel to settings page" into main
2024-05-06 19:13:19 +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
Mill Chen
1bd9cab5a0
Redirect Wifi Panel to settings page
...
Flag: com.android.settings.flags.slices_retirement
Bug: 328529085
Test: manual test
adb shell am start -a android.settings.panel.action.WIFI
Change-Id: Iaa7a7fd83000aa8106ceac486c8c96e3a9d1854d
2024-05-06 17:56:37 +00:00
Mill Chen
3905f1069a
Redirect NFC Panel to settings page
...
Flag: com.android.settings.flags.slices_retirement
Bug: 328528962
Test: manual test
adb shell am start -a android.settings.panel.action.NFC
Change-Id: I5232c9e8ed8608d8f27bedbef10c62d7cc12cb8e
2024-05-06 17:54:32 +00:00
Eric Biggers
231766c463
Merge changes I20f2330d,Iaca5b20c into main am: 790e28c431
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3061866
Change-Id: I1216169e50d35d6bd80cd016c55a0db77dc08830
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-06 17:52:05 +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
songferngwang
5f3fc72bd4
Show sim onboarding for user when insert sim and no DDS
...
When the user remove the sim and then insert it back, the DDS may
be -1. If the DDS is -1, then the mobile data can not be turned on.
Show the sim onboarding for user for this case, the user can update
DDS by the flow.
Bug: 336380853
Test: verified UI
Change-Id: I7fd086cb08917f2cac2c1252585687179a2a2f93
2024-05-06 10:16:47 +00:00
songferngwang
8b2305acd4
Add the OtherSection for NetworkCellularGroupProvider
...
Bug: 338914255
Test: Verified the SIMs UI
Change-Id: I49d5e4126e43054b5d147de15d35805d1e445c38
2024-05-06 10:16:02 +00:00
Kangping Dong
1acb816217
[automerger skipped] Merge "fix container designation, it should be system_ext" into main am: 91d5413375
am: 030ebbf23c
-s ours
...
am skip reason: Merged-In I8ee2fd5fad529da2026af77f969abbf88e636ac3 with SHA-1 a4e178e6dd
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3074306
Change-Id: Ifef7caf100a6e93178e2d1e7c53385c62b447532
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-06 09:38:46 +00:00
Kangping Dong
030ebbf23c
Merge "fix container designation, it should be system_ext" into main am: 91d5413375
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3074306
Change-Id: Ia19b4a08cb1434b89ebbb6eed89096e1ffb31070
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-06 09:09:19 +00:00
Kangping Dong
91d5413375
Merge "fix container designation, it should be system_ext" into main
2024-05-06 08:55:06 +00:00
Chaohui Wang
4d725d7715
Merge "Adjust padding on SIM onboarding screens" into main
2024-05-06 08:54:10 +00:00
Chaohui Wang
ffcbbd375a
Clean up MobileNetworkSummaryStatus
...
Fix: 338904413
Test: m Settings
Change-Id: Ic26bf7833c8fbdbeffc4f47dcd6dcd6191394e1b
2024-05-06 07:26:06 +00:00
Weng Su
9245bf0b89
Merge "Don't set the Wi-Fi dialog to the topmost UI" into main
2024-05-06 07:18:49 +00:00
Dennis Shen
d9ec7f2b34
fix container designation, it should be system_ext
...
Cherry pick of internal aflag fix ag/27165141
Bug: b/338095619
Merged-In: I8ee2fd5fad529da2026af77f969abbf88e636ac3
Change-Id: Icea56b89944afd85b7760265ea8bfe35e3300f13
2024-05-06 14:35:13 +08:00
Chaohui Wang
5058a7f3b5
Adjust padding on SIM onboarding screens
...
Fix: 330899892
Test: visual - on Sim Onboarding Page
Change-Id: I2f09d8fc20ad9c51bb5d8c9fae703433a7f87ed8
2024-05-06 03:09:02 +00:00
Fan Wu
45cf636b1a
Merge "Update test looper mode to INSTRUMENTATION" into main
2024-05-06 03:08:27 +00:00
Bill Yi
948f7e96cc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 1d686943a3
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27211555
Change-Id: I6ed4cb99d9a5d4cdff1ead89dd3a62cd915ec18b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-03 23:46:37 +00:00
Bill Yi
f67e7ce7b8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 903dd6c8a2
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27211555
Change-Id: I12feede534fac731741ebe06cae66c4837ba2fb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-03 23:46:22 +00:00
Bill Yi
1d686943a3
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2024-05-03 23:24:26 +00:00
Bill Yi
342139ff4f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3bc754019
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27211103
Change-Id: I88471a9d1cc0808693e3f1fafa988107631b7461
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-03 23:06:02 +00:00
Bill Yi
b7654d1e94
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-05-03 22:46:27 +00:00
Bill Yi
71524c564c
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-05-03 22:46:27 +00:00
Bill Yi
f62a81b3e5
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-05-03 22:46:27 +00:00
Treehugger Robot
42805dcb22
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 2a8de4adc8
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27211860
Change-Id: I149c3964d605ff772c310cf81a305bae52f6ab56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-03 22:37:09 +00:00
Bill Yi
a9ca3385d7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ed8dee24c8
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27211860
Change-Id: I9991fd73c01357ceb51bdd7c5394d64e3eb00cd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-03 22:37:06 +00:00
Treehugger Robot
7b025d10f8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: ad279da071
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27211835
Change-Id: I04add3a9a0eafb789ac4e0a0f1460d1e6060db7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-03 22:36:59 +00:00
Bill Yi
e988c2f2e0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7ea119c95e
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27211835
Change-Id: I40960e6b5f3b0bca5a7cf704bc16fe508a38184c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-03 22:36:39 +00:00
Bill Yi
f0cce0a0a5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b2d407f276
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27211565
Change-Id: I5f6363485b2bdba4e2dbadad2ffe4b45b3de9115
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-03 22:36:30 +00:00
Treehugger Robot
2a8de4adc8
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-05-03 22:27:03 +00:00
Treehugger Robot
ad279da071
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-05-03 22:27:03 +00:00
Song Chun Fan
ba39bd6edd
[Install-unknown-apps] not include all the apps that have OP_REQUEST_INSTALL_PACKAGES granted
...
Due to a recent change in AppOpsService, apps that share system_uid have all the appops granted. However, we don't want them to be listed under "Install unknown apps" if they don't explicitly declare the permission usage of REQUEST_INSTALL_PACKAGES in their manifest. This CL fixes that.
Change-Id: I025bc17c335093ae5d3b15a3bef67d659c8f790f
BUG: 338066634
BUG: 336677341
FIXES: 338066634
Test: manual by checking the Settings page
2024-05-03 21:48:16 +00:00
Oriol Prieto Gascó
4d0a112140
[automerger skipped] Merge "RESTRICT AUTOMERGE Set the container field of aconfig flags" into main am: 14d4df602b
am: 7812cfcee5
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3068647
Change-Id: Iab59ef6dd7d0b373ad6ab22c2e2d4f19b66c4ec1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-03 14:52:34 +00:00