PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
112,246 Commits 1 Branch 0 Tags
45918b72bf926b992fb65444e17aeb1b010bca72
Commit Graph

112246 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
85c1dea20a Update the OWNERS for bluetooth & connecteddevice 
Bug: N/A
Test: N/A
Change-Id: I72b4b6f47586b2dd13cfcc4a642c817c93e4ded0
 2023-06-19 07:35:20 +00:00
Treehugger Robot
2c73cc8ca8 Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935

Change-Id: Id3c8af985ccaaa05e29238bc3c0bcda257fe132e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 09:50:45 +00:00
Treehugger Robot
a3f9f42b71 Merge "'Mobile plan' is searchable even if it is unavailable" 2023-06-15 08:57:32 +00:00
David Magno
50e8eab484 'Mobile plan' is searchable even if it is unavailable 
'Mobile plan' yields a search hit event though the 'Mobile plan'
setting is unavailable on the device.

Bug: 287198186
Test: Manual
Change-Id: Ibc6f01602a364ae902f8a6ce15083890e89446d2
 2023-06-14 16:25:27 +02:00
SongFerng Wang
448c8b61a8 Merge "Remove the owner" am: 286344d539 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2623772

Change-Id: Iad21da9fbcd8d9279c27beb7a7c0761644d8f2b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 05:36:47 +00:00
SongFerng Wang
286344d539 Merge "Remove the owner" 2023-06-14 05:01:51 +00:00
SongFerngWang
f405dadcf2 Remove the owner 
Bug: 286964921
Test: build pass
Change-Id: I4daf629e8cb994753dca36a811f0d25685df6928
 2023-06-13 15:10:46 +08:00
Treehugger Robot
d422e6e895 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 17d8a837ee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I09dec05a1a1ff91d9aa08ba1977d71c5411f822e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 20:13:57 +00:00
Bill Yi
44b121b7c9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a80c569b36 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3ddc1ad1814db16b6a9ff11046cc1b58ee9038b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 20:13:39 +00:00
Treehugger Robot
6bf1d3b6cc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 675179075c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If22ae483107c3450ce9fa30d462f2530bb6e3da2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 20:13:18 +00:00
Bill Yi
4447361119 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5dcde1cfde -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia3ca6c734cd069412d0a98f9b188af3ac54eb18d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 20:12:57 +00:00
Treehugger Robot
675179075c Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-06-08 19:37:07 +00:00
Treehugger Robot
17d8a837ee Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-06-08 19:37:07 +00:00
Joanne Chung
e7b01f0ce8 Merge "Update OWNER file to new owner" am: 6c84f9128d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2618630

Change-Id: Ie7ac04781ba486dd74af1df57a995636453eb21a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 07:23:35 +00:00
Joanne Chung
6c84f9128d Merge "Update OWNER file to new owner" 2023-06-08 06:40:49 +00:00
Joanne Chung
674ae4ae93 Update OWNER file to new owner 
Bug: 177641730
Change-Id: I68e9986338e04bb81a11a495f6de1657399b5742
Test: n/a. Only update owner
 2023-06-08 06:40:41 +00:00
Treehugger Robot
6cb0b2c68e Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2023-06-05 19:36:58 +00:00
Bill Yi
a80c569b36 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2ded1221447056932b184fad3f13750d46103fc0
 2023-06-04 19:33:29 -07:00
Bill Yi
5dcde1cfde Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Icd41c34edf3b72e7b66044b7f772ba15c85f85ec
 2023-06-04 19:31:56 -07:00
Bill Yi
8cb99dd3e3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id8d72c85deddd4bbb0a4fb49b71c6c929bf253db
 2023-06-04 12:26:25 -07:00
Bill Yi
59cfc8ae14 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib2c29e2e9c358a14b63738fba13a296d7d49f9ed
 2023-06-04 12:24:22 -07:00
Jason Chiu
390c348d4b Merge "Do not init dashboard categories when SetupWizard isn't finished yet" am: 428e97cdfa 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2608473

Change-Id: I3d1b66a4288434d52075538af737c2d1ac33f4e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 08:49:21 +00:00
Jason Chiu
428e97cdfa Merge "Do not init dashboard categories when SetupWizard isn't finished yet" 2023-06-02 08:05:32 +00:00
Jason Chiu
2225729ce2 Do not init dashboard categories when SetupWizard isn't finished yet 
The generated category cache during SetupWizard flow is invalid.

Bug: 261885832
Test: manual
Change-Id: Id2108b2cc4ab557b086c4dbbd5dc7722c73e74d3
 2023-06-02 04:55:20 +00:00
Treehugger Robot
381ac521bd Merge "Fix resource leakage caused by cursor" am: 662ba59a47 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2608471

Change-Id: Idebb2842aa83cabc6d85e9d277cdb29bbd45362d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-01 22:44:05 +00:00
Treehugger Robot
662ba59a47 Merge "Fix resource leakage caused by cursor" 2023-06-01 22:10:34 +00:00
Cao Peng
38f1b45d50 Fix resource leakage caused by cursor 
Change-Id: I9507658cc82a2b9760507530920a37044f7de2fd
Signed-off-by: Jia Jia <jia.jia@zte.com.cn>
 2023-06-01 18:16:26 +08:00
Treehugger Robot
340fde1f0f Merge "Owners updates" am: b2b16851ef 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2601706

Change-Id: I1877aa7d17aa8d93e7e665d8f12e7c7ac2739926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 08:49:15 +00:00
Treehugger Robot
b2b16851ef Merge "Owners updates" 2023-05-24 07:54:26 +00:00
Weng Su
e12733d72f Owners updates 
- English prefix order update

Test: N/A, just owners update
Change-Id: I8faae968bc0860be2f2cb8503949938a82d2abbd
 2023-05-24 07:41:50 +00:00
Treehugger Robot
e638ec642f Merge "Owners updates" am: 21bc49159a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2601705

Change-Id: I78863e0d04c593a97e49aa176d0469a3b2ac8418
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 03:53:00 +00:00
Treehugger Robot
21bc49159a Merge "Owners updates" 2023-05-24 03:08:29 +00:00
Weng Su
09bcf96bcd Owners updates 
- Add Pixel Settings owners

Test: N/A, just owners update
Change-Id: I3821380595857b0b2b2687ceb7191f7b6e0b2018
 2023-05-23 21:04:29 +00:00
Fangqiu Su
942671e18a Merge "Update uiautomator references in packages/apps/Settings/tests/anomaly-tester" am: 0a3a5b74a1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558310

Change-Id: I4d7c2aa70600ffecdda7aa467926993732e1fb72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:19:48 +00:00
Fangqiu Su
0a3a5b74a1 Merge "Update uiautomator references in packages/apps/Settings/tests/anomaly-tester" 2023-05-11 19:50:53 +00:00
Evan Laird
b4d2e7da30 Merge "Set default value of battery percent preference" am: 145caf7d4e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1719617

Change-Id: I34fe8a73fb89283e44dd46c9c655f8db9353e41b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 16:37:47 +00:00
Evan Laird
145caf7d4e Merge "Set default value of battery percent preference" 2023-05-09 15:53:08 +00:00
Mattias Nilsson
03a0bdd030 Set default value of battery percent preference 
Read config_defaultBatteryPercentageSetting to set default
preference value for battery percentage in SystemUI.

Bug: 189235242
Test: Set resource and check device at boot
Change-Id: I6427a3b76f5641b387dc19f45e17b30820911e3a
 2023-05-04 23:23:48 +00:00
Bill Yi
eb890c8bf8 [automerger skipped] Merge "Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE" am: e48fa8c19f -s ours 
am skip reason: Merged-In Ib0806c0bf18797da3e44dbe4800283430120b49a with SHA-1 c40b06b687 is already in history

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

Change-Id: I93c612069bd783894cfbc07e1f7e1028dd1a7780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 23:21:20 +00:00
Bill Yi
3f186b6b1c [automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am: 82c92ce15c -s ours 
am skip reason: Merged-In Ib0806c0bf18797da3e44dbe4800283430120b49a with SHA-1 c40b06b687 is already in history

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

Change-Id: I9fd542fb1505109f1e68ce2849d06061b7498093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 23:21:02 +00:00
Bill Yi
e48fa8c19f Merge "Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE" 2023-05-04 22:39:57 +00:00
Bill Yi
82c92ce15c Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE 
Merged-In: Ib0806c0bf18797da3e44dbe4800283430120b49a
Merged-In: I865cc944ab660f47b40b48af32a7aef389551963
Merged-In: I4d39e88aca6e31c3e897a0d16ec45124906d63cc

Change-Id: Idb27df03638d87ca39b150dd618cbb5ade831f4c
 2023-05-03 15:54:48 -07:00
Treehugger Robot
c40b06b687 Merge "[Settings] Update code owner" am: 709b27384b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2527125

Change-Id: Ib0806c0bf18797da3e44dbe4800283430120b49a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 09:42:22 +00:00
Treehugger Robot
709b27384b Merge "[Settings] Update code owner" 2023-04-27 09:12:59 +00:00
Treehugger Robot
83f2d27e35 Merge "Fix AppEntry.extraInfo ClassCastException" am: 327867e56b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2564510

Change-Id: I1ad0bc2266bb528fccf3e3e83f4fd06ca47bb3c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 04:25:07 +00:00