PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
145,374 Commits 1 Branch 0 Tags
c5dc26d495758cb406f0a6161191b7f7324f9969
Commit Graph

145374 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
c8e78dc149 Merge "Hide Linux terminal if VM isn't supported" into main 2024-12-28 07:11:08 -08:00
Android Build Coastguard Worker
0aac772f54 Merge cherrypicks of ['googleplex-android-review.googlesource.com/31027098'] into 25Q1-release. 
Change-Id: I34ae6565bb0c60e8f40a09cade9e88f48191ddf0
 2024-12-26 19:07:45 -08:00
Shawn Lin
a3a7922dce Revert "[Biometric Onboarding & Edu] Update Set up Fingerprint/F..." 
Revert submission 30754151-boe_fp_unlock

Reason for revert: prevent from leakage

Reverted changes: /q/submissionid:30754151-boe_fp_unlock
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b75b3a373f359bd9e5d82d81d42f143926c423fd)
Merged-In: Ida3d127cc8cd71366c4375e90d6058e510f590c9
Change-Id: Ida3d127cc8cd71366c4375e90d6058e510f590c9
 2024-12-26 19:03:57 -08:00
Treehugger Robot
e310b7ac55 Merge "Show GSM settings with CDMA phone type" into main am: 9e1b206016 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3387241

Change-Id: I4a9fb12ab6cac10d9545df6eaf9ab1d0ebe76768
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-25 13:08:40 -08:00
Treehugger Robot
9e1b206016 Merge "Show GSM settings with CDMA phone type" into main 2024-12-25 12:38:11 -08:00
Treehugger Robot
7b45904c6b Merge "Reduce the Terminal app storage requirement from 128GB to 64GB." into main am: d16d627a71 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3404569

Change-Id: I7c537930bb0d05d81c10feb99a0b7e8d0e7cc583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-23 10:52:27 -08:00
Treehugger Robot
d16d627a71 Merge "Reduce the Terminal app storage requirement from 128GB to 64GB." into main 2024-12-23 10:20:45 -08:00
Qiang Chen
7abc384e33 Show GSM settings with CDMA phone type 
Phone type may be changed to CDMA if no SIM is in this sub and will not
show GSM settings in current design, so remove sub info check for
showing GSM settings.
Show GSM settings if the current radio can support both 3GPP and 3GPP2
radio technologies at the same time.

Bug: 278178437
Test: Manaul

Change-Id: I4f8cbfcdcff8f74944e2ba9a79b0945be6dd6ebd
 2024-12-22 17:46:53 +05:30
Kyle Zhang
8d7fc7232b Merge "Fix force L3 preference unit test" into main am: 3874c11b94 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3426487

Change-Id: I534c0a3f718ae7197c7a043f4c1709aa5e73014c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-20 15:02:22 -08:00
Kyle Zhang
3874c11b94 Merge "Fix force L3 preference unit test" into main 2024-12-20 14:18:22 -08:00
Jaewan Kim
614074e5c7 Hide Linux terminal if VM isn't supported 
Bug: 385216798
Test: atest
Flag: Build.RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES
Change-Id: I06fe52cf877deb3cd9ebc61af1579931b97d7766
 2024-12-21 00:31:55 +09:00
Kyle Zhang
3d84ccf8a2 Fix force L3 preference unit test 
Bug: 385101776
Change-Id: I898b7855d3922636c09c99414cdaefee236fc71f
 2024-12-19 16:02:45 -08:00
SongFerng Wang
bb4a442684 Merge "Add nonNull check for SubscriptionInfoEntity to avoid Settings NPE" into main am: 51769c2ed4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3405179

Change-Id: If5614a4e728ea949b8fa07a7c5a90aa506a6093b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-19 03:41:41 -08:00
SongFerng Wang
51769c2ed4 Merge "Add nonNull check for SubscriptionInfoEntity to avoid Settings NPE" into main 2024-12-19 02:56:12 -08:00
Treehugger Robot
3464d757ff Merge "Fix the NPE in the tryToFetchUsageData() method" into main am: 250101cd8f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3424441

Change-Id: I7376d3e498ebca9eeaa90244d8b2da6b6ad7d658
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-18 14:50:31 -08:00
Treehugger Robot
250101cd8f Merge "Fix the NPE in the tryToFetchUsageData() method" into main 2024-12-18 14:30:37 -08:00
YK Hung
7ea9d15853 Fix the NPE in the tryToFetchUsageData() method 
Test: atest
Bug: 371490669
Fix: 371490669
Flag: EXEMPT for simple fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:291e92d6493b9640bc87bc787b58daa0936bae8e)
Merged-In: I4167becf373a6279135261bbaff44ef0888728fa
Change-Id: I4167becf373a6279135261bbaff44ef0888728fa
 2024-12-18 13:35:29 -08:00
Henri Chataing
bde00faa0c Merge "Update the cache of a2dp config before writing config." into main am: 18eac4ef27 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3350514

Change-Id: I56c1fe945677d5eac84756cf87aab233724ef01d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-18 08:50:14 -08:00
Henri Chataing
18eac4ef27 Merge "Update the cache of a2dp config before writing config." into main 2024-12-18 08:17:34 -08:00
Owner Cleanup Bot
9e69628bd3 [owners] Remove saumyap@google.com from src/com/android/settings/privatespace/OWNERS 
This suggested change is automatically generated based on group
memberships and affiliations.
If this change is unnecessary or in error, vote the lowest CR value
(i.e. reject the CL) and the bot will abandon it. Vote the highest CR to
approve this change. You may also abandon this change.

See the owner's recent activity for context:
https://android-review.googlesource.com/q/saumyap@google.com

To report an issue, file a bug in the Infra>Codereview component.

Change-Id: Ic88239b24aa075ab2c475498648fd204036f72df
 2024-12-17 09:17:45 -08:00
Wei-Hong Hsu
c02f0aa033 Merge "nfc: allow the nfc quick toggle title to be searchable" into main am: 5565b51402 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3414601

Change-Id: I7bf83da36439231e011e5462161867d78c278043
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-16 18:50:24 -08:00
Wei-Hong Hsu
5565b51402 Merge "nfc: allow the nfc quick toggle title to be searchable" into main 2024-12-16 18:24:24 -08:00
Wei-Hong Hsu
250f5cade5 nfc: allow the nfc quick toggle title to be searchable 
allow the nfc quick toggle title to be searchable

Bug: 374853887
Test: search NFC in the settings search.
Change-Id: I1115b1705b91eb9f40acbef83ed92b9aee11dd3d
 2024-12-16 05:52:31 +00:00
Xin Li
9ee5de3b2f [automerger skipped] Merge "Merge 24Q4 into AOSP main" into main am: b1c96fcf83 -s ours 
am skip reason: Merged-In I2c1246a4b34c6b09a42c05153c0e3f015d475df1 with SHA-1 c47df6271a is already in history

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

Change-Id: Idc093e7db9c7ba2c8529651fe643c4b85c8d3481
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-13 19:42:09 -08:00
Xin Li
f9ab1c41d6 [automerger skipped] Merge 24Q4 into AOSP main am: 413f38d475 -s ours 
am skip reason: Merged-In I2c1246a4b34c6b09a42c05153c0e3f015d475df1 with SHA-1 c47df6271a is already in history

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

Change-Id: I136a103a327d16f63876d046fc14b2e52e197041
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-13 19:42:05 -08:00
Xin Li
b1c96fcf83 Merge "Merge 24Q4 into AOSP main" into main 2024-12-13 17:00:46 -08:00
Xin Li
413f38d475 Merge 24Q4 into AOSP main 
Bug: 370570306
Merged-In: I2c1246a4b34c6b09a42c05153c0e3f015d475df1
Change-Id: Ia12a9e27e05358f61b70868a68300a08cf074253
 2024-12-13 11:15:21 -08:00
Treehugger Robot
7307f34866 Merge "Update the OWNERs" into main am: 5655b46dee 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3412198

Change-Id: I508a2b6d6aab099c9cc95a06c89c01545df6e197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-12 23:38:24 -08:00
Treehugger Robot
5655b46dee Merge "Update the OWNERs" into main 2024-12-12 22:45:50 -08:00
Tom Hsu
c3b8b7a21d Update the OWNERs 
Change-Id: Iee6e33e04d232b78bf2d2064687a2d434b4f78c0
Flag: EXEMPT only changing OWNERS
Fix: b/383913940 
Test: make pass
 2024-12-12 22:33:46 -08:00
Treehugger Robot
e9ced5b8c7 Merge "Partial revert to restore lottie_bubbles.json" into main am: 7067c6781f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3362646

Change-Id: I7e610f36ac0d009174adf37bfeb2f434939348f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-12 09:43:28 -08:00
Treehugger Robot
7067c6781f Merge "Partial revert to restore lottie_bubbles.json" into main 2024-12-12 09:16:52 -08:00
Qiang Chen
f00508c4b5 Add nonNull check for SubscriptionInfoEntity to avoid Settings NPE 
This NPE can be found in MTBF stress testing

Bug: 290855314
Test: Manaul

Change-Id: I03aaa6618255638a485f32e1bab34c6fa71945e4
 2024-12-11 13:24:33 +05:30
Treehugger Robot
0b36bd05ec Merge "Settings: Fix face enroll stack overflow" into main am: e0e07dab27 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3389339

Change-Id: I83098683c5e25576db53963e032253cc5eb5780b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-11 03:48:37 +00:00
Treehugger Robot
e0e07dab27 Merge "Settings: Fix face enroll stack overflow" into main 2024-12-11 03:22:16 +00:00
Saswat Padhi
0937b6de17 Reduce the Terminal app storage requirement from 128GB to 64GB. 
Bug: 366374130

Change-Id: If22d5388a6e58076626c1019f7f909398c61ccfd
 2024-12-11 00:55:46 +00:00
Android Build Coastguard Worker
f4385955c0 Merge cherrypicks of ['googleplex-android-review.googlesource.com/30815274', 'googleplex-android-review.googlesource.com/30824238'] into 25Q1-release. 
Change-Id: Ib15a082911748c50d9ce0269e1d41cd75319b4b8
 2024-12-10 19:50:06 +00:00
Daniel Chapin
c8e84e540f Revert "Migrate materialColor* attributes into colors" 
Revert submission 29910036-color-rewrite

Reason for revert: DF Blocking bug:b/383230490 . Reverts will be cherry picked for a .003 release build.

Reverted changes: /q/submissionid:29910036-color-rewrite
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ed8074008f149acf8e1d472866803ff74c7a5d20)
Merged-In: I1229283119cbebb6f6e837b7bbd65480299086c4
Change-Id: I1229283119cbebb6f6e837b7bbd65480299086c4
 2024-12-10 19:49:08 +00:00
Jacky Wang
0dc6180a27 [Catalyst] Fix enable state for Wi-Fi hotspot 
NO_IFTTT=Catalyst only

Bug: 383232049
Flag: com.android.settings.flags.catalyst_tether_settings
Test: manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3d595b169d61b1d0fac08165b822aeedd0d4e3ee)
Merged-In: I067e97820a19822eaad2e93e30d42f7f767bf855
Change-Id: I067e97820a19822eaad2e93e30d42f7f767bf855
 2024-12-10 19:48:57 +00:00
Android Build Coastguard Worker
d458d4a6dc Snap for 12770256 from 97072e434d to 25Q1-release 
Change-Id: I5184d43061e5be0a619ada5d3973b5014f98912d
 2024-12-10 00:46:49 +00:00
Shawn Lin
97072e434d Merge "[Biometric Onboarding & Edu] Update Set up Fingerprint/Face Unlock page" into main 2024-12-09 10:37:03 +00:00
Marcelo Arteiro
bedda9d1f2 Merge "Migrate materialColor* attributes into colors" into main 2024-12-09 08:36:04 +00:00
Treehugger Robot
759c5644d1 Merge "[Expressive design] Migrate WifiPrivacyPage." into main 2024-12-09 07:55:43 +00:00
Shawn Lin
087ac777a8 [Biometric Onboarding & Edu] Update Set up Fingerprint/Face Unlock page 
Update icons, strings and layouts for new UX design

Bug: 370940762
Test: manual:
      Pre condition - no fingerprint/face enrolled
      For FP: Go Settings>Security & privacy>Device unlock>Fingerprint unlock
      For Face: Go Settings>Security & privacy>Device unlock>Face unlock
Test: atest FaceEnrollIntroductionTest
Flag: com.android.settings.flags.biometrics_onboarding_education
Change-Id: Iaee6792d1a27be8fa4b443f783a47a3715b6d3a1
 2024-12-09 07:52:08 +00:00
Treehugger Robot
6123cb9aeb Merge "[Catalyst] Refactor some Text Reading items" into main 2024-12-09 07:07:59 +00:00
Fan Wu
224988e2e8 Merge "Disable Reset app preference during the call. Similar with ag/27511802, this is for non-SPA environment" into main 2024-12-09 06:32:45 +00:00
Jacky Wang
2e3fc47765 Merge changes from topic "catalyst" into main 
* changes:
  [Catalyst] Refine WifiHotspotSwitchPreference
  [Catalyst] Refine DataSaverMainSwitchPreference
 2024-12-09 06:26:53 +00:00
Fan Wu
c6544f991f Disable Reset app preference during the call. Similar with ag/27511802, this is for non-SPA environment 
Bug: 342627537
Test: manual
Flag: EXEMPT Bug fix
Change-Id: If64b6c878b2f793c6852d000d9d90dda18ef2420
 2024-12-09 06:18:23 +00:00
Treehugger Robot
6346a9538f Merge "[Expressive design] Remove extra background of MainSwitchPreference." into main 2024-12-09 05:16:57 +00:00
Sunny Shao
a02483adc9 [Catalyst] Refactor some Text Reading items 
Test: atest TextReadingPreferenceFragment
Bug: 372776688
Flag: com.android.settings.flags.catalyst_text_reading_screen
Change-Id: I49aa91ca6f441814d6aaeb86826291a155a306f1
 2024-12-09 12:55:30 +08:00