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

134342 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
b55a2aec63 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c41647a3bc -s ours am: 93b69ed9ba -s ours am: 18cf907648 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3492d52e54779fc977e8f21d904585c7c07ce381
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 19:01:28 +00:00
Bill Yi
18cf907648 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c41647a3bc -s ours am: 93b69ed9ba -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3f89c1aee366aa3447dadba6df7aabf7a637c420
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 18:43:10 +00:00
Treehugger Robot
85fda74f34 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: b61ac0c188 -s ours am: 25c9aea70e -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: Id39c6ccdfb048f7e4d3854f4a4c663c95b4e6d16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 18:08:22 +00:00
Treehugger Robot
2d0b9df0a3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: eb03d5d6dd -s ours am: b990d4acb5 -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: I956a30a802334f4fc815de8344724c3876bd1b48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 18:08:19 +00:00
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
Treehugger Robot
25c9aea70e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: b61ac0c188 -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: I7d7ea7827df12255d6f14ba00ec3b8f00ef7e148
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 17:34:41 +00:00
Treehugger Robot
b990d4acb5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: eb03d5d6dd -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: I43543feaed16e51df2110794bd6324e6e99dbf74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 17:34:38 +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
Bill Yi
93b69ed9ba [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c41647a3bc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0505abbd40d2a1ebfe71b915a179624e2567f9b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 17:24:24 +00:00
Treehugger Robot
b61ac0c188 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-08-31 16:42:05 +00:00
Treehugger Robot
eb03d5d6dd Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-08-31 16:42:05 +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
336d3a7549 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5166652e11bbc91bcecfddaeab49dd91fbe57d07
 2023-08-30 20:15:36 -07: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
c41647a3bc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I47594fe5874b47c442583cad4d58e2aa3dfca65b
 2023-08-30 20:09:47 -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