Commit Graph

20356 Commits

Author SHA1 Message Date
Yiyi Shen
b7c914dc9f Add Fast Pair devices "See all" page.
Bug: 296507968
Test: FastPairDeviceGroupControllerTest
Change-Id: I3939f65ac9262673d99e7041df5b9dc04bd43722
2023-08-31 17:07:41 +08:00
Chaohui Wang
7f72bcf667 Merge "Remove getMobileTemplate_mergedImsisFromGroupNull_returnRequestedSub" into main 2023-08-31 07:07:48 +00:00
Ram Peri
467378309c Merge "Fix META-INF for settings library to match robolectric" into main am: cd34a5f6d6 am: cc1d59b3b9 am: eb446ca146 am: acbb1b5560
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2731384

Change-Id: I35b73073058eebae562796a0f1eaab0c452b348b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 17:27:11 +00:00
Ram Peri
acbb1b5560 Merge "Fix META-INF for settings library to match robolectric" into main am: cd34a5f6d6 am: cc1d59b3b9 am: eb446ca146
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2731384

Change-Id: I0b5d81f67979bcb0fc5377e620d8be96059151a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 16:51:10 +00:00
Ram Peri
eb446ca146 Merge "Fix META-INF for settings library to match robolectric" into main am: cd34a5f6d6 am: cc1d59b3b9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2731384

Change-Id: I8a7e3f2a148ec25b5f0b358d5c609e0f551ed5b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 16:03:43 +00:00
Ram Peri
cc1d59b3b9 Merge "Fix META-INF for settings library to match robolectric" into main am: cd34a5f6d6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2731384

Change-Id: Ie747b6771b59f48fbb82c416580e823a117d984b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 15:14:08 +00:00
SongFerng Wang
8007efdbff Skip Data usage in Settings Widgets
- Do not show data usage in Settings Widgets if the device does not support sim or there is the User Restricted of mobileMobileNetwork.

Bug: 292998280
Test: Manual test
[pass]make RunSettingsRoboTests ROBOTEST_FILTER=CreateShortcutPreferenceControllerTest

Change-Id: I3984a43dc67e9efa92d06a4644b18d1799d56824
2023-08-30 17:48:53 +08:00
Ram Peri
3c31a95f16 Fix META-INF for settings library to match robolectric
Test: atest SettingsRoboTests:com.android.settings.biometrics.fingerprint2.fragment.FingerprintEnrollmentIntroFragmentTest
Bug: 294753198
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:88a9d3faa2b04cf508472e10489eb515cef65bdc)
Merged-In: I2711538ff9c2a18f3cad80e384d0281b119cb94a
Change-Id: I2711538ff9c2a18f3cad80e384d0281b119cb94a
2023-08-30 02:05:44 +00:00
Ram Peri
88a9d3faa2 Fix META-INF for settings library to match robolectric
Test: atest SettingsRoboTests:com.android.settings.biometrics.fingerprint2.fragment.FingerprintEnrollmentIntroFragmentTest
Bug: 294753198
Change-Id: I2711538ff9c2a18f3cad80e384d0281b119cb94a
2023-08-29 19:03:20 -07:00
SongFerng Wang
aba1cb6ae5 Merge "Fix ClassCastException at NetworkSelectSettings" into udc-qpr-dev am: 32c75f49a7 am: 69ea8a2adc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24548405

Change-Id: I2fa673e9c0314d045cbe59e7b743403ee6231be6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 21:39:37 +00:00
Joshua McCloskey
d084f6a61f Fixed formatting
Test: N/A
Change-Id: If450b64f8709b65f1e5d0c7cb2e177d8ca1a89aa
2023-08-29 18:39:40 +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
Yiyi Shen
de231200d7 Add FeatureProvider for FastPair Settings integration.
Bug: 296507968
Test: FakeFeatureFactory
Change-Id: Ie2e238cb61ca56a1d19e1a13b0234e28e28a785e
2023-08-29 15:50:48 +08:00
Treehugger Robot
10d3e1e065 Merge "Enable i18n for battery tips card and fix b/297036263." into udc-qpr-dev-plus-aosp 2023-08-29 06:26:39 +00:00
Chaohui Wang
88343a3d7c Remove getMobileTemplate_mergedImsisFromGroupNull_returnRequestedSub
Because,
 - telephonyManager.mergedImsisFromGroup is @NonNull
 - telephonyManager.mergedImsisFromGroup is fixed, will not return null
 - This test no longer feasible, since return null will crash now

Bug: 297923588
Test: atest SettingsSpaUnitTests
Change-Id: Ic09cd9b5a36a4743a65e05105ce2e814c020491f
2023-08-29 13:02:53 +08:00
SongFerng Wang
69ea8a2adc Merge "Fix ClassCastException at NetworkSelectSettings" into udc-qpr-dev am: 32c75f49a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24548405

Change-Id: I039187faf0a705b68509a241781f59f1e4c8c4b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 04:59:49 +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
Weng Su
d32f590f07 Merge "Show Hotspot informations in Network details settings" into main 2023-08-29 03:55:12 +00:00
SongFerng Wang
32c75f49a7 Merge "Fix ClassCastException at NetworkSelectSettings" into udc-qpr-dev 2023-08-29 03:53:48 +00:00
Zaiyue Xue
ab00ac091d Enable i18n for battery tips card and fix b/297036263.
Bug: 291689623
Bug: 297036263
Fix: 297036263
Test: manual
Change-Id: I41aff99c73ace995ef9dfa8f1dc28024cd12d236
Merged-In: I41aff99c73ace995ef9dfa8f1dc28024cd12d236
(cherry picked from commit d3156cc001)
2023-08-29 03:38:35 +00:00
Treehugger Robot
696c8ff64a Merge "Skip test broken by @NonNull annotation fix" into main 2023-08-29 00:43:23 +00:00
Colin Cross
4700dd261f Skip test broken by @NonNull annotation fix
b/294110802 fixed the @NonNull annotation so that it was visible to
kotlin when applied to methods outside the current build module.  This
caused kotlin to insert more null checks, which broke a test that was
mocking a method annoated with @NonNull and forcing it to return null.
Add @Ignore to the test for now.

Bug: 294110802
Bug: 297923588
Test: atest SettingsSpaUnitTests
Change-Id: I86a677c5ac01bcfaeebe8c339791cca5b2b97fc7
2023-08-28 15:36:09 -07:00
Weng Su
25e20caf00 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

Change-Id: I4bd090e00681911c8fac469289fd818237b8c518
2023-08-29 04:06:55 +08:00
SongFerng Wang
9ca09c3494 Merge "Fix the NullPointerException" into udc-qpr-dev am: acd7bbefd1 am: 6058a62ad7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24523908

Change-Id: Ia3126898342da4f39f9431a423f25a6270ae3107
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 19:19:55 +00:00
Julia Reynolds
67c2cf714b Fix failing test
Test: make -j RunSettingsRoboTests ROBOTEST_FILTER=NotificationAssistantPreferenceControllerTest
Fixes: 296531083
Change-Id: If949a76662aab6aa63e6ca793d9349254ce688e9
2023-08-28 18:19:21 +00:00
SongFerngWang
7f62ae77dc Fix ClassCastException at NetworkSelectSettings
Bug: 296172317
Test: atest NetworkSelectSettingsTest
Change-Id: I811ef95f679bb1b0235a335320654c2acd68110c
2023-08-28 19:17:10 +08: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
Zaiyue Xue
068adaf153 Enable i18n for battery tips card and fix b/297036263.
Bug: 291689623
Bug: 297036263
Fix: 297036263
Test: manual
Change-Id: I41aff99c73ace995ef9dfa8f1dc28024cd12d236
2023-08-25 20:40:45 +08:00
Zaiyue Xue
d3156cc001 Enable i18n for battery tips card and fix b/297036263.
Bug: 291689623
Bug: 297036263
Fix: 297036263
Test: manual
Change-Id: I41aff99c73ace995ef9dfa8f1dc28024cd12d236
Merged-In: I925e4d887c3435239aed0aa0fde7cda2c3a95b3c
2023-08-25 20:21:59 +08:00
mxyyiyi
d9360ec326 Impl dismiss action in battery tips cards.
- Use SharedPreferences to record and filter the already dimissed anomaly.

Bug: 291689623
Test: manual
Change-Id: I4fd4a39066591a4a201857f9586b6595b7d5c43b
2023-08-25 20:17:31 +08:00
mxyyiyi
c68e038508 Fixed battery tips card UI.
- Add highlight effect after navigate to new page.
- Update text format inside button.

Screenshot: https://screenshot.googleplex.com/8ib66dWzn6PZmhy

Fix: 296001546
Fix: 296339767
Bug: 291689623
Test: manual
Change-Id: Ic789e5feb684a109582477c553963a9a3f9936b8
2023-08-25 20:17:04 +08:00
SongFerng Wang
6058a62ad7 Merge "Fix the NullPointerException" into udc-qpr-dev am: acd7bbefd1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24523908

Change-Id: Ie7415988a6aab04d4ebbd443b0b6b9b57f7643b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 10:44:47 +00:00
SongFerng Wang
acd7bbefd1 Merge "Fix the NullPointerException" into udc-qpr-dev 2023-08-25 10:00:42 +00:00
Allen Su
540647741f Merge "Migrate LocaleNotification to main trunk" into main 2023-08-25 09:39:24 +00:00
Treehugger Robot
cffee3ecd3 Merge "Impl dismiss action in battery tips cards." into udc-qpr-dev am: 4b4328cb9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24478130

Change-Id: Ica04e6d4acfc70397da52c35b8a21c1af234f494
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 09:37:25 +00:00
Treehugger Robot
7f3062b52e Merge "Fixed battery tips card UI." into udc-qpr-dev am: 646c676ff6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24457990

Change-Id: I410f00abe1785cca6a45ac63abd3e89a818c2a10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 09:36:12 +00:00
Treehugger Robot
498b6493d1 Merge "Add UI metrics logging for battery tips card." into udc-qpr-dev am: 40fa6ebbd8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24484970

Change-Id: I470efd81e3be7ece7226d7f2300352d45cf3f1a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 09:35:32 +00:00
Treehugger Robot
4b4328cb9c Merge "Impl dismiss action in battery tips cards." into udc-qpr-dev 2023-08-25 08:32:04 +00:00
Treehugger Robot
646c676ff6 Merge "Fixed battery tips card UI." into udc-qpr-dev 2023-08-25 08:31:44 +00:00
Treehugger Robot
40fa6ebbd8 Merge "Add UI metrics logging for battery tips card." into udc-qpr-dev 2023-08-25 08:31:07 +00:00
Allen Su
9d7b1f86d8 Merge "Rollback language source metrics" into udc-qpr-dev am: 23a5af27e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24527327

Change-Id: I85452d98d3a96ea452c1a803af450cf440c6e3f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 06:03:43 +00:00
Allen Su
23a5af27e3 Merge "Rollback language source metrics" into udc-qpr-dev 2023-08-25 05:17:14 +00:00
Allen Su
f22d5e98c0 Migrate LocaleNotification to main trunk
Bug: 248514263
Test: make RunSettingsRoboTests -j128 ROBOTEST_FILTER=AppLocalePickerActivityTest LocaleListEditorTest LocaleNotificationDataManagerTest NotificationCancelReceiverTest NotificationControllerTest
Change-Id: Iac7ffd493485be8ebb10ae63e5ca4ea7a57c8c78
2023-08-25 05:14:56 +00:00
Treehugger Robot
bf64f92c1e Merge "[Refional Preference] Fix test case fail" into udc-qpr-dev am: 073b6fae16 am: a4f1545925
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24527775

Change-Id: Ifbab5c429c8a77d4a72b91a12fda82c10502fe19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 22:50:36 +00:00
Treehugger Robot
a4f1545925 Merge "[Refional Preference] Fix test case fail" into udc-qpr-dev am: 073b6fae16
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24527775

Change-Id: I8701f80a441e86ef24a44bec8c40ae7e2bd56d9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 22:08:33 +00:00
Treehugger Robot
c234e5a6a8 Merge "[PK settings] Remove metrics." into udc-qpr-dev am: ff791fa973
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24526049

Change-Id: I6866aa3d71a9f891863fe0ccd273633a06daae19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 22:05:25 +00:00
Treehugger Robot
073b6fae16 Merge "[Refional Preference] Fix test case fail" into udc-qpr-dev 2023-08-24 21:13:50 +00:00
Treehugger Robot
ff791fa973 Merge "[PK settings] Remove metrics." into udc-qpr-dev 2023-08-24 21:12:47 +00:00
Behnam Heydarshahi
017fa1c652 TalkBack: Clarify volume panel slice action label
Change the generic "double-tap to activate" into "double-tap to enter
settings".

Bug: b/285516489

Test: atest PanelSlicesAdapterTest
Change-Id: I1bba0d625c93db90f347b756f5a20a7ac7e64d56
2023-08-24 19:02:55 +00:00
Treehugger Robot
e23bb57fdf Merge "Show Hotspot network icon (Wi-Fi Slice)" into udc-qpr-dev am: f5023f3805 am: e456621260
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24533568

Change-Id: Ie548f74405de03e73686abbd13f3fc4bb308209c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 14:09:35 +00:00