PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,160 Commits 1 Branch 0 Tags
ebecdcf563f2232a56bb43b35270d5ee41ac6c6d
Commit Graph

122160 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Tuttle
75f566bce9 Fix a couple compiler warnings in Settings 
Bug: 277938609
Test: builds
Change-Id: Ib5e236220dfcfddec60c9277d06ffbde9645bb73
 2023-04-28 18:19:30 +00:00
Julia Tuttle
ec12caadda Merge "Optimize imports in AppNotificationSettings" into udc-dev 2023-04-28 18:18:40 +00:00
Austin Delgado
9b94905c63 Merge "Hide enrollment options that don't match requested biometric strength" into udc-dev 2023-04-28 17:42:46 +00:00
TreeHugger Robot
6e524f6244 Merge "SettingsRoboTests: fix device state rotation related tests" into udc-dev 2023-04-28 17:01:39 +00:00
Bill Yi
4e09eb096c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 547484f797 am: faf6409455 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I14a9ed4d975325a7cfb4f618ff67ad46865b9c90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 16:50:19 +00:00
Bill Yi
4174b548cf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 547484f797 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iea6d3ccd75a787447cde716ca4b027d4d5e5f07f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 16:48:53 +00:00
Edgar Wang
089e76c429 Fix test case failed in SystemControlsFragmentTest 
Fixes: 280071271
Test: local robotest
Change-Id: I96867e9718b4a30289fdcd3fcd9dc70ed8c227b0
 2023-04-29 00:42:45 +08:00
Ale Nijamkin
12e05b8c59 Fixes broken Settings test. 
In ag/22187500, we added the requirement for a wallpaper picker app to be installed in order to treat the lock screen shortcuts feature as enabled (in addition to the feature flag). That broke this test.

To fix, we're adding a mocked result to the PackageManager to pretend like the wallpaper picker application is installed.

Change-Id: I8654375e3fa33df0984c48fcf91dd8f6c18e984f
Fix: 280017187
Test: the test is back to passing.
 2023-04-28 16:22:59 +00:00
Gil Cukierman
be1fb77da5 Enable null cipher toggle by default 
Test: atest GsmCdmaPhoneTest NullAlgorithmsPreferenceController
Test: Manual test on multiple targets and cf
Bug: 262063621
Change-Id: Ic10dbe552eb48eb19efc53e2430a7a1eb081a50e
 2023-04-28 15:43:28 +00:00
Christian Göllner
b613cc4a17 SettingsRoboTests: fix device state rotation related tests 
Fixes: 280015539
Test: atest SettingsRoboTests
Change-Id: I0a3cc713f8df0477a172665a60551b456691b17c
 2023-04-28 15:26:32 +02:00
Edgar Wang
f411b62425 Fix PrivateDnsPreferenceControllerTest test case failed 
- getAvailibilityStatus_availableByDefault()

Fixes: 280048011
Test: locoal robotest
Change-Id: I490dc3348af241a76767885b52238d0b87880532
 2023-04-28 21:04:59 +08:00
Chaohui Wang
b60bb6a22f Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev am: fec25d4bad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22896675

Change-Id: I62662e92f9b302be44eaebe34dc1415924a900ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 12:26:45 +00:00
Chaohui Wang
fec25d4bad Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev 2023-04-28 11:52:50 +00:00
himanshuz
dd26189e2c Enabling App Cloning Device Config flags by default. The features will be guarded *only* by config overlays, which are off by default. 
Bug: 253449368
Test: Manual by building and flashing
Change-Id: I9099019f2bd982588f12ac1741fce27d24e5849e
 2023-04-28 11:10:14 +00:00
Treehugger Robot
7c369b3dbc Merge "Revert "Back up the smooth display setting"" into udc-dev am: 060a56468d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894948

Change-Id: Ic79aff153dc19207fb52fc73ec8f563cf79ff26a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 10:11:26 +00:00
Treehugger Robot
060a56468d Merge "Revert "Back up the smooth display setting"" into udc-dev 2023-04-28 09:58:16 +00:00
Chaohui Wang
8470122ad1 Fix ImeiInfoPreferenceControllerTest 
For test case updatePreference_simSlotWithoutSim_notSetEnabled,
mSecondSimPreference is a mock, instead of check the default value of
isEnabled(), verify it's setEnabled() not called.

Fix: 279880808
Test: RobolectricTest
Change-Id: I72064820754e053def46bdbf10317189c7ac608f
 2023-04-28 15:53:44 +08:00
Edgar Wang
ceafa204a8 Merge "Fix test cases failed in WinscopeTraceTest" into udc-dev am: 8155b72cf8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898012

Change-Id: I14c6cbe94ee86eec033771a8f49bb82972e43a1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 06:04:51 +00:00
Edgar Wang
8155b72cf8 Merge "Fix test cases failed in WinscopeTraceTest" into udc-dev 2023-04-28 05:28:14 +00:00
Zaiyue Xue
75b3fc3f8c [automerger skipped] Merge "String change to highlight calculation stopped at last even hour" into tm-qpr-dev am: 6aba166376 am: c6d11de87e -s ours 
am skip reason: Merged-In Ia08dea791bb72113719fd1316e8e9587a96eaef1 with SHA-1 3d7b8b3bfe is already in history

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

Change-Id: Id8d7d85db67c593b7ebf7c6c617b0a8123633133
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 04:09:44 +00:00
Bill Yi
faf6409455 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 547484f797 
Blank merge reason: commit message contains skip directive

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

Bug: 278022447
Change-Id: I865cc944ab660f47b40b48af32a7aef389551963
 2023-04-28 03:55:42 +00:00
Bill Yi
547484f797 Import translations. DO NOT MERGE ANYWHERE 
BUG:278022447

Auto-generated-cl: translation import
Change-Id: I746cb0e511ad3e9a19f2dfb0d152319e53c7a11f
 2023-04-27 20:47:48 -07:00
Zaiyue Xue
89323d4bc9 [automerger skipped] Merge "String change to highlight calculation stopped at last even hour" into tm-qpr-dev am: 6aba166376 -s ours am: 18d5ebc38f -s ours 
am skip reason: Merged-In Ia08dea791bb72113719fd1316e8e9587a96eaef1 with SHA-1 3d7b8b3bfe is already in history

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

Change-Id: If994cd71458c874a2a2041c201960b1b8cd2d8c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 03:43:49 +00:00
Zaiyue Xue
72f7b61a84 [automerger skipped] String change to highlight calculation stopped at last even hour am: 205d8249a7 -s ours am: 27c242f01d -s ours 
am skip reason: Merged-In Ia08dea791bb72113719fd1316e8e9587a96eaef1 with SHA-1 3d7b8b3bfe is already in history

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

Change-Id: I3a39b7fcfbfce0c7b909e16a1275842bcafa5b4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 03:43:03 +00:00
Zaiyue Xue
18d5ebc38f [automerger skipped] Merge "String change to highlight calculation stopped at last even hour" into tm-qpr-dev am: 6aba166376 -s ours 
am skip reason: Merged-In Ia08dea791bb72113719fd1316e8e9587a96eaef1 with SHA-1 3d7b8b3bfe is already in history

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

Change-Id: I3cd68b222aa83eada95698d381880433c57b9fae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 03:20:10 +00:00
Zaiyue Xue
27c242f01d [automerger skipped] String change to highlight calculation stopped at last even hour am: 205d8249a7 -s ours 
am skip reason: Merged-In Ia08dea791bb72113719fd1316e8e9587a96eaef1 with SHA-1 3d7b8b3bfe is already in history

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

Change-Id: Ic1b0667493cbf0009c71c2ea0cd67ef708d73698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 03:20:02 +00:00
Zaiyue Xue
c6d11de87e Merge "String change to highlight calculation stopped at last even hour" into tm-qpr-dev am: 6aba166376 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22635696

Change-Id: I4cb41677f4c7bd55cd92440e6a0e59a8d3a878eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 03:18:27 +00:00
Tom Hsu
574483e474 Merge "[Settings] UI part: Add metrics for language" into udc-dev am: bd9263b391 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22788844

Change-Id: I3e1823e82cc1d0a2cdc57652b8de7cbddd3bb2b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 03:17:19 +00:00
Tom Hsu
bd9263b391 Merge "[Settings] UI part: Add metrics for language" into udc-dev 2023-04-28 02:49:59 +00:00
Zaiyue Xue
6aba166376 Merge "String change to highlight calculation stopped at last even hour" into tm-qpr-dev 2023-04-28 02:43:00 +00:00
Julia Tuttle
3a68e5bf28 Optimize imports in AppNotificationSettings 
Bug: 277938609
Test: builds
Change-Id: Id44390f6fc8b6294c951a7f4ec9bd37e0a364dfd
 2023-04-27 17:24:14 -04:00
Julia Tuttle
e2a8133da4 Merge "Update FSI permission strings" into udc-dev am: 2094622da9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899255

Change-Id: Ib07fb63100747c1486f3d0cdf9c80549be65a028
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 20:49:23 +00:00
Julia Tuttle
2094622da9 Merge "Update FSI permission strings" into udc-dev 2023-04-27 20:03:56 +00:00
TreeHugger Robot
d4ceb73fe5 Merge "Fixed speed selection lost when changing password in Wi-Fi hotspot settings" into udc-dev am: 32602794ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885040

Change-Id: I2a13de79198afd67cb8e910aead7275b460df8ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 19:27:17 +00:00
TreeHugger Robot
32602794ed Merge "Fixed speed selection lost when changing password in Wi-Fi hotspot settings" into udc-dev 2023-04-27 18:55:20 +00:00
Treehugger Robot
0469be62f0 Merge "[Settings] Update code owner" am: 709b27384b am: c40b06b687 am: a6f0662924 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2527125

Change-Id: I63b80b09c29c9d41f7b950c7a63955088e17824e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 18:02:40 +00:00
Julia Tuttle
b2fd7b20c7 Update FSI permission strings 
Change them to better align with the other "Special app access" screens.

Bug: 277938620
Test: none
Change-Id: I0083a207a9c8cf98d1b5a9927a1f8bf024832697
 2023-04-27 14:02:01 -04:00
Treehugger Robot
e207694022 Merge "Fix AppEntry.extraInfo ClassCastException" am: 327867e56b am: 83f2d27e35 am: 97c42d8736 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2564510

Change-Id: I67a97e84918d365cb12cddb725ac69c93fa7dc47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 17:47:09 +00:00
Becca Hughes
8912f693f7 Merge "DO NOT MERGE Hide provider from this list if autofill provider" into udc-dev am: c74ccee659 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22792839

Change-Id: I74552f7341035452c3baacbb9debc3349051b72f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 17:09:35 +00:00
Becca Hughes
c6a74847e4 DO NOT MERGE Hide provider from this list if autofill provider am: 99f1d5448d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22792839

Change-Id: I79a8f47acb16ac995333c7c40a0309c83e67404c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 17:09:06 +00:00
Becca Hughes
f1ad544cbe Merge "DO NOT MERGE Listen for updates to autofill/credman provider" into udc-dev am: 4fc5b0e7b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22764836

Change-Id: I5dd7579e3fb61a1d3e51801dc98ef249f2d1835b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 17:07:28 +00:00
Becca Hughes
a620612b9f DO NOT MERGE Listen for updates to autofill/credman provider am: 688b023d09 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22764836

Change-Id: I0e113f37760847067042e41dd1a3e48d398c0270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 17:06:41 +00:00
Becca Hughes
c74ccee659 Merge "DO NOT MERGE Hide provider from this list if autofill provider" into udc-dev 2023-04-27 16:35:18 +00:00
Becca Hughes
4fc5b0e7b3 Merge "DO NOT MERGE Listen for updates to autofill/credman provider" into udc-dev 2023-04-27 16:35:07 +00:00
Piotr Wilczyński
eef23f441c Revert "Back up the smooth display setting" 
Revert submission 22741921-cherrypick-bug-211737588-lp9s6r5vn3

Reason for revert: b/279215664

Reverted changes: /q/submissionid:22741921-cherrypick-bug-211737588-lp9s6r5vn3

Change-Id: I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b
Merged-In: I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b
 2023-04-27 16:13:03 +00:00
Bill Yi
9b25911c3c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: a04b6df040 -s ours am: 9bb60a200e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If5480716680eb2a785cff991e320999dd0671e8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 16:07:51 +00:00
Bill Yi
49103dfc2e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efc9e1994c -s ours am: 9abc703e40 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I370319fcbc37e1a632a2e8a6d20083ece4b69566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 16:07:43 +00:00
Bill Yi
155b5266fc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 171e66e000 -s ours am: 4caa1ee4c3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If51f800f04ad40049ee3508ff02d9ded8cf7f7b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 16:07:37 +00:00
Bill Yi
0ebc9d790d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c416adc1df -s ours am: d4ba4def6a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie6058d58565c8b9f65cc7cb5a61b1367141dd17b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 16:07:30 +00:00
Bill Yi
a70fa93e6b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 499308fa2c -s ours am: dcd5353e67 -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: Ib6beab44e6862b85e5a5ebb28f9573b894a69dfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 16:07:19 +00:00