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

134329 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
f6d4b33862 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 651c854deb -s ours am: 66109827de -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id4160ec725a25f5e927f9ced71bb3a109d382a28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 18:08:17 +00:00
Treehugger Robot
840e7954c5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 1b7dad3369 -s ours am: 96a61d6510 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieaadab636aea25c3f5932dc1c9dba242b45b0d9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 18:08:12 +00:00
Bill Yi
f3b099854e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7c82e65d85 -s ours am: 46e7e36cf5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iad7e4d6111493aa93c292430d09b83c217bec9bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 18:08:09 +00:00
Bill Yi
135c629224 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5d60a7b3ea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie496a0292eddf4ac657a4ac847d9ba0c2ca0f952
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 18:01:07 +00:00
Richard MacGregor
f367a90499 Merge "Cleanup permissions hub flags" into main 2023-08-31 17:53:01 +00:00
Bill Yi
66109827de [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 651c854deb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2ea6e6a6452b0d83bac4f9ce2be73fe70c054680
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 17:34:22 +00:00
Treehugger Robot
96a61d6510 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 1b7dad3369 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I50a431a14a98c310b1dda54b29185debb89858a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 17:34:17 +00:00
Bill Yi
46e7e36cf5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7c82e65d85 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iee5bdeb446d86924533e45d3800c4879055fab2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 17:34:12 +00:00
Bill Yi
fb5ab217a3 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-08-31 17:33:28 +00:00
Bill Yi
5e7d65c9ca Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-08-31 17:33:28 +00:00
Bill Yi
6c2702643f Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-08-31 17:33:28 +00:00
Treehugger Robot
1b7dad3369 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-08-31 16:42:05 +00:00
Behnam Heydarshahi
2329c823ab Merge "TalkBack: Clarify volume panel slice action label" into udc-qpr-dev am: a5b314b90f am: e16000bbae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24005152

Change-Id: I925cca06a0fc7907f032448ab02411028f421000
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 15:31:35 +00:00
Behnam Heydarshahi
e16000bbae Merge "TalkBack: Clarify volume panel slice action label" into udc-qpr-dev am: a5b314b90f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24005152

Change-Id: I6cd38f69c8ddaaa02119a12ffb6f1f26ec34e5a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 14:38:13 +00:00
Behnam Heydarshahi
a5b314b90f Merge "TalkBack: Clarify volume panel slice action label" into udc-qpr-dev 2023-08-31 13:40:55 +00:00
Yiyi Shen
cd1538ba5a Merge "Add Fast Pair devices "See all" page." into main 2023-08-31 10:37:09 +00:00
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
Bill Yi
651c854deb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4791f07284490d366f87ba8230e119d51cf9731a
 2023-08-30 20:11:16 -07:00
Bill Yi
7c82e65d85 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iaf84bc7549cea14c907abbe4ccb6b64ae39dd2cb
 2023-08-30 20:06:50 -07:00
Bill Yi
5d60a7b3ea Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I214d24c14033a39d28899c670e32cc9ed3f3538a
 2023-08-30 20:03:59 -07:00
Bill Yi
9b1f2022ac Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib90855a3fdffa61b961d0f3b03879439c34b7719
 2023-08-30 19:05:16 -07:00
Bill Yi
14bd2ddc48 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ica5cf2898590226c0f166803feea43a2bfce8f6a
 2023-08-30 18:53:07 -07:00
Bill Yi
df241a9d68 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I80f16d8cc45a9cf59bde3d6efd075473132978d5
 2023-08-30 18:48:13 -07: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