Commit Graph

6100 Commits

Author SHA1 Message Date
Chaohui Wang
794f5153ec Async load eid in SimEidPreferenceController am: d3cc9b20e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25498123

Change-Id: I32a34923fdf9943a51bce3571977a328e33b3a97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 07:12:45 +00:00
Chaohui Wang
d3cc9b20e4 Async load eid in SimEidPreferenceController
Avoid data loading in getAvailabilityStatus() to prevent ANR, override
updateNonIndexableKeys() for search availability.

Fix: 304560734
Test: manual - on "About phone" page
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b6e44ce818a5284a612a31e0d451a33f9e1ce93e)
Merged-In: I9994abf3787f5db0edc71ff48d08e549a4b70bf7
Change-Id: I9994abf3787f5db0edc71ff48d08e549a4b70bf7
2023-12-04 07:53:34 +00:00
Treehugger Robot
ff03ce88ff Merge "settings(nfc): Remove NFC beam settings" into main am: e8df63f148
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2808364

Change-Id: Ic8c0f7ceec443aca5172cd38ede765781640dc0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 21:03:30 +00:00
Roshan Pius
ad565c49dc settings(nfc): Remove NFC beam settings
This API was already deprecated and not supported for a few years. The
API was completely removed in Android U (see b/236980291).

Bug: 307352220
Test: Verified NFC settings works correctly
Merged-In: I40974a26d170cf3eeec18e6a07a21f6c420eca9e
Change-Id: I40974a26d170cf3eeec18e6a07a21f6c420eca9e
2023-10-30 19:42:47 +00:00
Graciela Putri
8319a77527 Merge "Add aspect ratio settings to advanced category children" into udc-qpr-dev am: 6e9666ab53
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956690

Change-Id: Ib02ae9caef06a46938947806dac8aabb1fa12d94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 09:45:46 +00:00
Graciela Wissen Putri
fcba73e30e Add aspect ratio settings to advanced category children
Fix: 303823822
Test: Manual && atest AppDashboardFragmentTest
Change-Id: I5778efa6a1a790d76d9d35d1597d82fdc3707b3b
2023-10-09 17:35:07 +00:00
Graciela Putri
641b310890 Merge "Add controller to Advanced category in Apps page" into udc-qpr-dev am: 963869ecda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24937325

Change-Id: I39d4b0e6ffa0f071d97e4dd9b2c36c1ed22c3a2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 18:16:08 +00:00
Graciela Putri
963869ecda Merge "Add controller to Advanced category in Apps page" into udc-qpr-dev 2023-10-04 17:54:24 +00:00
Graciela Wissen Putri
7bc951d205 Add controller to Advanced category in Apps page
Settings > Apps > Advanced (category)

Fix: 303309762
Test: Manually by disabling aspect ratio settings
Change-Id: I262fc954ad8d5ad65b24cc0966b8e5392cea65e5
2023-10-04 14:12:03 +00:00
Graciela Putri
112b5765e0 Merge "Add warning text to Aspect ratio app info header" into udc-qpr-dev am: b5b8bd54a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24904381

Change-Id: I6ad5d7d6d9972dca2e42462440648e90f09b28e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 13:32:33 +00:00
Graciela Wissen Putri
e08d0f88d3 Add warning text to Aspect ratio app info header
Settings > Apps > App info > Aspect ratio

Fix: 301440671
Test: Manual
Change-Id: I1d24a38c37cfb95e5711308c96f1fc8da91d5e53
2023-10-03 14:34:18 +00:00
Weng Su
7cbef7df1f Update Battery preference for Instant Hotspot am: ab895fdb9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24834492

Change-Id: If9568f609efa9fb0484697eceac1f7f9a136abff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 18:06:51 +00:00
Weng Su
ab895fdb9b Update Battery preference for Instant Hotspot
- Use the static battery full icon

- Show charging status in Battery preference summary

Bug: 300559036
Test: manual test
atest -c WifiNetworkDetailsFragmentTest

Merged-In: I89e811ba0d1b715d4fff23c96bc094cd4270fef7
Change-Id: I89e811ba0d1b715d4fff23c96bc094cd4270fef7
2023-09-22 20:36:38 +08:00
Graciela Putri
12867d5a88 Merge "Change title to aspect ratio (experimental)" into udc-qpr-dev am: f1c7bf3440
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24799914

Change-Id: Ic630fd0179a9fd06a03df3a9b85ec38b021ac665
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 19:37:40 +00:00
Graciela Wissen Putri
bbb58cac69 Change title to aspect ratio (experimental)
Settings > Apps > Aspect ratio (experimental)
Settings > Apps > App info > Aspect ratio (experimental)

Fix: 300219974
Test: Manual && atest SettingsSpaUnitTests
Merged-In: I359c744025232c6a6ebd9628dbf91acac85b53e9
Change-Id: I359c744025232c6a6ebd9628dbf91acac85b53e9
2023-09-20 21:57:57 +00:00
Guojing Yuan
e0cce7bf6a Merge "[CDM] Add Permissions Sync toggle" into udc-qpr-dev am: d43d6f259a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24708184

Change-Id: I3c29e5b9a46695e5c21a837e00891cc22e0bff4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 21:49:46 +00:00
Guojing Yuan
d43d6f259a Merge "[CDM] Add Permissions Sync toggle" into udc-qpr-dev 2023-09-15 21:15:00 +00:00
Guojing Yuan
5f86e8ff03 [CDM] Add Permissions Sync toggle
Bug: 290063372

Test: manually tested the toggle
Change-Id: I75d4370eed98275e2f99d65620229bdb57193fb8
Merged-In: I75d4370eed98275e2f99d65620229bdb57193fb8
2023-09-15 18:05:37 +00:00
Graciela Putri
ae170b7970 Merge "Add accessible sequence for aspect ratio options" into udc-qpr-dev am: 7cf5bb509e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24742814

Change-Id: I1f559828d5ab7ce517b231df8bd0f7e92541b677
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 22:32:52 +00:00
Graciela Putri
7cf5bb509e Merge "Add accessible sequence for aspect ratio options" into udc-qpr-dev 2023-09-14 21:25:52 +00:00
Graciela Wissen Putri
392a811294 Add accessible sequence for aspect ratio options
Fix: 297293566
Test: Manual
Change-Id: I12b61ccd0330b80e027af7a9eb1693b8d94cc262
2023-09-14 10:35:05 +00:00
Wentao Wang
0d3ae3ed32 Merge "Separate the demo user factory reset option with admin user factory reset option." into udc-qpr-dev am: 38f12abb75
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24677431

Change-Id: I1c3d89346991f82f994a230db385ef2c523b067a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 13:01:39 +00:00
Wentao Wang
38f12abb75 Merge "Separate the demo user factory reset option with admin user factory reset option." into udc-qpr-dev 2023-09-13 11:51:21 +00:00
Wentao Wang
a44e75d6ed Separate the demo user factory reset option with admin user factory reset option.
A security vulnerability was discovered by Android security. b/292548775 Within a short period of time after the device reboot, the user could enter the settings page and factory reset the device. Android Enterprise suggests to add DISALLOW_FACTORY_RESET user restriction to the device.

However, DISALLOW_FACTORY_RESET will be enabled on all Android users, including both the admin user and the demo user. The existing behavior in Android settings is that once the user restriction is set, factory reset button will be greyed out, which makes the factory reset functionality in demo user go away.

In demo user, the factory reset command will be forwarded to the current active device owner. So in this change, we separate the button for admin user and the button for demo user.

In demo user, the button is still visible when the restriction is set.

And in admin user, the button will be greyed out as expected.

Once this change is in, then Pixel Retail Demo could set the user restriction properly and rely on its internal logic to do factory reset. If other applications are trying to do the factory reset, it will be denied by OS.

BUG: 292548775
Change-Id: I9d2d47bb29bc2c1e05058b246908768cd2f95990
2023-09-13 11:47:11 +00:00
Graciela Putri
f862ff58f0 Merge "Change aspect ratio summary and footer text" into udc-qpr-dev am: dd34fa54e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24679072

Change-Id: I1fcf366127ea502b3351c8f6a94d601281df4a54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 07:58:10 +00:00
Graciela Wissen Putri
c37c8b8789 Change aspect ratio summary and footer text
Add more education for device user that setting aspect ratio has not
been tested by the app developer. Move Aspect ratio under Apps >
Advanced instead of General.

Fix: 296160724
Test: atest UserAspectRatioAppsPageProviderTest
Change-Id: I2078f285d7bfb8de3a61c69f9d0ff3872d683ed4
2023-09-12 16:56:10 +00:00
Shivangi Dubey
00a78fca41 Merge "Refine fold setting" into udc-qpr-dev am: 26e14e09bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24314953

Change-Id: Iaf6c0514a406267de5924672b1e879a4dce3ce4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 15:06:39 +00:00
dshivangi
7435bbc70a Refine fold setting
Current fold setting has a toggle button which can enable the “Stay unlocked on fold” setting.
Create a new page for fold setting which will allow us to choose something from three options.(https://screenshot.googleplex.com/6W65aTYtigGpr3v)
 *Always - Front display turns on when you fold your device [Currently available setting]
 *Only games, videos, and more - Front display turns on for apps that stop your screen going idle [Default]
 *Never - Front display locks when you fold your device [New option for user]

Test: atest FoldLockBehaviorSettingsTest FoldLockBehaviorPreferenceControllerTest
*Manual
  Flash the build with these changes
  Manually select options one by one
  Observe the behavior

Fixes: 294194379
Change-Id: Ie5b4e1d7560ed645ec2ca5f49cc9715b17d21367
Merged-In: Ie5b4e1d7560ed645ec2ca5f49cc9715b17d21367
2023-09-06 10:52:12 +00:00
Weng Su
09f9de899f Show Hotspot informations in Network details settings am: 36ae9189b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24573848

Change-Id: Icc16b788667e9938df601b504c98a6baca5962ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 18:20:46 +00:00
Weng Su
36ae9189b2 Show Hotspot informations in Network details settings
- Show Hotspot device type in hearder icon

- Show Hotspot device details informations.
  - Internet source (network type)
  - Battery

Bug: 297346368
Test: manual test
atest -c WifiNetworkDetailsFragmentTest \
         WifiDetailPreferenceController2Test
atest -c SharedConnectivityRepositoryTest \
         WifiNetworkDetailsViewModelTest

Merged-In: I4bd090e00681911c8fac469289fd818237b8c518
Change-Id: I4bd090e00681911c8fac469289fd818237b8c518
2023-08-29 03:56:11 +00:00
Xin Li
6b3d512b63 Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: I17a6c8a571b4a0b7d943dfd710cde0f18d03da39
Change-Id: I4ed5b2e4c6c59527bb544e8b6dff2b9d4cee9025
2023-08-25 13:50:56 -07:00
SongFerng Wang
57d30006d5 Merge "Add the config_show_sim_info to control the DataUsageSummary SHORTCUT" into udc-qpr-dev am: 6bd2ecf6fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24499553

Change-Id: I4ba8f478f5fc392cd90fc20d551d214c1a4c9ac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 10:44:20 +00:00
SongFerng Wang
6bd2ecf6fb Merge "Add the config_show_sim_info to control the DataUsageSummary SHORTCUT" into udc-qpr-dev 2023-08-25 10:00:27 +00:00
Roshan Pius
cd04e59741 Implement DISALLOW_NFC AE user restriction am: f72a53a595 am: d6a7a97493
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24525697

Change-Id: I3c4100861ed8e5e3b991853b652fc1e7a3a9b803
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 21:21:30 +00:00
Roshan Pius
4e4877916d Implement DISALLOW_NFC AE user restriction
Bug: 271452372
Test: Compiles
Merged-In: I8ef4b7a3630535bde9eedb4da78ae3fee8e13234
Change-Id: I8ef4b7a3630535bde9eedb4da78ae3fee8e13234
2023-08-24 20:39:23 +00:00
Roshan Pius
f72a53a595 Implement DISALLOW_NFC AE user restriction
Bug: 271452372
Test: Compiles
(cherry picked from https://android-review.googlesource.com/q/commit:07c1baaaf6ee683779b5215f91d25a0ad7e4b749)
Merged-In: I8ef4b7a3630535bde9eedb4da78ae3fee8e13234
Change-Id: I8ef4b7a3630535bde9eedb4da78ae3fee8e13234
2023-08-23 18:36:40 +00:00
SongFerng Wang
7ac8fc7797 Add the config_show_sim_info to control the DataUsageSummary SHORTCUT
Bug: 292998280
Change-Id: I248066b5f9a25c271604041d95369d051643c35a
Test: Build pass
2023-08-23 12:25:24 +00:00
Weng Su
27b3821313 Add Instant hotspot preference
- Add Instant hotspot preference to Wi-Fi hotspot settings

- Wait onServiceConnected callback and then getSettingsState

- Use the PendingIntent provided by SharedConnectivitySettingsState to launch Instant hotspot settings

Bug: 268550769
Test: manual test
atest -c WifiTetherSettingsTest
atest -c WifiTetherViewModelTest \
         SharedConnectivityRepositoryTest

Merged-In: I343599e6127d9b1cb4af661dcc80a8683589c7b8
Change-Id: I343599e6127d9b1cb4af661dcc80a8683589c7b8
2023-08-21 12:21:25 +00:00
Vlad Popa
0e23c4d41f Add list preference for BT audio device type selection
Since BT devices do not populate the device type reliably we offer the
user the possibility to categorize the audio type of the selected
device. This is can be used by the AudioManager for enabling/disabling
the computation of sound dose.

Test: atest BluetoothDetailsAudioDeviceTypeControllerTest
Bug: 287011781

Merged-In: I797a92e1af4025596ef1c603ed4ab59813e3cbf0
Change-Id: I797a92e1af4025596ef1c603ed4ab59813e3cbf0
2023-08-11 00:25:12 +00:00
Graciela Wissen Putri
5b97e3ecda [5/n] Add graphics to app aspect ratio options
Static assets in Apps > App Info > Advanced > Aspect ratio
Animation in Apps > Aspect ratio

Bug: 293138315
Test: Manual
Change-Id: Ia0d5e9ab3435b395284701a2d915c9cb454593c0
2023-08-09 13:33:06 +00:00
Graciela Putri
830c9eec71 Merge "Add intent to access aspect ratio app list page" into udc-qpr-dev 2023-08-03 08:23:58 +00:00
mxyyiyi
be8407c566 Implement the battery tips cards.(1/2)
- Implement a tips card UI in Battery Usage.

[Screenshot]:
- Tips Card with thumbs-up/down feedback in dark mode
https://screenshot.googleplex.com/3nRCFYvLTWfiYYT
- Tips Card without feedback
https://screenshot.googleplex.com/B7QGRJZAHzgWpCP
- Tips Card in Force RTL layout
https://screenshot.googleplex.com/8crQdj8ao26pKpH
- Tips Card in light mode
https://screenshot.googleplex.com/885aVvZm8xmhK2S

[TODO]:
- Add accessibility
- Localization

Bug: 291689623
Test: Manual
Change-Id: I4443cdb21b3ba30900fc2f6fcc21c4c56dc1293f
Merged-In: I4443cdb21b3ba30900fc2f6fcc21c4c56dc1293f
2023-08-01 09:49:19 +00:00
Graciela Wissen Putri
f6506e0e00 Add intent to access aspect ratio app list page
adb shell am start -a android.settings.MANAGE_USER_ASPECT_RATIO_SETTINGS -c android.intent.category.DEFAULT

Bug: 293137080
Test: Manual
Change-Id: I125d1507c48b02621b5ebb79dcf17aef7deb9bb7
2023-07-31 14:27:40 +00:00
Graciela Wissen Putri
fa945cc808 [4/n] Add fullscreen option in user aspect ratio settings
Apps > App Info > Advanced > Aspect ratio

Adds fullscreen option to aspect ratio settings gated by fullscreen
build time and runtime flags. If fullscreen option is disabled, return
app default option.

To enable feature:
adb shell device_config put window_manager
enable_app_compat_user_aspect_ratio_settings true
adb shell am force-stop com.android.settings

Bug: 291900454
Test: All Settings CUJs passed
      atest SettingsUnitTests:UserAspectRatioManagerTest
Change-Id: I8f8d0c08ac81f088d6c25e8dfb3550f807f336b6
2023-07-28 10:09:56 +00:00
Graciela Wissen Putri
57984f02d5 [3/n] Add aspect ratio app info page
Apps > App Info > Advanced > Aspect ratio

Adds link from aspect ratio app list page to app info. Stops activity if
user chooses a different aspect ratio override.

To enable feature:
adb shell device_config put window_manager enable_app_compat_user_aspect_ratio_settings true
adb shell am force-stop com.android.settings

Bug: 287448187
Test: Manual
      All Settings CUJs passed
      atest SettingsRoboTests:UserAspectRatioDetailsTest
      atest SettingsSpaUnitTests:UserAspectRatioAppPreferenceTest
Change-Id: Id47f291459e62267bf15d629c163dde73d96928a
2023-07-28 09:53:11 +00:00
Graciela Putri
4e86d0d6b3 Merge "[2/n] Add aspect ratio app list page under apps" into udc-qpr-dev 2023-07-21 21:28:44 +00:00
Graciela Wissen Putri
b4c4f6cbe6 [2/n] Add aspect ratio app list page under apps
Apps > General > Screen Size

To enable feature:
adb shell device_config put window_manager enable_app_compat_user_aspect_ratio_settings true
adb shell am force-stop com.android.settings

Fix: 287448088
Test: Manual
      atest AspectRatioAppsPageProviderTest
      atest AspectRatioUtilsTest
      All CUJs passed in go/settings-cujs
Change-Id: I4de6c3cbdbdfbc79ed839ec149fb633344dcd3a7
2023-07-21 08:02:09 +00:00
Vania Januar
bbf2dc4991 Merge "USB firmware update for stylus in Stylus USI Device Details" into udc-qpr-dev 2023-07-20 13:42:55 +00:00
Joshua Mccloskey
1412f391d5 Merge "Implement basic Fingerprint functionality." into udc-qpr-dev 2023-07-18 16:16:52 +00:00
Vania Januar
986fe4ebc1 USB firmware update for stylus in Stylus USI Device Details
Bug: 288850921
Test: StylusUsbFirmwareControllerTest, UsbStylusBroadcastReceiverTest
Change-Id: Ic7cb35799ff00f9998ca569eb4ae091f8010780a
Merged-In: Ic7cb35799ff00f9998ca569eb4ae091f8010780a
2023-07-18 14:09:05 +00:00