PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
126,363 Commits 1 Branch 0 Tags
380deaaa3b5d764cc58ef18550c65ae88cb751c4
Commit Graph

126363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Candice Lo
380deaaa3b Merge changes I75d810e4,I50111f0c into udc-qpr-dev am: 290d241b1b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23738691

Change-Id: I7c32cba3253b5f5811269ebe5a37099bbb8eb66c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 01:20:02 +00:00
Candice Lo
290d241b1b Merge changes I75d810e4,I50111f0c into udc-qpr-dev 
* changes:
  Doing null check before generating Extra Dim tooltip
  Doing null check before generating Font Size tooltip
 2023-06-21 00:51:48 +00:00
Julia Tuttle
41e2eb2261 Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e am: 4d3b967fb8 am: 87d6681e8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613

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

Change-Id: Ifebe3655049871518fe07073d7822a144c0d1890
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 18:36:56 +00:00
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
f5bc25cdf3 Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e am: ee0d1171aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613

Change-Id: Ib47a344852d82f4fc938a5514b50d4abea4e403e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 17:51:36 +00:00
Julia Tuttle
87d6681e8b 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: I351f38d15518deac4a5fd109b79b9ba6368d001e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 17:50:52 +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
ee0d1171aa 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: Ieaf111aae95150c6c7480ee0693478be934d6353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 17:06:47 +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
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
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
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
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
Chaohui Wang
7aaceaa782 [lint] Fix Wrong Resource Type 
Bug: 285231003
Test: m Settings
Change-Id: I8dfbaf1342f014af35cd08906ac3f498b6c8c11a
 2023-06-19 10:17:35 +08:00
Candice Lo
48999d3808 Doing null check before generating Extra Dim tooltip 
Since the lifecycle of controller is independent of that of preference,
we do null check on the switch to avoid generating tooltip from the
switch when it is not ready. The fix is a temporary solution for the
issue and we would like to move the logic of tooltip to systemUI to
match the general view's lifecycle in the future.

Bug: 286810561
Test: manually - check the tooltip won't be shown and also won't cause exception after rotating the phone. (The switch view has not been created if it is out of screen.)
Test: manually - attach video to the bug
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest
Change-Id: I75d810e4b85baf06d57a3e31797a55daac791b79
 2023-06-17 09:37:04 +00:00
Candice Lo
b66f6b67c8 Doing null check before generating Font Size tooltip 
Since the lifecycle of controller is independent of that of preference,
we do null check on the seekbar to avoid generating tooltip from the
seekbar when it is not ready. The fix is a temporary solution for the
issue and we would like to move the logic of tooltip to systemUI to
match the general view's lifecycle in the future.

Bug: 279549685
Test: manually - check the tooltip won't be shown and also won't cause exception after rotating the phone. (The seekbar view has not been created if it is out of screen.)
Test: manually - attach video to the bug
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PreviewSizeSeekBarControllerTest
Change-Id: I50111f0cc59cad4401ab67b06cd62e9067e8ed76
 2023-06-17 09:36:40 +00: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
Treehugger Robot
ea9ab2482c Merge "[Settings] Imporve MMS message UI state update" into udc-d1-dev am: 8182348d5c am: d9c0cf79e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23669450

Change-Id: I2638a5abe3ad2486b6d156eef3e8753507dfcfee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-17 07:48:13 +00:00
Matías Hernández
5b5988ce81 [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14ddd8b659 -s ours am: 85cad88256 -s ours am: 42339b4e56 -s ours am: 95a2f32e7d -s ours am: 097f9ce7b1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I98d872b679dce8f61acd1b33f9b169b0099b1304
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-17 07:48:05 +00:00
Matías Hernández
4ebe206d3c [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14c85fff7d -s ours am: 41d3ecca1c -s ours am: 4226b5bb24 -s ours am: 7b36addbb2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I09683649c55f626205e809d37ea3665afeaf147e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-17 07:47:56 +00:00
Matías Hernández
e8950434fa Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 0166bcc776 am: 46cdbed02e am: a820fd4bce am: 0bdda899d3 am: 6ca31b9630 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

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