PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
128,549 Commits 1 Branch 0 Tags
012fedfa7ab4c36f727ecafb6428e671e57df8cc
Commit Graph

128549 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Xin Li
f2df053926 [automerger skipped] Merge Android U (ab/10368041) am: 6b3d512b63 -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: I94d5dbd6699e067769156d162fd8bd725fa67cad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 23:59:23 +00:00
SongFerngWang
7f62ae77dc Fix ClassCastException at NetworkSelectSettings 
Bug: 296172317
Test: atest NetworkSelectSettingsTest
Change-Id: I811ef95f679bb1b0235a335320654c2acd68110c
 2023-08-28 19:17:10 +08:00
Roshan Pius
cab76b2b15 [automerger skipped] Merge "Implement DISALLOW_NFC AE user restriction" into main am: a3f6a70e9b am: e86e47178e -s ours am: 8e02a78797 -s ours am: d46ca2b59a -s ours 
am skip reason: Merged-In I8ef4b7a3630535bde9eedb4da78ae3fee8e13234 with SHA-1 f72a53a595 is already in history

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

Change-Id: Ifc88d90d8a6d7c6210cd6391e9ce7fa06fc73849
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 21:07:35 +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
Roshan Pius
d46ca2b59a [automerger skipped] Merge "Implement DISALLOW_NFC AE user restriction" into main am: a3f6a70e9b am: e86e47178e -s ours am: 8e02a78797 -s ours 
am skip reason: Merged-In I8ef4b7a3630535bde9eedb4da78ae3fee8e13234 with SHA-1 f72a53a595 is already in history

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

Change-Id: I099c5bbef8a2cef5723e48fe5208218f98568b5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 20:34:06 +00:00
Roshan Pius
8e02a78797 [automerger skipped] Merge "Implement DISALLOW_NFC AE user restriction" into main am: a3f6a70e9b am: e86e47178e -s ours 
am skip reason: Merged-In I8ef4b7a3630535bde9eedb4da78ae3fee8e13234 with SHA-1 f72a53a595 is already in history

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

Change-Id: I923ab7b877922c32b5a67e6318e048899677f6a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 19:49:55 +00:00
Roshan Pius
e86e47178e Merge "Implement DISALLOW_NFC AE user restriction" into main am: a3f6a70e9b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2716375

Change-Id: I0cd0d4bea29c9e82f75b266e6a9daf0b617b3f97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 19:06:15 +00:00
Bill Yi
bae3928e90 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 3ec1e1f122 -s ours am: 7254a9d7cb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id225872c11f803b548dee5302204deec8b4e961e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:59:21 +00:00
Bill Yi
e302a88a9b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c30a22f6f3 -s ours am: 6d580ef24a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id5020bffdaba42587504d09d8167fc354f9fcb54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:59:04 +00:00
Bill Yi
c381393d0d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: f3fa8b1d38 -s ours am: 5adc7a2d96 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I18cab527f3e2bd4ff7a2b70734f32ed5e8838641
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:58:37 +00:00
Bill Yi
a91a059024 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f6aee0c18c -s ours am: b5515b130c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I11099e537443aae6f88d1d795c77dfc82a7cfb1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:58:12 +00:00
Bill Yi
7254a9d7cb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 3ec1e1f122 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id508357e9338d133b03b8157e5305af9c4ef2141
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:25:23 +00:00
Bill Yi
6d580ef24a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c30a22f6f3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idbe7c4b6206e0f49230b5f5e383d943b539946ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:25:05 +00:00
Bill Yi
5adc7a2d96 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: f3fa8b1d38 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I732e771289ed9518f559d04d0e973e6d1f38e33b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:24:37 +00:00
Bill Yi
b5515b130c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f6aee0c18c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I79df28dda9b0cec7693a4fd5a3f7221ee627ad08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:24:14 +00:00
Bill Yi
fd2c004cd7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 3ec1e1f122 -s ours am: 920d199532 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1e78bb57ebb29ec407d1d62ea2c695d821b3db55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:22:30 +00:00
Bill Yi
9d7e1bbd18 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c30a22f6f3 -s ours am: 4c05f68c83 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I841069aff244396aa7db6f062dbc952a1799ef14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:22:05 +00:00
Bill Yi
37dfc701c1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: f3fa8b1d38 -s ours am: 01c84039d2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7a0740499b7115cb1562d7e33f5ab4b320d24fd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:21:42 +00:00
Bill Yi
f52a13f3bd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f6aee0c18c -s ours am: ed31ffe0de -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I08e2a2664a33912c2bfdeced189972f043a5ede7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:21:22 +00:00
Bill Yi
920d199532 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 3ec1e1f122 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie2054ec9fb8c608f74598495124dac3794f572eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:17:58 +00:00
Bill Yi
4c05f68c83 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c30a22f6f3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I58559c3367e73dd91ff8a940691d132b9b82e7b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:17:40 +00:00
Bill Yi
01c84039d2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: f3fa8b1d38 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idfe45bdd26aadeb05290861b5b78e077281bfb5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:17:11 +00:00
Bill Yi
ed31ffe0de [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f6aee0c18c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I89976d26125e1a12f4c09444eff72ef524e5ec6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:16:48 +00:00
Roshan Pius
a3f6a70e9b Merge "Implement DISALLOW_NFC AE user restriction" into main 2023-08-25 18:06:28 +00:00
Bill Yi
3ec1e1f122 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-08-25 17:44:41 +00:00
Bill Yi
f3fa8b1d38 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-08-25 17:44:41 +00:00
Bill Yi
c72c9fe3eb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 77dc4de4b1 -s ours am: f2e8fd2543 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1a9390960f6d433755916d5d48913e73ab35f24b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 15:31:48 +00:00
Bill Yi
228eb7920b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b2ef719b18 -s ours am: f9b7cb0384 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I27cb5add1d4c09cf89f943b9fa4d1a3d7e2e631b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 15:31:33 +00:00
Bill Yi
6f8e20edce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 77dc4de4b1 -s ours am: 92c2a5540e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I97fda7e8f75bd7e98104345313f2eacaea1dbe81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 14:56:54 +00:00