PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
128,537 Commits 1 Branch 0 Tags
9d08b557f8d4e9fb15524e14d3a5195c5941db27
Commit Graph

128537 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
9d08b557f8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fb8f731c8 -s ours am: 9638eb7317 -s ours am: afddd403e6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I754f5c73759f7a56e28434e498bbaf9c096713c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 21:26:56 +00:00
Bill Yi
afddd403e6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fb8f731c8 -s ours am: 9638eb7317 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3fd82df4c38901544df726772af0592ffd59359d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 21:19:29 +00:00
Bill Yi
9638eb7317 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fb8f731c8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I55cf63c9a4e5f691ed4a0ec52410e1d23e2d82c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 20:38:10 +00:00
Treehugger Robot
7e60f1b6c3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: ba09c7a937 -s ours am: 5dedf21e53 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic73915721bbb6a2166edc3818e9d989ba5eaea58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 18:48:59 +00:00
Bill Yi
9aa9227a87 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1a6ff240a4 -s ours am: f30071fae2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifed73c735bdb660db27253ea3f5ca37189590556
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 18:48:49 +00:00
Bill Yi
79a837f0d1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c41647a3bc -s ours am: d669bc5ec5 -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: Ie7d837e5f6347fcb68c7eea7b9e95a1e34d7ca99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 18:48:34 +00:00
Treehugger Robot
aaae85213d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: ba09c7a937 -s ours am: e12be4e1ed -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iff9d63c3aecd54d68b3a992526d89d3412a84dbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 18:43:35 +00:00
Bill Yi
1a10e72c45 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1a6ff240a4 -s ours am: d0e7c0c54d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id86b54d1544f8bec8f11423b554548a8a7c63bbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 18:43:27 +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
5dedf21e53 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: ba09c7a937 -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: I26f70d7d3428f9212a5cd9a49b53db1c4a58e8f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 18:09:30 +00:00
Bill Yi
d669bc5ec5 [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: Ifbca791c4dc4060272542b40c74b9f4157adf9ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 18:09:16 +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
Treehugger Robot
e12be4e1ed [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: ba09c7a937 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7e4aeb2c45f138c3eae4271cb6bd15ff7ced10c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 17:24:52 +00:00
Bill Yi
d0e7c0c54d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1a6ff240a4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5def24dee5cee90afa719de1c57afe39849b0890
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 17:24:44 +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
Treehugger Robot
ba09c7a937 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-08-31 16:41:24 +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
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
1a6ff240a4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibb11b23d4cca99e73666fdb7bb806440e8ab7489
 2023-08-30 20:14:48 -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
4fb8f731c8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I90575a0789147f048e62e5444bb9e38cbb95f003
 2023-08-30 20:05:24 -07: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
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