PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
112,342 Commits 1 Branch 0 Tags
71814b355c6ab63d6e96d1b5af6b2edd14d4867c
Commit Graph

112342 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Android Build Coastguard Worker
bfbe2603b6 Merge cherrypicks of ['googleplex-android-review.googlesource.com/22861203'] into tm-qpr3-release. 
Change-Id: Ic475f6b2145d7a1056cde4b151f565d94c7bbc61
 2023-05-27 17:14:30 +00:00
Lin Yuan
349c845bf4 Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 
When DISALLOW_CONFIG_LOCATION is set, make location service's
MainSwitchPreference pages for wifi scanning and bluetooth scanning
unavailable too, so that intent direct access is disabled.

screenshot: http://shortn/_kkK3BMTSh1

Bug: 277333746
Bug: 277333781
Test: atest SettingsRoboTests, on device
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7591fff234886e79c5d0210a2cf3282a69de9be9)
Merged-In: I52f9a11b1dd78a5e5dbb1bbde3cda7381c87ae39
Change-Id: I52f9a11b1dd78a5e5dbb1bbde3cda7381c87ae39
 2023-05-27 17:13:13 +00: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
Daniel Norman
fed72b5513 Extend resource OWNERS exemption to other res folders (res-product). 
Change-Id: I7a495faf534c4e43eb856da8aa6fe3767b68e77b
 2023-05-19 19:10:44 +00:00
Android Build Coastguard Worker
c64ad6f35b [coastguard skipped] Merge sparse cherrypicks from sparse-10161073-L49900000960778179 into tm-qpr3-release. 
COASTGUARD_SKIP: I52f9a11b1dd78a5e5dbb1bbde3cda7381c87ae39
COASTGUARD_SKIP: I293fca48382fcd71a6f055e9c140a183c2c33fdf

Change-Id: Iebb890e09e34560a889f2f62b4358d511ff6e06c
 2023-05-18 22:22:56 +00:00
Android Build Coastguard Worker
4490a7c7ce Merge cherrypicks of ['googleplex-android-review.googlesource.com/22861203'] into sparse-10161073-L49900000960778179. 
SPARSE_CHANGE: I52f9a11b1dd78a5e5dbb1bbde3cda7381c87ae39

Change-Id: I293fca48382fcd71a6f055e9c140a183c2c33fdf
 2023-05-18 22:16:57 +00:00
Lin Yuan
e16026c009 Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 
When DISALLOW_CONFIG_LOCATION is set, make location service's
MainSwitchPreference pages for wifi scanning and bluetooth scanning
unavailable too, so that intent direct access is disabled.

screenshot: http://shortn/_kkK3BMTSh1

Bug: 277333746
Bug: 277333781
Test: atest SettingsRoboTests, on device
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7591fff234886e79c5d0210a2cf3282a69de9be9)
Merged-In: I52f9a11b1dd78a5e5dbb1bbde3cda7381c87ae39
Change-Id: I52f9a11b1dd78a5e5dbb1bbde3cda7381c87ae39
 2023-05-18 22:15:32 +00:00
Android Build Coastguard Worker
0e622cc347 [coastguard skipped] Merge sparse cherrypicks from sparse-10161073-L38600000960763138 into tm-qpr3-release. 
COASTGUARD_SKIP: Id0fbe60ce32e431ee9234c012287d71a58ba3eeb
COASTGUARD_SKIP: I52f9a11b1dd78a5e5dbb1bbde3cda7381c87ae39

Change-Id: I6a7eb0a58d32a480f4f911510ef3c63ca54b83c4
 2023-05-18 18:08:19 +00:00
Android Build Coastguard Worker
7dffa1ae2a Merge cherrypicks of ['googleplex-android-review.googlesource.com/22861203'] into sparse-10161073-L38600000960763138. 
SPARSE_CHANGE: I52f9a11b1dd78a5e5dbb1bbde3cda7381c87ae39

Change-Id: Id0fbe60ce32e431ee9234c012287d71a58ba3eeb
 2023-05-18 17:58:50 +00:00
Lin Yuan
154a81a2a0 Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 
When DISALLOW_CONFIG_LOCATION is set, make location service's
MainSwitchPreference pages for wifi scanning and bluetooth scanning
unavailable too, so that intent direct access is disabled.

screenshot: http://shortn/_kkK3BMTSh1

Bug: 277333746
Bug: 277333781
Test: atest SettingsRoboTests, on device
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7591fff234886e79c5d0210a2cf3282a69de9be9)
Merged-In: I52f9a11b1dd78a5e5dbb1bbde3cda7381c87ae39
Change-Id: I52f9a11b1dd78a5e5dbb1bbde3cda7381c87ae39
 2023-05-18 17:55:39 +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
Treehugger Robot
327867e56b Merge "Fix AppEntry.extraInfo ClassCastException" 2023-04-27 03:43:58 +00:00
Bill Yi
a04b6df040 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2023-04-26 17:45:07 +00:00
Bill Yi
171e66e000 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2023-04-26 17:45:07 +00:00
Bill Yi
499308fa2c Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2023-04-26 17:45:07 +00:00
Shen Lin
6beffd5bf6 Fix AppEntry.extraInfo ClassCastException 
AppEntry's extraInfo is an Object class, force cast it to Boolean may
cause ClassCastException.

Bug: 279639370
Test: presubmit
Change-Id: Iccbe9b669011c5061f1c8b3998632f05fbd8a02f
 2023-04-26 10:14:22 +00:00
Fangqiu Su
8d16e20d78 Merge "Update uiautomator references in packages/apps/Settings/tests/perftests" am: 2fba2c2316 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558350

Change-Id: I03bf08855b17f3a9d95fe00b4de68e97a62f4101
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 06:24:07 +00:00
Fangqiu Su
378e7af38e Merge "Update uiautomator references in packages/apps/Settings/tests/uitests" am: 68903eb9cb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558450

Change-Id: I5e1a6f87cc9f32c18ce84fe4d2d5a3f95ff52f5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 06:23:50 +00:00
Fangqiu Su
2fba2c2316 Merge "Update uiautomator references in packages/apps/Settings/tests/perftests" 2023-04-25 05:48:52 +00:00
Fangqiu Su
68903eb9cb Merge "Update uiautomator references in packages/apps/Settings/tests/uitests" 2023-04-25 05:47:24 +00:00
Fangqiu Su
a176782c18 Merge "Update uiautomator references in packages/apps/Settings/tests/unit" am: 233c708436 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558510

Change-Id: Ifef3769deeed83ef20214e9ade0b2f3f9000ccfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 00:27:13 +00:00
Fangqiu Su
233c708436 Merge "Update uiautomator references in packages/apps/Settings/tests/unit" 2023-04-24 23:46:23 +00:00
Fangqiu Su
828f2fcec9 Update uiautomator references in packages/apps/Settings/tests/unit 
* Remove unused dependencies.
* Replace "ub-uiautomator" (v2.2.0) with
  "androidx.test.uiautomator_uiautomator" (v2.3.0).

Bug: 235842600
Test: mmma .
Change-Id: I55c2d77b0bcd3b673de5a0b42170414de5fc3baf
 2023-04-24 18:07:07 +00:00
Fangqiu Su
643e908ec4 Update uiautomator references in packages/apps/Settings/tests/uitests 
* Remove unused dependencies.
* Replace "ub-uiautomator" (v2.2.0) with
  "androidx.test.uiautomator_uiautomator" (v2.3.0).

Bug: 235842600
Test: mmma .
Change-Id: I216758dc3898875c41f865f5aa25d20bf0386aed
 2023-04-24 18:03:02 +00:00
Fangqiu Su
61c93dc8c3 Update uiautomator references in packages/apps/Settings/tests/perftests 
* Remove unused dependencies.
* Replace "ub-uiautomator" (v2.2.0) with
  "androidx.test.uiautomator_uiautomator" (v2.3.0).

Bug: 235842600
Test: mmma .
Change-Id: I19484ff3b0c7f9db24534b175c2d321ac5a30909
 2023-04-24 17:49:02 +00:00
Fangqiu Su
38cf6857b5 Update uiautomator references in packages/apps/Settings/tests/anomaly-tester 
* Remove unused dependencies.
* Replace "ub-uiautomator" (v2.2.0) with
  "androidx.test.uiautomator_uiautomator" (v2.3.0).

Bug: 235842600
Test: mmma .
Change-Id: I35dcf0166b233f0e371857ea1b650f5803ccc561
 2023-04-24 17:33:03 +00:00
Bill Yi
efc9e1994c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iebd01ca77113b13be8c469a3105249fe6b241843
 2023-04-21 23:46:19 -07:00
Bill Yi
c416adc1df Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I50740b630f3d8ad4d10d3ba3774007bef0282672
 2023-04-21 23:43:10 -07:00