PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
134,305 Commits 1 Branch 0 Tags
30141ada6401bfbc0bea37c7e2e7b64129db5a5b
Commit Graph

134305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zaiyue Xue
30141ada64 Fix b/298551473: Battery usage robotest failed in main branch 
Bug: 298551473
Fix: 298551473
Test: presubmit
Change-Id: I37a990003293bdfa0eb97e79c0ce7af2069d10bb
 2023-09-01 11:11:17 +08:00
Chaohui Wang
7f72bcf667 Merge "Remove getMobileTemplate_mergedImsisFromGroupNull_returnRequestedSub" into main 2023-08-31 07:07:48 +00:00
Sukesh Ram
8337f5dd5d Merge "Remove Windowing Prototype 1 from Codebase" into main 2023-08-30 18:43:39 +00:00
Ram Peri
46e95a448a [automerger skipped] Merge "Fix META-INF for settings library to match robolectric" into main am: cd34a5f6d6 am: cc1d59b3b9 am: eb446ca146 am: acbb1b5560 am: 467378309c -s ours 
am skip reason: Merged-In I2711538ff9c2a18f3cad80e384d0281b119cb94a with SHA-1 88a9d3faa2 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2731384

Change-Id: I76b853671fb0e379ae9f636c7d307b9b643dfc36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-30 18:25:28 +00:00
Sukesh Ram
a1530bf4e4 Remove Windowing Prototype 1 from Codebase 
Refactor codebase to remove desktop windowing Proto1 as it is no longer supported in favor of proto2. (https://docs.google.com/document/d/1bWix49k1XmI97I1AgWEbvQKSD-PuKyJIyYdvb9PYJKk/edit)

Test: aTest WMShellUnitTests
Bug: 297217817
Change-Id: Ie864810a6842cea4a98520b48e74dffbdbd7da1c
 2023-08-30 18:08:25 +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
Ram Peri
cd34a5f6d6 Merge "Fix META-INF for settings library to match robolectric" into main 2023-08-30 14:51:08 +00: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
George Lin
583819453a Merge "Change content for dynamic clock" into udc-qpr-dev am: 6c70c5ecfd am: 62fdd17c48 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24589167

Change-Id: I3d23d5bd46b74baededc364504a6347e4e54c0f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 22:29:57 +00:00
Anvesh Renikindi
0ec878fa97 [automerger skipped] Merge "Remove ExperimentalLifecycleComposeApi" into udc-dev-plus-aosp am: 89310a6e76 am: cbb1f9d6a2 -s ours am: 36076bbcb7 -s ours 
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 2910d68343 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24423378

Change-Id: Ib8de99d61a7b2805c341fc9df7725334ee3a7ff6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 21:47:04 +00:00
Weng Su
63c5f86ad4 [automerger skipped] Show Hotspot informations in Network details settings am: 36ae9189b2 am: 09f9de899f -s ours 
am skip reason: Merged-In I4bd090e00681911c8fac469289fd818237b8c518 with SHA-1 25e20caf00 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24573848

Change-Id: Ia7530827872e3fc3d1d260978d9d6df9988bc439
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 21:40:36 +00:00
Treehugger Robot
be74b29b3e Merge "Crash occurs when entering a Bluetooth broadcast password" into main am: 5bc143402c am: 6d9e295c3a am: 4f9381ef09 am: 6367a80f6b am: 821d8c4916 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2667275

Change-Id: I3d94ad5ad151d2f33023755ef4ced792efdbb1f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 21:40:21 +00:00
Treehugger Robot
34e0830c55 [automerger skipped] Merge "Enable i18n for battery tips card and fix b/297036263." into udc-qpr-dev-plus-aosp am: 10d3e1e065 -s ours 
am skip reason: Merged-In I41aff99c73ace995ef9dfa8f1dc28024cd12d236 with SHA-1 068adaf153 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24583668

Change-Id: If119289c0638cf8e7ee7366abe4cd165a0f58d5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 21:40:04 +00:00
Zaiyue Xue
ea364374aa [automerger skipped] Enable i18n for battery tips card and fix b/297036263. am: ab00ac091d -s ours 
am skip reason: Merged-In I41aff99c73ace995ef9dfa8f1dc28024cd12d236 with SHA-1 068adaf153 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24583668

Change-Id: I45b8651ca7092961e4f37a9fdbc05c2b7ea69022
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 21:40:01 +00: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
George Lin
62fdd17c48 Merge "Change content for dynamic clock" into udc-qpr-dev am: 6c70c5ecfd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24589167

Change-Id: If92ed00242808583581f81a7ecaedbf803ed20bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 20:47:40 +00:00
Xin Li
e765b4b620 [automerger skipped] Merge Android U (ab/10368041) am: 6b3d512b63 -s ours am: f2df053926 -s ours am: 1e710d6df4 -s ours am: edbeaac792 -s ours 
am skip reason: Merged-In I17a6c8a571b4a0b7d943dfd710cde0f18d03da39 with SHA-1 1485ceaf97 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24184251

Change-Id: If1167d4356d64b653f72291622caa8597a23f6e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 20:38:12 +00:00
George Lin
6c70c5ecfd Merge "Change content for dynamic clock" into udc-qpr-dev 2023-08-29 20:23:29 +00:00
Anvesh Renikindi
36076bbcb7 [automerger skipped] Merge "Remove ExperimentalLifecycleComposeApi" into udc-dev-plus-aosp am: 89310a6e76 am: cbb1f9d6a2 -s ours 
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 2910d68343 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24423378

Change-Id: I91fe48db3d8df9a694b66455731c3107d4eb6415
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 19:53:37 +00:00
Treehugger Robot
b68041b388 Merge "Add android:maxSdkVersion="34" to all the <uses-permission> blocks for "com.google.android.googleapps.permission.GOOGLE_AUTH*" permissions" into main 2023-08-29 19:02:51 +00:00
Anvesh Renikindi
cbb1f9d6a2 Merge "Remove ExperimentalLifecycleComposeApi" into udc-dev-plus-aosp am: 89310a6e76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24423378

Change-Id: I49c729e23e6363bd4191217dd4d46c3a55a36bfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 18:35: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
Anvesh Renikindi
89310a6e76 Merge "Remove ExperimentalLifecycleComposeApi" into udc-dev-plus-aosp 2023-08-29 17:33:50 +00:00
Chaohui Wang
f1febf9e9b Remove ExperimentalLifecycleComposeApi 
Fix: 276310170
Bug: 271609607
Test: m Settings
Change-Id: I8798f723bc821241d70fc8e5cb2c6ae59d7115af
Merged-In: I8798f723bc821241d70fc8e5cb2c6ae59d7115af
(cherry picked from commit 8d220f0641)
(cherry picked from commit 2910d68343)
 2023-08-29 17:25:34 +00:00
George Lin
43507ef5df Change content for dynamic clock 
Double-line clock is no longer meaningful when we have custom clocks.

Test: Manually tested. See bug.
Bug: 298034214
Change-Id: I04ecd6f71efc8562bbe58b26a69b976231995faa
 2023-08-29 16:32:12 +00:00
Edgar Wang
fba5ed430e Merge "Update product type of auto_rotate_summary_a11y to fix string on the tablet" into main 2023-08-29 13:33:14 +00:00
Treehugger Robot
821d8c4916 Merge "Crash occurs when entering a Bluetooth broadcast password" into main am: 5bc143402c am: 6d9e295c3a am: 4f9381ef09 am: 6367a80f6b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2667275

Change-Id: I25ad1c39dd437a2529e956d96e8a08a037ab45b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 10:22:10 +00:00
Allen Su
08032ea3c5 Merge "Add LocaleNotificaiton feature flag" into main 2023-08-29 10:21:46 +00:00
Treehugger Robot
6367a80f6b Merge "Crash occurs when entering a Bluetooth broadcast password" into main am: 5bc143402c am: 6d9e295c3a am: 4f9381ef09 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2667275

Change-Id: I15337de0b157ee85c14cf6267e1f14971bd083a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 09:47:05 +00:00
Treehugger Robot
4f9381ef09 Merge "Crash occurs when entering a Bluetooth broadcast password" into main am: 5bc143402c am: 6d9e295c3a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2667275

Change-Id: I2c8595f65e4e3e4c80c4bef1cbc8dad47f6122c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 08:59:21 +00:00
Treehugger Robot
6d9e295c3a Merge "Crash occurs when entering a Bluetooth broadcast password" into main am: 5bc143402c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2667275

Change-Id: I5a2b645fce8800da77ff886f8bc69a20efb34d88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 08:10:45 +00:00
Allen Su
bce9d2a4fb Add LocaleNotificaiton feature flag 
Bug: 248514263
Test: adb shell device_config put settings_globalintl com.android.settings.flags.locale_notification_enabled true
Change-Id: Ibfc9b7fb8c39962af1b062feb98d073207887fb9
 2023-08-29 07:58:02 +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
5bc143402c Merge "Crash occurs when entering a Bluetooth broadcast password" into main 2023-08-29 07:32:28 +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
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
7bdddc9c34 Merge "Fix theme differences between left/right pane problem" into main 2023-08-29 02:10:50 +00:00
Xin Li
edbeaac792 [automerger skipped] Merge Android U (ab/10368041) am: 6b3d512b63 -s ours am: f2df053926 -s ours am: 1e710d6df4 -s ours 
am skip reason: Merged-In I17a6c8a571b4a0b7d943dfd710cde0f18d03da39 with SHA-1 1485ceaf97 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24184251

Change-Id: I95e2c69a1b8855133d7712998eddd844c4ae7aeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 01:11:06 +00:00
Treehugger Robot
696c8ff64a Merge "Skip test broken by @NonNull annotation fix" into main 2023-08-29 00:43:23 +00:00
Xin Li
1e710d6df4 [automerger skipped] Merge Android U (ab/10368041) am: 6b3d512b63 -s ours am: f2df053926 -s ours 
am skip reason: Merged-In I17a6c8a571b4a0b7d943dfd710cde0f18d03da39 with SHA-1 1485ceaf97 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24184251

Change-Id: I341f650a35f69bc5e76638f7dff4a8bc461d66de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 00:35:22 +00:00
Sumit Bhagwani
f6472fdfca Add android:maxSdkVersion="34" to all the <uses-permission> blocks for "com.google.android.googleapps.permission.GOOGLE_AUTH*" permissions 
These permissions used to guard code in Android Authenticator which doesn't exist now. There is no GSF code in V+.

Bug:280072910
Change-Id: Ib2fceca51c324f107be6b9e2f9e6001431cc3f08
 2023-08-29 00:27:35 +00:00