Commit Graph

19771 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
e456621260 Merge "Show Hotspot network icon (Wi-Fi Slice)" into udc-qpr-dev am: f5023f3805
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24533568

Change-Id: I2e20d12d78888908c8d1fe53043b4b6aec719c76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 13:26:55 +00:00
Treehugger Robot
f5023f3805 Merge "Show Hotspot network icon (Wi-Fi Slice)" into udc-qpr-dev 2023-08-24 12:33:08 +00:00
Zoey Chen
2011921be7 [Refional Preference] Fix test case fail
Test: make RunSettingsRoboTests -j128 ROBOTEST_FILTER=LocaleListEditorTest
Bug: 297304863
Change-Id: Ib59c033de3215c240b62a21885a6be4f813b292c
2023-08-24 06:17:57 +00:00
Zoey Chen
6609d39b8f Merge "[Regional Preference] Need to remove the metrics by the metrics concil team's comment." into udc-qpr-dev am: 6116750110
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24521607

Change-Id: I3462de66a8f19b3531848ccfd6f97fb99562a593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 04:58:24 +00:00
Weng Su
c826558805 Show Hotspot network icon (Wi-Fi Slice)
- Show Hotspot device type icons without signal strength (no Wi-Fi level)

Bug: 268550769
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiSliceTest

Change-Id: I2a707cf20fc1a6d519ef5ca54db64e913daec969
2023-08-24 11:54:05 +08:00
mxyyiyi
737b9ab5b7 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-24 10:20:49 +08:00
mxyyiyi
5cbf3b0f74 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-24 10:19:48 +08:00
Zoey Chen
40d482ed87 [Regional Preference] Need to remove the metrics by the metrics concil
team's comment.

Bug: 297194348
Bug: 284094665
Test: manual
Change-Id: I8eecba55288bfad6f81b5c8c1a8290afccdd5ef8
Merged-In: I8eecba55288bfad6f81b5c8c1a8290afccdd5ef8
2023-08-24 00:57:56 +00:00
Allen Su
13a73be951 Rollback language source metrics
Punt to next release since AndroidMetricsCouncil has concern.

Bug: 284094665
Test: atest AppLocalePickerActivityTest
Change-Id: I9b1239a6e98f074456def43cdbb7deb0bcc1cc3c
Merged-In: I9b1239a6e98f074456def43cdbb7deb0bcc1cc3c
2023-08-23 16:26:28 +00:00
danielwbhuang
90af0f0f26 [PK settings] Remove metrics.
Remove all metrics by the metrics concil team's comment.

Bug: 296544040
Test: manual
Change-Id: I6f5292c686d3eaac641c6e7f7631152b34a0085b
Merged-In: I6f5292c686d3eaac641c6e7f7631152b34a0085b
2023-08-23 23:08:02 +08:00
SongFerngWang
280dfac8af Fix the NullPointerException
Add the checking of null point for LocalBluetoothProfileManager

Bug: 296442243
Test: [pass]make RunSettingsRoboTests ROBOTEST_FILTER=MediaOutputIndicatorWorkerTest
Change-Id: Ieb38feec0a8a6b1f28c3ebd256ae7482c96fdf55
2023-08-23 09:33:26 +00:00
Treehugger Robot
eafc4034d3 Merge "Add Instant hotspot preference" into udc-qpr-dev am: 67d5cb42e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24483137

Change-Id: I345ec2843e47be6ba23b64807eb1b23ad479738a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 15:00:02 +00:00
Treehugger Robot
67d5cb42e9 Merge "Add Instant hotspot preference" into udc-qpr-dev 2023-08-22 14:36:05 +00:00
Weng Su
b4e4facff4 Restrict ApnEditor settings
- Finish ApnEditor settings if user is not an admin

- Finish ApnEditor settings if user has DISALLOW_CONFIG_MOBILE_NETWORKS restriction

Bug: 279902472
Test: manual test
atest -c ApnEditorTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4e18e7414c674a1c5bc69961c03499849b4aefd2)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5a17d39db7af7cea46763bfcdb50380bf0da92e3)
Merged-In: Iecdbbff7e21dfb11e3ba385858747a220cfd3e04
Change-Id: Iecdbbff7e21dfb11e3ba385858747a220cfd3e04
2023-08-22 02:15:17 +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
Zaiyue Xue
9f57691d89 Add UI metrics logging for battery tips card.
Bug: 291689623
Test: manual
Change-Id: I925e4d887c3435239aed0aa0fde7cda2c3a95b3c
Merged-In: I925e4d887c3435239aed0aa0fde7cda2c3a95b3c
2023-08-21 17:40:28 +08:00
Hao Dong
f55c4be4d4 Fix face delete button rotation not working. am: 94f759230a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24484929

Change-Id: I97275e1f64fa87f615444870d894e05f386c5eda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18 20:40:19 +00:00
Hao Dong
94f759230a Fix face delete button rotation not working.
Bug: 264503740
Test:  make -j64 RunSettingsRoboTests
      ROBOTEST_FILTER="FaceSettingsRemoveButtonPreferenceControllerTest"

Change-Id: I28a281ca1ed16940400c44272f9fa78f5eb190af
2023-08-18 18:51:02 +00:00
mxyyiyi
851d31df23 Update power_anomaly_event proto fields am: 980116be4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24440948

Change-Id: If97fb080ddead0d37886444e92e1f98e1c235c7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18 07:30:46 +00:00
mxyyiyi
980116be4d Update power_anomaly_event proto fields
- add enum PowerAnomalyType/PowerAnomalyKey
- update the func to get anomaly index

Test: manual
Bug: 291689623
Change-Id: If4e6684c8169dfa3edd4e18a11d518737a3b2840
Merged-In: If4e6684c8169dfa3edd4e18a11d518737a3b2840
2023-08-18 14:10:06 +08:00
Bharath
7fe45b31db Add support to configure double line clock in lockscreen [2/2]
This keeps the Settings entry under Lockscreen Settings for
Double line clock to be configurable.

As a result, this is now consistent with previous Android versions.

Co-authored-by: Luca Weiss <luca.weiss@fairphone.com>
Bug: 277244307
Test: atest SettingsRoboTests:com.android.settings.display.LockscreenClockPreferenceControllerTest
Change-Id: I08121a1a658cb4045aa30d0bd93e18ca22c3db6d
2023-08-18 09:57:44 +05:30