PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
144,876 Commits 1 Branch 0 Tags
cda553d506d208c405eb7c8b2dd30f87bf16be8c
Commit Graph

144876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
t
6dac577285 [automerger skipped] Disable factory reset in DSU mode am: 0764d71e82 -s ours am: a9662d8983 -s ours 
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 15af7d7d55 is already in history

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

Change-Id: I4d4158e7958cbbda454dd86afa053b723b496949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-24 07:42:43 +00:00
Howard Chen
04a6b4ebb3 [automerger skipped] Merge "Disable factory reset in DSU mode" into tm-qpr-dev am: 702da9e7ab -s ours 
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 15af7d7d55 is already in history

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

Change-Id: I7049edee91325ac9eeacc6a435f5cc895737d2ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-24 07:30:25 +00:00
t
a9662d8983 [automerger skipped] Disable factory reset in DSU mode am: 0764d71e82 -s ours 
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 15af7d7d55 is already in history

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

Change-Id: I3250660e299902e6fef14d7933269797fe33366a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-24 07:30:18 +00:00
Howard Chen
64798c14ec [automerger skipped] Merge "Disable factory reset in DSU mode" into udc-dev am: 3f7f1a7c45 -s ours am: 29c7e21bfe -s ours am: 727fa9a5d0 -s ours 
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b is already in history

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

Change-Id: Ib52cbfeae70ae864c350e48a7ab2a6002a0a9dbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-24 07:23:31 +00:00
t
72322bef90 [automerger skipped] Disable factory reset in DSU mode am: 15af7d7d55 -s ours am: 7c1a58f697 -s ours am: 3785300025 -s ours 
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b is already in history

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

Change-Id: If74da16bf2b37899d370e67a302a8df98d3f08fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-24 07:23:26 +00:00
Howard Chen
702da9e7ab Merge "Disable factory reset in DSU mode" into tm-qpr-dev 2024-10-24 07:08:03 +00:00
Jacky Wang
825cc7e5ed Merge changes from topic "catalyst" into main 
* changes:
  [Catalyst] Migrate "Dark theme" settings
  Refactor DarkModePreference for catalyst
 2024-10-24 07:06:27 +00:00
Howard Chen
727fa9a5d0 [automerger skipped] Merge "Disable factory reset in DSU mode" into udc-dev am: 3f7f1a7c45 -s ours am: 29c7e21bfe -s ours 
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b is already in history

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

Change-Id: I8385fdcee5afc3992039b8be0f1954214670177a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-24 07:01:55 +00:00
t
3785300025 [automerger skipped] Disable factory reset in DSU mode am: 15af7d7d55 -s ours am: 7c1a58f697 -s ours 
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b is already in history

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

Change-Id: Ic990bd00b177eb2d332d4484de593bad99e902e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-24 07:01:51 +00:00
Howard Chen
ac2e0cf4b2 [automerger skipped] Merge "Disable factory reset in DSU mode" into udc-dev am: 3f7f1a7c45 -s ours am: 7d49b3bc98 -s ours 
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b is already in history

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

Change-Id: I5e119a17e4f917eff4dfeddcbb774a3dbf17674d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-24 07:01:43 +00:00
t
85d208cfc1 [automerger skipped] Disable factory reset in DSU mode am: 15af7d7d55 -s ours am: 228792b4a7 -s ours 
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b is already in history

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

Change-Id: I6f70e9ef87dc327df7ab704c2c3467a7dcc31fe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-24 07:01:39 +00:00
Howard Chen
12836e048f [automerger skipped] Merge "Disable factory reset in DSU mode" into udc-qpr-dev am: 821212db7f -s ours 
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b is already in history

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

Change-Id: I08bc91b06714c31905619918926f641dc78b4bb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-24 06:44:29 +00:00
t
fe8f894e26 [automerger skipped] Disable factory reset in DSU mode am: 76260a7884 -s ours 
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b is already in history

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

Change-Id: Id5da64f257d5122ef2a8b0f31d5d621af3ead094
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-24 06:44:26 +00:00
Howard Chen
7d49b3bc98 [automerger skipped] Merge "Disable factory reset in DSU mode" into udc-dev am: 3f7f1a7c45 -s ours 
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b is already in history

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

Change-Id: I6b7e0642b2df335326dc1ca26c4650303cd3c062
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-24 06:44:18 +00:00
t
228792b4a7 [automerger skipped] Disable factory reset in DSU mode am: 15af7d7d55 -s ours 
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b is already in history

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

Change-Id: I0dcd73da914cc3ed94fcd657f96047ec173a1510
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-24 06:44:15 +00:00
Howard Chen
29c7e21bfe [automerger skipped] Merge "Disable factory reset in DSU mode" into udc-dev am: 3f7f1a7c45 -s ours 
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b is already in history

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

Change-Id: Ie34b8bf22e63f9f8a8ab38e49612d6c3ac8cf314
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-24 06:44:11 +00:00
t
7c1a58f697 [automerger skipped] Disable factory reset in DSU mode am: 15af7d7d55 -s ours 
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b is already in history

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

Change-Id: I8b8b21b6282ed4b08d892dea33fe2e6a181468c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-24 06:44:00 +00:00
Howard Chen
821212db7f Merge "Disable factory reset in DSU mode" into udc-qpr-dev 2024-10-24 06:24:43 +00:00
Howard Chen
3f7f1a7c45 Merge "Disable factory reset in DSU mode" into udc-dev 2024-10-24 06:24:31 +00:00
Howard Chen
5631756a07 [automerger skipped] Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f am: 75a0b01eb9 am: db47f7bfe8 -s ours am: f39aa3eae6 -s ours am: 89ee71f997 -s ours am: df5562757a -s ours 
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b is already in history

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

Change-Id: Id38313b4dfa1757e95b56f26c57d15be1d31cd64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-24 04:33:56 +00:00
Howard Chen
57d02eeaa8 [automerger skipped] Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f am: d498d8b580 am: 00143bf156 am: 22d4e17415 am: 6122b1a9cf -s ours 
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b is already in history

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

Change-Id: I293d446192d9789f1839c860f1ea13f148b19ff2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-24 04:33:43 +00:00
Howard Chen
df5562757a [automerger skipped] Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f am: 75a0b01eb9 am: db47f7bfe8 -s ours am: f39aa3eae6 -s ours am: 89ee71f997 -s ours 
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b is already in history

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

Change-Id: Iee6e57cab52f86d245ddcefb3a3d266802934a1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-24 04:02:29 +00:00
Howard Chen
8ce61174fd [automerger skipped] Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f am: 75a0b01eb9 am: db47f7bfe8 -s ours am: f39aa3eae6 -s ours am: 040fa213f9 -s ours 
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b is already in history

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

Change-Id: I0675eae5e6668a78a82e1f460ba7ef63cf214c42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-24 04:02:29 +00:00
Howard Chen
6122b1a9cf Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f am: d498d8b580 am: 00143bf156 am: 22d4e17415 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110306

Change-Id: I024a7a93e1fac530d85441e2253a937059c649f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-24 04:02:20 +00:00
Howard Chen
d8f7975a8a [automerger skipped] Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f am: d498d8b580 am: 00143bf156 am: ccb34dc532 -s ours 
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 784e52c9be is already in history

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

Change-Id: Ic81b627c3a8b46c69343bc9181fef00d314ada84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-24 04:02:16 +00:00
Treehugger Robot
010fbe033c Merge "Add WifiCallingScreen and corresponding TS flag" into main 2024-10-24 04:00:14 +00:00
Howard Chen
89ee71f997 [automerger skipped] Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f am: 75a0b01eb9 am: db47f7bfe8 -s ours am: f39aa3eae6 -s ours 
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b is already in history

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

Change-Id: I06ad32bd19235257e92f813740cba674df00d25d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-24 03:56:22 +00:00
Howard Chen
040fa213f9 [automerger skipped] Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f am: 75a0b01eb9 am: db47f7bfe8 -s ours am: f39aa3eae6 -s ours 
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b is already in history

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

Change-Id: Icded16ce9d1b1dab8b45c70677107b0111ac2968
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-24 03:51:26 +00:00
Howard Chen
ccb34dc532 Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f am: d498d8b580 am: 00143bf156 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110306

Change-Id: I08f3ec0c81a3ca01de6ce2513e81a284d8cff062
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-24 03:51:16 +00:00
Howard Chen
f39aa3eae6 [automerger skipped] Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f am: 75a0b01eb9 am: db47f7bfe8 -s ours 
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b is already in history

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

Change-Id: I9fc84657515c2929eb125470275147eb825c8902
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-24 03:51:11 +00:00
Howard Chen
22d4e17415 Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f am: d498d8b580 am: 00143bf156 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110306

Change-Id: Iac3a36596ad2bb82cc799153f5888de5c513f338
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-24 03:50:56 +00:00
Haijie Hong
d260f67aac Merge "Update backgroundcolor of advanced bt header image" into main 2024-10-24 03:31:25 +00:00
Howard Chen
00143bf156 Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f am: d498d8b580 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110306

Change-Id: I3a815a0a9f65ad1814741e58f781301f9b9f6fb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-24 03:30:08 +00:00
Howard Chen
db47f7bfe8 Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f am: 75a0b01eb9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110306

Change-Id: I4543cb19cedf28eefdc5abebadc09c8ada257a6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-24 03:29:36 +00:00
Jacky Wang
2d1770e4f7 [Catalyst] Migrate "Dark theme" settings 
Bug: 375132235
Flag: com.android.settings.flags.catalyst_dark_ui_mode
Test: Manual
Change-Id: I40f305fe8d89feac84e2316c7a90c6eeb2b4a5fa
 2024-10-24 11:27:07 +08:00
Howard Chen
75a0b01eb9 Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110306

Change-Id: If2785ed3b6eb14fd67ee8d045c0d7c2463904ad2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-24 03:13:10 +00:00
Howard Chen
d498d8b580 Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110306

Change-Id: Ic7af2a8f42525f1bca70b370f0c27a8175cb2a23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-24 03:13:08 +00:00
Howard Chen
692f794e6f Merge "Disable factory reset in DSU mode" into tm-dev 2024-10-24 02:51:24 +00:00
Fan Wu
60521ee2f9 Add WifiCallingScreen and corresponding TS flag 
Bug: 372732219
Test: atest
Flag: com.android.settings.flags.catalyst_wifi_calling_settings

Change-Id: I3d78b6745e1127a0a7e73ec20ae95e9c9db2c139
 2024-10-24 10:44:24 +08:00
Fan Wu
62c2800b3f Fix test failure 
Bug: 375011040
Test: atest
Flag: EXEMPT fix test
Change-Id: Id2ecf785655dfcca9f65fc3ee64ffae11fc78e88
 2024-10-24 02:34:57 +00:00
Jacky Wang
45a2c3e5b8 Refactor DarkModePreference for catalyst 
Bug: 375132235
Flag: EXEMPT refactor
Test: N/A
Change-Id: I17a63ad62d3b9fced4305d464372f2eab5023e3f
 2024-10-24 07:54:26 +08:00
Android Build Coastguard Worker
f808bfa343 Merge cherrypicks of ['googleplex-android-review.googlesource.com/29867935'] into 24Q4-release. 
Change-Id: I92ffc07d2dad090f4e2373c4562ce60d660f898e
 2024-10-23 22:51:13 +00:00
Edgar Wang
4d2012ccf9 [Homepage Revamp] hide the scroll bar of homepage 
Bug: 364612225
Test: visual
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b246d2e8152eda94691a463a70973166e98c39c9)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e3c7913e3c9ffb9e95675d1731e8bf9a58082a18)
Merged-In: I0d4c48ef6debfa82597db48a4320b0500f330b1b
Change-Id: I0d4c48ef6debfa82597db48a4320b0500f330b1b
 2024-10-23 22:47:58 +00:00
Matías Hernández
5c751da617 Merge "Change the icon in the trigger segment for TYPE_DRIVING modes" into main 2024-10-23 18:06:09 +00:00
David Liu
b42e77308c Merge "Migrate Adaptive Connectivity" into main 2024-10-23 17:47:48 +00:00
Treehugger Robot
19c977a03a Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-10-23 17:35:00 +00:00
Treehugger Robot
024e643b85 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-10-23 17:35:00 +00:00
Treehugger Robot
16cd9324eb Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-10-23 17:35:00 +00:00
Treehugger Robot
384c432857 Merge "Removes overrides for shortcut-required service toggling." into main 2024-10-23 16:49:20 +00:00
Matías Hernández
1694adb1aa Change the icon in the trigger segment for TYPE_DRIVING modes 
Use the "settings gear" icon instead of the "car" icon.

Fixes: 369326738
Test: manual
Flag: android.app.modes_ui
Change-Id: I49d7089558fcd0b9e02020a8ad215bc23ebb8e0e
 2024-10-23 16:13:57 +00:00