Yanting Yang
f5e74b8f49
Merge "Support App details for work profile apps" into main
2023-08-02 20:12:32 +00:00
Eric Biggers
a75824cf37
Merge "Catch exceptions from setLockCredential()" into main
2023-08-02 19:40:27 +00:00
Elliot Sisteron
fb86e84186
Merge "Fix entrerprise strings replacement for Safety Center." into main
2023-08-02 12:11:17 +00:00
Treehugger Robot
b042f81e34
Merge "Remove context from userFeatureProvider" into main
2023-08-02 10:18:09 +00:00
Chaohui Wang
515c0b8e3a
Remove context from userFeatureProvider
...
UserFeatureProviderImpl is created by using application context,
no need pass context in when get.
Bug: 286764889
Test: m Settings
Change-Id: I80ac7124c3278399e562d4d7d49d1847847b92af
2023-08-02 17:25:41 +08:00
Edgar Wang
a789e9214e
Merge "Fix when turn off "Ask for PIN before unpinning" we don't check the result of ChooseLockSettings" into main
2023-08-02 09:15:56 +00:00
Yu Chao (zhào-yò)
2b2dfebaff
Merge "Migrate VpnSettings from RestrictedSettingsFragment to RestrictedDashboardFragment." into main
2023-08-02 08:05:02 +00:00
Treehugger Robot
6a0adf823c
Merge "Update the incompatible charging banner tip icon" into udc-qpr-dev am: 103adb753a am: 5058935211
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24276935
Change-Id: Ia625b2356fa07e3264539f31c1239fea977b307f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-02 05:04:01 +00:00
YK Hung
f6a7b7c349
Merge "Add cache strategy for getUsageSource()." into udc-qpr-dev am: 1b43697eb8 am: 5964c972fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24236476
Change-Id: If040bea85d7eb72805175f2585e1155100d5eb6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-02 05:02:44 +00:00
Treehugger Robot
5058935211
Merge "Update the incompatible charging banner tip icon" into udc-qpr-dev am: 103adb753a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24276935
Change-Id: Icda113c650b9544ae8218436fdd0a511f76d2aba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-02 04:23:14 +00:00
YK Hung
5964c972fa
Merge "Add cache strategy for getUsageSource()." into udc-qpr-dev am: 1b43697eb8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24236476
Change-Id: I658e16b80d85c9e7022d57e8f960f11d5e5cd6dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-02 04:21:53 +00:00
Treehugger Robot
103adb753a
Merge "Update the incompatible charging banner tip icon" into udc-qpr-dev
2023-08-02 03:26:19 +00:00
YK Hung
1b43697eb8
Merge "Add cache strategy for getUsageSource()." into udc-qpr-dev
2023-08-02 03:23:11 +00:00
Charlotte Lu
710b3379e2
Merge "Password on wifi sharing screen is NOT monospace." into main
2023-08-02 03:04:47 +00:00
ykhung
69f46a72fc
Update the incompatible charging banner tip icon
...
Update the incompatible banner tip icon based on the UX update:
https://screenshot.googleplex.com/8ApTNJnsxRRufjQ
Fix: 246960554
Test: make test RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge
Change-Id: I060554c17b3825b38004fb643c0a0cdf5fdbed4d
2023-08-02 02:05:15 +00:00
Austin Delgado
fefbdc7922
Merge "Announce requirements when setting PIN/Pass" into udc-d1-dev am: c6e7b93f28 am: 0abddc88bc am: 2f1b844997
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24270037
Change-Id: I7929ac906d7661635604fcd7de5225db49ad6ae3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-02 00:32:39 +00:00
Austin Delgado
2f1b844997
Merge "Announce requirements when setting PIN/Pass" into udc-d1-dev am: c6e7b93f28 am: 0abddc88bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24270037
Change-Id: I0d3fcbf3af5b717b76b9b07974b687ba770d89db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-01 23:47:08 +00:00
Austin Delgado
35579efcaf
Merge "Announce requirements when setting PIN/Pass" into udc-d1-dev am: c6e7b93f28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24270037
Change-Id: I5ffe93b5c0fe5a52ad841e5e5942363cf0a0d6dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-01 23:06:10 +00:00
Austin Delgado
0abddc88bc
Merge "Announce requirements when setting PIN/Pass" into udc-d1-dev am: c6e7b93f28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24270037
Change-Id: I706d8f22283ead587622a6d0fd4907a7b9e93f67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-01 23:05:19 +00:00
Austin Delgado
c6e7b93f28
Merge "Announce requirements when setting PIN/Pass" into udc-d1-dev
2023-08-01 22:13:34 +00:00
Oli Thompson
70a610ea39
Merge "Remove subtext on the password work challenge screen" into udc-qpr-dev am: 04854b1c65 am: ea18752f4a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23782668
Change-Id: Ibb0f3930aecd2a12fa54124ccc1f1a7df8f4eb07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-01 17:59:43 +00:00
Elliot Sisteron
4688f3f642
Fix entrerprise strings replacement for Safety Center.
...
In ag/20641184, it looks like we changed the behavior to only replace
titles when in fact some strings were replacing the summary.
This causes some entries to have the summary as the title instead.
Bug: 283743216
Test: Manual
Change-Id: I7157fd04c32eebd89bdb825ccc3e8ef73c9075bf
2023-08-01 17:43:43 +00:00
Oli Thompson
ea18752f4a
Merge "Remove subtext on the password work challenge screen" into udc-qpr-dev am: 04854b1c65
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23782668
Change-Id: I7ba3169002b1d7f7c010ca078d7a723b86788dbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-01 17:17:00 +00:00
Oli Thompson
04854b1c65
Merge "Remove subtext on the password work challenge screen" into udc-qpr-dev
2023-08-01 16:31:03 +00:00
Jason Parks
bd6af1a484
Fix positive button when the click listener is not null.
...
Fixes changes made in ag/20171885:
https://screenshot.googleplex.com/4WeHHjy75A96wgf
https://screenshot.googleplex.com/3oQcLiY6AgYurB9
Bug: 252967902
Test: manual
Change-Id: I07985d540347c7b56982a90d386a5f93721344ea
2023-08-01 14:28:35 +00:00
Yanting Yang
6b02225810
Support App details for work profile apps
...
App info page stopped supporting the App details feature for work
profile apps in Android N but there is no exact reason from the history.
Try supporting it again to fulfill users' requests and check for
exceptions.
Bug: 264932611
Test: manual & robo and unit tests
Change-Id: I1227cff5e25313905952ba54ab0270cdf4f00fd4
2023-08-01 20:49:24 +08:00
Treehugger Robot
363d4b26b4
Merge "Implement the battery tips cards.(1/2)" into main
2023-08-01 12:39:09 +00:00
SongFerng Wang
f15c4c2fe5
Merge "Fix testcase failed" into udc-qpr-dev am: b2c60799af am: b93774ab40
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24196278
Change-Id: If190cc993cf44254658d234289ad7b57dd8445dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-01 12:20:38 +00:00
SongFerng Wang
b93774ab40
Merge "Fix testcase failed" into udc-qpr-dev am: b2c60799af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24196278
Change-Id: I017d432a9abe3f141436f185c156838b393d3d58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-01 11:39:35 +00:00
SongFerng Wang
b2c60799af
Merge "Fix testcase failed" into udc-qpr-dev
2023-08-01 10:55:39 +00:00
mxyyiyi
c4ac74872b
Implement the battery tips cards.(1/2)
...
Bug: 291689623
Test: Manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3ff665bd3292986030fdd8a3689b35bbf6f5a615 )
Change-Id: I4443cdb21b3ba30900fc2f6fcc21c4c56dc1293f
2023-08-01 10:49:01 +00:00
Charlotte Lu
98608f5ca6
Password on wifi sharing screen is NOT monospace.
...
Difficult to distinguish I from l in the password display on the wifi sharing screen.
Fix: 266182587
Test: Visual Test
Change-Id: Iea266fa17edcdf08f161429a44e6c24051084fdd
2023-08-01 08:52:16 +00:00
Yu Chao
f9ca569249
Migrate VpnSettings from RestrictedSettingsFragment to RestrictedDashboardFragment.
...
This is required for adding an overlay vpn_settings2.xml for Tips
Button.
Change-Id: I26531afe75215c9531c0122d2e86fd5d0da4d3db
Test: VpnSettingsTest
Bug: 24179552
2023-08-01 08:13:14 +00:00
Kuan Wang
64177774e2
Add cache strategy for getUsageSource().
...
Cache usage source into SharedPreferences when phone is booting to avoid
calling it too frequently.
It should be safe because the usage source can only change on reboot.
Bug: 293366011
Test: make RunSettingsRoboTests
Change-Id: I35c07539d294737c5764b03b746cfb39f4ce008d
2023-08-01 14:36:58 +08:00
Austin Delgado
035b661ea4
Announce requirements when setting PIN/Pass
...
Test: Manual, verify requirement is read
Fixes: 281955512
Change-Id: I6d963d545c68c4ec891d9ad8a7da8c0a0f6e9d6b
2023-07-31 17:50:39 -07:00
Quang Luong
d170deeed9
Merge "Fix duplicate network request entry during connection" into udc-qpr-dev am: af1715e4a0 am: f55e922301
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24196268
Change-Id: I58a9aca5402c06e36711432f67f72da38c7c2287
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-31 09:57:35 +00:00
Quang Luong
f55e922301
Merge "Fix duplicate network request entry during connection" into udc-qpr-dev am: af1715e4a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24196268
Change-Id: Ie52f8c49a6aaaae0c6932083e7efeba4121298a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-31 09:16:58 +00:00
Quang Luong
af1715e4a0
Merge "Fix duplicate network request entry during connection" into udc-qpr-dev
2023-07-31 08:34:49 +00:00
Quang Anh Luong
ae485a6774
Fix duplicate network request entry during connection
...
When connecting to a network request, a new NetworkRequestEntry is
created by WifiPickerTracker alongside the unsaved regular network,
which results in two of the same network appearing during the L2
connection phase. To fix this, filter out any disconnected networks that
have the same SSID and security type as the currently connecting
network.
Bug: 292064115
Test: manually verify no duplicate network appears when connecting to
network request
Change-Id: I3d6abb0d0a1e4eeab1b8fa396660851ba090c611
2023-07-31 14:51:07 +09:00
Eric Biggers
05f1eff1c9
Catch exceptions from setLockCredential()
...
When LockPatternUtils#setLockCredential() fails, it can either return
false or throw an exception. Catch the exception and treat it the same
way as a false return value, to prevent crashing com.android.settings.
Bug: 253043065
Test: Tried setting lockscreen credential while in secure FRP mode using
smartlock setup activity launched by intent via adb. Verified
that com.android.settings no longer crashes due to the exception
from LockPatternUtils#setLockCredential().
Change-Id: I48b9119c19fb6378b1f88d36433ee4f4c8501d76
2023-07-29 00:07:39 +00:00
Graciela Putri
677c476a2c
Merge "[4/n] Add fullscreen option in user aspect ratio settings" into udc-qpr-dev am: 1f1c2a7db9 am: c97131b90b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24213103
Change-Id: I079c6d10edbba5635e095a29067f21e22945bf85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-28 19:32:58 +00:00
Graciela Putri
9cba6cf4b9
Merge "[3/n] Add aspect ratio app info page" into udc-qpr-dev am: 386b02e906 am: e5e57a8d9e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23819685
Change-Id: I0a880774214c804f2c22fb7aa876c39349e71b62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-28 19:32:46 +00:00
Treehugger Robot
a3d930a7c0
Merge "Define the anomaly proto for anomaly detection project" into udc-qpr-dev am: a9a8c4ed19 am: 4b038ad59b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24239143
Change-Id: I0a1edc9535e3dff85f00daa6df7dfda73746a42c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-28 19:30:09 +00:00
YK Hung
7fe2a92cf3
Merge "Imple call method to detect settings anomaly(1/2)" into udc-qpr-dev am: 1a4979753e am: 716c50d296
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24151397
Change-Id: I5bcfa9f799dd16a881875ebf45c129d683092ba8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-28 19:27:25 +00:00
YK Hung
d8f0731f60
Merge "Fix inconsistent connected without charging state in the Settings" into udc-qpr-dev am: 296322ad47 am: 4b1d5b8e8e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24219784
Change-Id: I11be4dc1c925f0100183d842fe2d2b3a13ae2741
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-28 19:21:21 +00:00
Treehugger Robot
a9f6161365
Merge "Update WhenToDreamPicker to unique page id" into udc-qpr-dev am: fd956769c1 am: 26579447e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24199981
Change-Id: I8850c40d902895e56b73013a860b89dc58f0e280
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-28 19:21:05 +00:00
Graciela Putri
c97131b90b
Merge "[4/n] Add fullscreen option in user aspect ratio settings" into udc-qpr-dev am: 1f1c2a7db9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24213103
Change-Id: Ie0f2338c707cc45dd1cbe57931102bf22df4184a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-28 18:24:45 +00:00
Graciela Putri
e5e57a8d9e
Merge "[3/n] Add aspect ratio app info page" into udc-qpr-dev am: 386b02e906
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23819685
Change-Id: I5f187502bc04d21629bdc1b434f74497f9def14a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-28 18:21:45 +00:00
Treehugger Robot
4b038ad59b
Merge "Define the anomaly proto for anomaly detection project" into udc-qpr-dev am: a9a8c4ed19
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24239143
Change-Id: Ifaf16ef9b3ccfbc3c0e8bb755c91208f5c22832e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-28 18:16:23 +00:00
YK Hung
716c50d296
Merge "Imple call method to detect settings anomaly(1/2)" into udc-qpr-dev am: 1a4979753e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24151397
Change-Id: I6ef35baa3a7df6b28fb5fe7deb0085a4e7a59a5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-28 18:14:31 +00:00