PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
112,325 Commits 1 Branch 0 Tags
16a38009027f8dba49fd7ed01e88e8a112cdbf5f
Commit Graph

112325 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
22ac363063 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a05355cc0a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id50e309e1e7ec51833f650c7d962217200b4c6dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 18:11:25 +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
Lin Yuan
062a9ca549 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Bug: 277333746
Bug: 277333781
Change-Id: I91aa143223d7d37751120aa9246bce4dc31a54a6
 2023-04-25 19:24:13 +00:00
Lin Yuan
7591fff234 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
Change-Id: I52f9a11b1dd78a5e5dbb1bbde3cda7381c87ae39
 2023-04-25 19:23:53 +00:00
Treehugger Robot
0cb641a695 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33837c6766 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3c3aea61ecf73401c0545f194bf54c1ab05ec0a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:00:30 +00:00
Treehugger Robot
953f6167e9 Merge changes from topic "tc_change_23042206_55" into tm-qpr-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ca18853bab
  Import translations. DO NOT MERGE ANYWHERE
 2023-04-25 16:17:15 +00:00
Treehugger Robot
33837c6766 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-04-25 16:17:03 +00:00
Fangqiu Su
29f3d022f7 Merge "Update uiautomator references in packages/apps/Settings/tests/perftests" am: 2fba2c2316 am: 8d16e20d78 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558350

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

Change-Id: I5ddfb48e1809ce7c51163d30c0e283c3b3bc5c99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 07:05:33 +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
SongFerng Wang
b0f9c2deae Merge changes from topic "presubmit-am-58603bfd39e0474b9e10a90af62fa3f5" into tm-qpr-dev-plus-aosp 
* changes:
  [automerge] Replace the SlicePreference with Preference 2p: 794fc58235
  Replace the SlicePreference with Preference
 2023-04-25 05:52:54 +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
5ed8e6bc0e Merge "Update uiautomator references in packages/apps/Settings/tests/unit" am: 233c708436 am: a176782c18 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558510

Change-Id: I2eaa42894698dd627630aba0480046e81fb31b7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 01:11:31 +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
aaa28fb0e7 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ca18853bab 
Blank merge reason: commit message contains skip directive

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

Change-Id: I7923220a59923528c5ca01061d950381fb79a823
 2023-04-22 14:16:37 +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
Bill Yi
a05355cc0a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9526dff7032a7247775459386d64669e27068665
 2023-04-21 23:39:13 -07:00
Bill Yi
ca18853bab Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If34cd71ef08b67f4463d83cd1afd5361bae4b873
 2023-04-21 17:17:53 -07:00
Xin Li
57c5a99b9f [automerger skipped] Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master am: f64573ee7c -s ours 
am skip reason: Merged-In I07d10fb2cb1cb267bc78b0be2c930d7dec9d9c76 with SHA-1 a568dc677b is already in history

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

Change-Id: Ica592b8926aca252eb1384319bd886b633ac185f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 18:18:31 +00:00
Xin Li
b27298c4fe [automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 752715c5ca -s ours 
am skip reason: Merged-In I07d10fb2cb1cb267bc78b0be2c930d7dec9d9c76 with SHA-1 a568dc677b is already in history

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

Change-Id: I384b965aecd6723b49042933cd1116365da09f57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 18:15:13 +00:00
Xin Li
f64573ee7c Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master 2023-04-21 17:40:03 +00:00
Presubmit Automerger Backend
56c8b39d51 [automerge] Replace the SlicePreference with Preference 2p: 794fc58235 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22755956

Bug: 270544054
Change-Id: I88bb34649b2a1da21e6a3a36d90bd32c17ffb5ae
 2023-04-21 15:08:44 +00:00
SongFerngWang
794fc58235 Replace the SlicePreference with Preference 
The Settings' 2 panel did not support SlicePreference, since it
always open activity with NEW_TASK and it casues the settings can't
set new page at right side.

Bug: 270544054
Test: build pass. local test: the phone pair the buds with fastpair, and
then check the slice preferences.
atest BlockingPrefWithSliceControllerTest (pass)

Change-Id: I0e8abfd284492f04ab322a5bed13741fc6b25b34
 2023-04-21 23:08:06 +08:00
Zoey Chen
2fca3dfff0 [Settings] Update code owner 
Bug: NA
Test: build pass
Change-Id: I6885b8655b8b65511beb3d20732335239f7e3a0f
 2023-04-21 03:26:00 +00:00
Bill Yi
3e8d5a6747 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 367bedb886 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I54ba4dacd8d625dde04b8fcf72ac7131b6d498f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 18:44:39 +00:00
Bill Yi
7d7a461c85 Merge changes from topic "tc_change_23041807_35" into tm-qpr-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4ff10a38f4
  Import translations. DO NOT MERGE ANYWHERE
 2023-04-19 17:59:19 +00:00
Bill Yi
367bedb886 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-04-19 17:59:16 +00:00
Diya Bera
8a31106496 Merge "Adding owners" am: b1aabec0db am: 49ea4e5d22 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2546170

Change-Id: Ibfc5a6684f98c842f95f5cb125310d89a0035644
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 17:39:42 +00:00
Diya Bera
49ea4e5d22 Merge "Adding owners" am: b1aabec0db 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2546170

Change-Id: Ib03f9e473201e6a826cb7810e32b00ad1e3da965
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 17:11:26 +00:00
Diya Bera
b1aabec0db Merge "Adding owners" 2023-04-19 16:30:18 +00:00
Xin Li
752715c5ca Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 
Bug: 275386652
Merged-In: I07d10fb2cb1cb267bc78b0be2c930d7dec9d9c76
Change-Id: If148c3db02f9c6a8845c9ddc02eb466329dddd08
 2023-04-18 16:34:29 -07:00
Diya Bera
33fab7e415 Adding owners 
Test: N/A
Bug: 278741020
Change-Id: Ife62f56fd0e3c83427347365a1eebfad3ec3ed6d
 2023-04-18 22:56:31 +00:00
Bill Yi
411d527b94 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 26ca87ddff 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ie14298c9668f64979607171a25d97bae63266787
 2023-04-18 14:31:18 +00:00
Bill Yi
7fc6abdfb9 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4ff10a38f4 
Blank merge reason: commit message contains skip directive

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

Change-Id: Id8ec8521ee5f526a2e3e88c310371115cee8011c
 2023-04-18 14:29:59 +00:00
Bill Yi
4ff10a38f4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1c1512d129c76bdf99c95f921b05177f361736a7
 2023-04-17 21:33:14 -07:00
Bill Yi
26ca87ddff Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie1f7a198b79b22f7e52cda13589a55549189524a
 2023-04-17 21:20:25 -07:00
Zaiyue Xue
205d8249a7 String change to highlight calculation stopped at last even hour 
Bug: 278022447
Fix: 278022447
Test: manual
Change-Id: Ia04ae7c7cb4c7ebdd40f4aa3df05b34d2ce66628
Merged-In: Ia08dea791bb72113719fd1316e8e9587a96eaef1
 2023-04-17 14:58:48 +08:00
Treehugger Robot
0369c601c0 Merge "Only admin users may change private DNS settings" into tm-qpr-dev am: a5a31037cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22414528

Change-Id: Ieb88410bf1e820a660f7d650194cd426a6f3eaaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-14 15:30:04 +00:00
Treehugger Robot
a5a31037cc Merge "Only admin users may change private DNS settings" into tm-qpr-dev 2023-04-14 14:53:48 +00:00