PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
140,934 Commits 1 Branch 0 Tags
0569121109cd129b38ba36169bc4d6f253c51a4b
Commit Graph

140934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Willcox
0569121109 Add @RequiresPermission to ACTION_PREPARE_FACTORY_RESET 
Also make it public. This should allow it to be detected appropriately
by the GMSCore permission registry machinery.

Bug; 346611867
Test: builds

Change-Id: I15aa99541f33124ab6aea284889351d86753fa56
 2024-06-11 20:58:29 +00:00
Joshua Mccloskey
f567d19681 Merge "Biometrics Enrollment refactor (7/N)" into main 2024-06-07 18:23:56 +00:00
Treehugger Robot
99ef6d2545 Merge "Revert "Convert clipboard access to use new APIs"" into main 2024-06-07 17:43:16 +00:00
Automerger Merge Worker
b09c5aeae4 Merge changes from topic "am-411537407ad14192a6135ffd294cb2ee" into main 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 3f3b28a2a2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f79f3e63dd -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 83b536da3c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e70d26c5a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f94083b1eb -s ours
 2024-06-07 17:37:33 +00:00
Treehugger Robot
afde7fb5e2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 49fc24f35d -s ours 
am skip reason: contains skip directive

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

Change-Id: I33949d2bb046c5ffb46e7bb47d7f4bedb0715a0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-07 17:34:16 +00:00
Bill Yi
7f839a0f57 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aaabd291d2 -s ours 
am skip reason: contains skip directive

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

Change-Id: I93d45b2024f59bd914ccfe992230254cbcb5c2af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-07 17:34:06 +00:00
Bill Yi
6c75205d7d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49b772f03e -s ours 
am skip reason: contains skip directive

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

Change-Id: I66fe9c91a54b735d8e6b64b1580f540dc2c9075b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-07 17:33:03 +00:00
Treehugger Robot
32e1e686b7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 3f3b28a2a2 -s ours 
am skip reason: contains skip directive

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

Change-Id: I65988560d14969f9ad3e1c09e8388f011aabd6eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-07 17:32:56 +00:00
Bill Yi
c56b1e1889 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f79f3e63dd -s ours 
am skip reason: contains skip directive

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

Change-Id: I01e677c709954a58bd0e61765abf7a90833d7969
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-07 17:32:50 +00:00
Treehugger Robot
9556dc0063 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 83b536da3c -s ours 
am skip reason: contains skip directive

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

Change-Id: Ic8e63f5bad1b0aadac17599a45c2fed2bd6f9807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-07 17:32:45 +00:00
Bill Yi
792b43221d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e70d26c5a -s ours 
am skip reason: contains skip directive

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

Change-Id: Id88a0c879ccf81f8d82106f0f00ddfdfdebba9ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-07 17:32:36 +00:00
Bill Yi
c6c3ac81d1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f94083b1eb -s ours 
am skip reason: contains skip directive

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

Change-Id: I37187d29cc5ff70158259005f26691b2c54873f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-07 17:32:32 +00:00
Treehugger Robot
3f3b28a2a2 Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev 2024-06-07 17:15:19 +00:00
Treehugger Robot
83b536da3c Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev 2024-06-07 17:15:19 +00:00
Treehugger Robot
49fc24f35d Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2024-06-07 17:14:27 +00:00
Treehugger Robot
262852a641 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-06-07 17:04:36 +00:00
Treehugger Robot
7d4833dc37 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-06-07 17:04:36 +00:00
Treehugger Robot
7882d51ddf Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-06-07 17:04:36 +00:00
Nate Myren
3dc6a7f6be Revert "Convert clipboard access to use new APIs" 
This reverts commit 7667643ef6.

Reason for revert: b/345139412

Change-Id: Iebea39e034faeab53d972c691477e2d710787a14
 2024-06-07 16:37:19 +00:00
Treehugger Robot
87334e9c38 Merge "Add Settings for vector-specific PointerIcon fill colors." into main 2024-06-07 16:31:59 +00:00
Joseph Vincent
933971ff15 Merge "Fix to display text properly in PS education screen" into main 2024-06-07 12:57:29 +00:00
josephpv
cbf3dad3f5 Fix to display text properly in PS education screen 
This changes the style for text in private space education screen
bullet point to fix the text not displaying properly in unfolded mode of
Pixel fold.

Recording: b/340231182#comment4

Bug: 340231182
Test: Manual
Change-Id: I4da02da6ddf6b4f048cc58331d14cda389f13dec
 2024-06-07 11:07:11 +00:00
YK Hung
06ee9cdb27 Merge "Allow wireless charging label to customize content descriptions" into main 2024-06-07 10:55:26 +00:00
Joseph Vincent
b6e9469834 Merge "Revert "Add footer in private space auto lock settings page"" into main 2024-06-07 10:24:38 +00:00
Joseph Vincent
a4ce3bec70 Revert "Add footer in private space auto lock settings page" 
This reverts commit 5fd6d6435b.

Reason for revert: As per b/343166689#comment4 this change as this is not needed based on the feedback from leads review.

Change-Id: Iad31aafbce5f3f9fc37fdd8fb4d5582cfae9d8b7
 2024-06-07 09:18:54 +00:00
Treehugger Robot
1b791e8b1b Merge "Fix NPE force close if disabling BT feature" into main am: 1bb8e28762 am: 95da1e4de2 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3118024

Change-Id: Ie62ff501460906c7973a0c393f61d284c0599a6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-07 09:15:35 +00:00
Yiyi Shen
2909bf380e Merge "[Audiosharing] Log action when change primary device" into main 2024-06-07 09:09:24 +00:00
Treehugger Robot
95da1e4de2 Merge "Fix NPE force close if disabling BT feature" into main am: 1bb8e28762 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3118024

Change-Id: Ibb00cb80a1d0c34a5a73f26b21ebe212692fc49c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-07 08:56:58 +00:00
Treehugger Robot
1bb8e28762 Merge "Fix NPE force close if disabling BT feature" into main 2024-06-07 08:35:48 +00:00
Yiling Chuang
6dc8193d81 Allow wireless charging label to customize content descriptions 
Fixes: 343616480
Test: atest SettingsRoboTests
Change-Id: I0d87b50fd88167b57ce9d9b06d776ba2ebe304ea
 2024-06-07 07:20:22 +00:00
hoffc
de3f413ecd Fix NPE force close if disabling BT feature 
adapter can be null in some SPs which disable bluetooth feature
from framework, so it will lead to NPE force close in these SPs.

Add null check for adapter.

Bug: 345584461

Change-Id: I3fabe94a97cc9baf7b1739fe1c9160a52b50d7d4
 2024-06-07 13:00:03 +08:00
Chaohui Wang
efa1f0e3ed InternetPreferenceController V2 (1/n) 
Refactor the InternetPreferenceController, migrate to repository and
flow, run data loading on background thread.

Only add Wifi summary for now.

Bug: 339884322
Flag: com.android.settings.flags.internet_preference_controller_v2
Test: manual - on Internet
Test: unit test
Change-Id: Ibd8911bc11b24d4a7e2ef320dea4d38b9c3a864f
 2024-06-07 12:28:44 +08:00
Weng Su
2ac12d024f Merge "Fix Wi-Fi calling test case" into main 2024-06-07 03:47:24 +00:00
Ang Li
d20d913a13 Merge "Re-enable settings password tests." into main 2024-06-07 03:21:26 +00:00
Joseph Vincent
4885f1833c Merge "Remove temp GAIA education screen from PS setup code" into main 2024-06-07 02:47:30 +00:00
Bill Yi
f79f3e63dd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id6efb8bec50daf9424010f8d39553cc7d1c2a0a0
 2024-06-06 19:06:28 -07:00
Bill Yi
8cc5c6de9c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iba71587b6e1c30fa1d4bc721c69de96289e89b74
 2024-06-06 19:05:39 -07:00
Ang Li
68f1397e1c Re-enable settings password tests. 
Bug: 344611440
Test: atest -c SettingsRoboTests
    (http://fusion2/749378e0-712e-4817-a490-d80f044c2f37)
Change-Id: I7d3f69df19accf9d22040706dba74ae6be304e85
 2024-06-07 02:05:17 +00:00
Bill Yi
8e70d26c5a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ied4d3699516465c3e725b70d02d2b3c96f5c1a00
 2024-06-06 19:03:28 -07:00
Bill Yi
d7e7e6dca3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I833fc6d1e2bae38afc9c6b003077290dd7b6dfc8
 2024-06-06 19:01:39 -07:00
Bill Yi
f94083b1eb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2e1fe9d37d18b7798782cad6d9d1f7e51b3b7125
 2024-06-06 19:00:10 -07:00
Bill Yi
0e3965dc66 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I41aedaaef23f4a5bdcb7c298205318f3ddf1e4a3
 2024-06-06 18:59:17 -07:00
Bill Yi
aaabd291d2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0899408e317dfa50cf5b450f8eb8b2a889976082
 2024-06-06 18:57:44 -07:00
Bill Yi
49b772f03e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4b8b7c0b9725b6afa65cc8aae6d72aa8acd11b60
 2024-06-06 18:56:18 -07:00
Treehugger Robot
96a1e43d98 Merge "Loading the A11yHearingAidPreference summary in the background" into main 2024-06-07 00:26:38 +00:00
Chun-Ku Lin
b80641ba26 Loading the A11yHearingAidPreference summary in the background 
Bug: 327052480
Flag: EXEMPT low risk bug fix
Test: atest com.android.settings.accessibility
Change-Id: I644be0c7ee289a4ea675984068ac494b97ebff68
 2024-06-06 23:11:51 +00:00
Weng Su
ca13280e56 Fix Wi-Fi calling test case 
Fix: 337417499
Flag: TEST_ONLY
Test: atest passed
atest -c NetworkProviderWifiCallingGroupTest

Change-Id: I2d57287a85075685b0bdb35a59dc8b147e90d38c
 2024-06-06 21:39:00 +00:00
Xin Li
ad8021701f [automerger skipped] Merge "Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future" into aosp-main-future am: 9bf082ae01 -s ours 
am skip reason: Merged-In Id3d79805bb2289b84ad34ac05a97e50f0410502f with SHA-1 a39c14c08e is already in history

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

Change-Id: I10c5cffa58c6b723183c73bd20dd449d4f545653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-06 21:37:43 +00:00
Xin Li
f53ece6b3f [automerger skipped] Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future am: 3c3a1cc6c6 -s ours 
am skip reason: Merged-In Id3d79805bb2289b84ad34ac05a97e50f0410502f with SHA-1 a39c14c08e is already in history

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

Change-Id: I65a2176a53e8e0abc5ca9a7459577b7bb776b49f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-06 21:36:05 +00:00
Xin Li
9bf082ae01 Merge "Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future" into aosp-main-future 2024-06-06 20:54:42 +00:00