PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
130,868 Commits 1 Branch 0 Tags
2b11df8aa0763986934b67d88b9a19d3344893fb
Commit Graph

130868 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Tuttle
20ac28dfa2 Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e am: 4d3b967fb8 am: 205135ffa4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613

Change-Id: I5550ca3651118e96d986cc714102596966a380b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 18:36:04 +00:00
Julia Tuttle
d68cf98dc7 Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e am: 4e6fecc6d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613

Change-Id: I19e4f1cd8664cb6483110b8373d68f4a73977e93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 17:51:38 +00:00
Julia Tuttle
205135ffa4 Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e am: 4d3b967fb8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613

Change-Id: I4fb9af8f7ea4bf07b81b9a12034700cee6ca5905
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 17:48:41 +00:00
Julia Tuttle
1ddbbd4542 Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e am: 2390428dd8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613

Change-Id: I62ce7d8d02d54605e3115ed3abd7583ad05010be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 17:48:39 +00:00
Julia Tuttle
4d3b967fb8 Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613

Change-Id: Id026252a0ef651a3ef12d1e1fdbf261368f0d18e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 17:06:35 +00:00
Julia Tuttle
2390428dd8 Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613

Change-Id: Iaf0c32fc2ff4450dadc2256601d6966e5bd73d76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 17:06:19 +00:00
Julia Tuttle
4e6fecc6d7 Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613

Change-Id: I70c6b9024fe1cbb7cf37bfea71225a8bebe5df50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 17:06:04 +00:00
Julia Tuttle
bd74e47e5e Merge "Fix colors in importance and conversation priority preferences" into udc-dev 2023-06-20 16:21:01 +00:00
Treehugger Robot
01c4dd3eb8 Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am: aa3dc53d97 am: 45918b72bf am: e1858cab06 am: 975e782dd4 am: a58d63cfc7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629212

Change-Id: Ibb680bb112743989cc8f1468b08ea1e547974cc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 15:58:58 +00:00
Treehugger Robot
a58d63cfc7 Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am: aa3dc53d97 am: 45918b72bf am: e1858cab06 am: 975e782dd4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629212

Change-Id: I9294386b4cec4e05c6d843420313dc52a74efa9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 15:20:54 +00:00
Treehugger Robot
975e782dd4 Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am: aa3dc53d97 am: 45918b72bf am: e1858cab06 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629212

Change-Id: I4b486b4da6d99522ab004876fb1abdc2f45766dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 14:37:21 +00:00
Treehugger Robot
e1858cab06 Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am: aa3dc53d97 am: 45918b72bf 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629212

Change-Id: I41a6347afc1fe6a038ac75bf6a76855b42268f3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 13:50:31 +00:00
Treehugger Robot
45918b72bf Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am: aa3dc53d97 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629212

Change-Id: I11e6110ba0b640be8b373d9afd45f806c005b05f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 13:13:42 +00:00
Treehugger Robot
aa3dc53d97 Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" 2023-06-20 12:13:34 +00:00
YK Hung
5c75161739 Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 am: a2c73328eb am: ca2d241193 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285

Change-Id: I2463020cc7e3e92dec0bc6e79bb01dbf87ea29c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 08:35:28 +00:00
YK Hung
207b990ff4 Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 am: a2c73328eb am: d97a38be76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285

Change-Id: I791fc6a8d3199ef2ba76df495087ffe309e5ad7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 08:07:18 +00:00
YK Hung
7f9afcf553 Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 am: 5007841ebd am: c2e7b61ee9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285

Change-Id: Iaf945a698cf20ed42a5c357381783ef7c238b825
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 08:07:05 +00:00
YK Hung
ca2d241193 Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 am: a2c73328eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285

Change-Id: I796b185b0dfbb3322289913c87a220a4501fdd1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 07:51:01 +00:00
Automerger Merge Worker
cea910f8ae Merge "Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 am: 0d8db71d44" 2023-06-20 07:46:48 +00:00
YK Hung
d97a38be76 Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 am: a2c73328eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285

Change-Id: I0d36918b61c7768e75965b8a6eb77519e1bade53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 07:46:39 +00:00
YK Hung
3a04e20f39 Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 am: 94f5c7a913 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285

Change-Id: I825b76d4c744ed5edc2ce4732d120f44b40fb0d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 07:46:39 +00:00
YK Hung
fdfce46f25 Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 am: 0d8db71d44 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285

Change-Id: Ia1122a31159b6a3fe6613ba39c575598635a5e39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 07:46:39 +00:00
YK Hung
c2e7b61ee9 Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 am: 5007841ebd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285

Change-Id: If3a00b355020c1307999684330297e4a388ba8dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 07:28:29 +00:00
YK Hung
a2c73328eb Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285

Change-Id: I67be253b5b2560bdbe9869376bfa394772fadf3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 07:05:48 +00:00
YK Hung
0d8db71d44 Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285

Change-Id: I3158ea89ef2804c5a9878ff27db5b9b4466e0644
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 07:05:48 +00:00
YK Hung
94f5c7a913 Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285

Change-Id: I3b226770289800cec4196a6b34ceb05f090a6d69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 07:05:34 +00:00
YK Hung
5007841ebd Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285

Change-Id: Id6b352d47918565fac42659529c97d1b4c89606f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 07:01:29 +00:00
YK Hung
a4f67e02c8 Merge "Update tablet help article link (1/2)" into udc-dev 2023-06-20 06:34:46 +00:00
TreeHugger Robot
3924138fb7 Merge "Update BatterySettingsFeatureProvider interface" into udc-qpr-dev am: fcd80ade3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23729063

Change-Id: Ic6a9df6ddf6ca3c0cd5f8501f95cf4684a9d43a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 02:59:40 +00:00
TreeHugger Robot
fcd80ade3b Merge "Update BatterySettingsFeatureProvider interface" into udc-qpr-dev 2023-06-20 02:08:25 +00:00
Dmitrii Merkurev
d7d4ec224f Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE 
Currently factory reset action is ignored if
PERSISTENT_DATA_BLOCK_SERVICE isn't presented on device.
Make sure that we can execute regular factory reset without
it by utilizing the logic from shouldWipePersistentDataBlock.

Test: manual verify on aosp build
Bug: 129137473
Bug: 196634851
Change-Id: I2abcb93cbc0872dd920c1dd62152596ddd723691
Signed-off-by: Dmitrii Merkurev <dimorinny@google.com>
 2023-06-19 21:06:25 +01:00
Chaohui Wang
8429e8cc79 Merge "Update the OWNERS for bluetooth & connecteddevice" am: 6b2f2ab205 am: 7fdf1c4b17 am: b1231c5f15 am: 6bceb29408 am: c1f06b5e28 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629910

Change-Id: Ie6831edecd10cceb2cdf3e3d9ac242cdbd462dd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 12:05:27 +00:00
Chaohui Wang
c1f06b5e28 Merge "Update the OWNERS for bluetooth & connecteddevice" am: 6b2f2ab205 am: 7fdf1c4b17 am: b1231c5f15 am: 6bceb29408 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629910

Change-Id: I95132b6df6fe214a0bae54b9c7be69efa77292b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 11:28:16 +00:00
Chaohui Wang
6bceb29408 Merge "Update the OWNERS for bluetooth & connecteddevice" am: 6b2f2ab205 am: 7fdf1c4b17 am: b1231c5f15 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629910

Change-Id: I936a6e4a4f24a7f8c238662ec09a02f7a3e985e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 10:45:36 +00:00
Chaohui Wang
b1231c5f15 Merge "Update the OWNERS for bluetooth & connecteddevice" am: 6b2f2ab205 am: 7fdf1c4b17 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629910

Change-Id: I9e87eec0995e9dde010a51e3a7ccbaf68839a696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 09:56:38 +00:00
Chaohui Wang
7fdf1c4b17 Merge "Update the OWNERS for bluetooth & connecteddevice" am: 6b2f2ab205 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629910

Change-Id: Ia337805f374b7c05bac8902ff9add84ced999f9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 09:17:09 +00:00
Chaohui Wang
6b2f2ab205 Merge "Update the OWNERS for bluetooth & connecteddevice" 2023-06-19 08:29:54 +00:00
Chaohui Wang
4828cfe003 [LE Broadcast] Fix crash when scan QR code am: c91d017080 am: 542ef9e5b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23729065

Change-Id: Ibd5bdff42b89e2097f039d6fac1879adfecf26ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 07:51:12 +00:00
Chaohui Wang
d7147fd952 [LE Broadcast] Fix crash when scan QR code am: c91d017080 am: fd264a7696 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23729065

Change-Id: Ica82921f80d6c5d796974d34d9a0e710e38eddf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 07:44:49 +00:00
Chaohui Wang
85c1dea20a Update the OWNERS for bluetooth & connecteddevice 
Bug: N/A
Test: N/A
Change-Id: I72b4b6f47586b2dd13cfcc4a642c817c93e4ded0
 2023-06-19 07:35:20 +00:00
Chaohui Wang
542ef9e5b2 [LE Broadcast] Fix crash when scan QR code am: c91d017080 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23729065

Change-Id: I6e14d7a963c2a81b48111d6103502288b23215b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 07:05:44 +00:00
Chaohui Wang
fd264a7696 [LE Broadcast] Fix crash when scan QR code am: c91d017080 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23729065

Change-Id: I0ca420666067575ff0e970a0ec255b024e7ed8e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 07:01:37 +00:00
Chaohui Wang
68159be3ee [lint] Fix Wrong Resource Type am: 7aaceaa782 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23734154

Change-Id: If50e377055875ff4814e6b479ba9e474cf62b91c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 05:55:25 +00:00
TreeHugger Robot
7f45861797 Merge "Fix Settings app ANR due to blocking IDumpstateDevice IPC call" 2023-06-19 05:20:22 +00:00
Chaohui Wang
7aaceaa782 [lint] Fix Wrong Resource Type 
Bug: 285231003
Test: m Settings
Change-Id: I8dfbaf1342f014af35cd08906ac3f498b6c8c11a
 2023-06-19 10:17:35 +08:00
TreeHugger Robot
bf296dc1bd Merge "[BiometricsV2] Refactor Fingerprint intro fragment" 2023-06-19 02:16:22 +00:00
Chaohui Wang
af3f8ce6dd Merge "Clean up Settings_srcs & Settings_manifest" 2023-06-18 04:07:47 +00:00
Milton Wu
8e42d7c85a [BiometricsV2] Refactor Fingerprint intro fragment 
Refactor FingerprintEnrollIntroFragment to kotlin and add bindView()
method for it.

Bug: 286197823
Test: atest FingerprintEnrollmentActivityTest
Change-Id: I44157bf2c2bea6f49382335438b16aae3e3e5b4c
 2023-06-17 18:16:17 +08:00
Treehugger Robot
cfc7387cc5 Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev am: 08366227b5 am: 44fddb456e am: 7d837a745a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691723

Change-Id: Ief4518b27fde4b5acb2025cfba14bc6cb538fc32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-17 07:48:30 +00:00
TreeHugger Robot
12255bf880 Merge "[Settings] Avoid NPE when user enter WifiCallingSettings back and forth" into udc-d1-dev am: 1765c1dc6e am: 7d941f3e34 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695884

Change-Id: Ie8f265484518d5adcb2a7c76625f8a8ef87f4e3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-17 07:48:22 +00:00