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

122191 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Tuttle
7edbed90aa Merge "Fix a couple compiler warnings in Settings" into udc-dev am: 7b3df1c080 am: 6fb097c08c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897913

Change-Id: I8c62657c6d8d09e81dd5b6cc09c99ead2a8cb238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 19:23:44 +00:00
Julia Tuttle
e3e8b4cd02 Merge "Optimize imports in AppNotificationSettings" into udc-dev am: ec12caadda am: b34c993a13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897912

Change-Id: I5561bad5f136fd8e91b8435bfb2bc93045805563
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 19:21:39 +00:00
Austin Delgado
a386dddf72 Merge "Hide enrollment options that don't match requested biometric strength" into udc-dev am: 9b94905c63 am: f5d8437078 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22646172

Change-Id: I2427d052f8673090d39b084d2c4364edefe8359e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 19:20:30 +00:00
TreeHugger Robot
b24c3eae4c Merge "SettingsRoboTests: fix device state rotation related tests" into udc-dev am: 6e524f6244 am: 00259adc51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930697

Change-Id: I08488767f3779fa57fcdfcfc4a48ed21ca92406a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 19:19:29 +00:00
Julia Tuttle
6fb097c08c Merge "Fix a couple compiler warnings in Settings" into udc-dev am: 7b3df1c080 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897913

Change-Id: I26c3cc54bb1a899aae3f0e773368352573106d9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 19:08:13 +00:00
Bill Yi
9f237dd9b5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 547484f797 -s ours am: 4174b548cf -s ours am: a4eb2b9a37 -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: Ia92d7f4befddb491341fffb797f77ea4883ddec5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 19:07:42 +00:00
Julia Tuttle
7b3df1c080 Merge "Fix a couple compiler warnings in Settings" into udc-dev 2023-04-28 18:42:23 +00:00
Julia Tuttle
b34c993a13 Merge "Optimize imports in AppNotificationSettings" into udc-dev am: ec12caadda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897912

Change-Id: I515c52afec3451c1a138f04e0f45748b0197e040
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 18:35:10 +00:00
Austin Delgado
f5d8437078 Merge "Hide enrollment options that don't match requested biometric strength" into udc-dev am: 9b94905c63 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22646172

Change-Id: I3779705d1012d4d8b7df4b68f1e9ebea9f37451b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 18:32:30 +00:00
TreeHugger Robot
00259adc51 Merge "SettingsRoboTests: fix device state rotation related tests" into udc-dev am: 6e524f6244 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930697

Change-Id: I3f9ed19a8a4f011ee47ca2afca23321d451d5f27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 18:31:56 +00:00
Bill Yi
a4eb2b9a37 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 547484f797 -s ours am: 4174b548cf -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: I8b20c84b1db8f75bc08f08a053a495fb11249d89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 18:24:57 +00:00
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
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
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
Chaohui Wang
6d591f5b5c Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev am: fec25d4bad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22896675

Change-Id: I162a3dd40f6cda7ccbcef87703b1c5c76843f4dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 12:30:19 +00:00
Chaohui Wang
fec25d4bad Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev 2023-04-28 11:52:50 +00:00
Treehugger Robot
028c16242d [automerger skipped] Merge "Revert "Back up the smooth display setting"" into udc-dev am: 060a56468d -s ours 
am skip reason: Merged-In I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b with SHA-1 139bc341f3 is already in history

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

Change-Id: I00d026fd81ea149d062d0e2f363225b72669e6fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 10:11:33 +00:00
Piotr Wilczyński
2471b9f543 [automerger skipped] Revert "Back up the smooth display setting" am: eef23f441c -s ours 
am skip reason: Merged-In I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b with SHA-1 139bc341f3 is already in history

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

Change-Id: Id89bf2cffbf4544399992568a1997df4e1ce5f44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 10:10:39 +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
386b3b662b 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: I94a6521cf1967c028faa657228cc909f2b1b3895
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 06:09:16 +00:00
Edgar Wang
8155b72cf8 Merge "Fix test cases failed in WinscopeTraceTest" into udc-dev 2023-04-28 05:28:14 +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
283bea4dd0 [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: I798960082e851991561c9a836592df2111cd1ad8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 03:25:10 +00:00
Zaiyue Xue
92c94ed6e9 [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: I15144b4f05a33aafdc609d3e02654e5f34b752e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 03:24:58 +00:00
Tom Hsu
39b150171b 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: I49425eb7c992008e5dc7f0d028c82e4bee41038e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 03:23:39 +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
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
4792f21e3d 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: Ib02eef795ee140bb9241dadfb25749937fb8a774
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 20:48:04 +00:00
Julia Tuttle
2094622da9 Merge "Update FSI permission strings" into udc-dev 2023-04-27 20:03:56 +00:00
TreeHugger Robot
9e2e3e9ae6 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: I16732ae62948cd37f654d03739fc21973f9c754a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 19:25:08 +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
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
Becca Hughes
859df31fab 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: I0c2ed2c4f1fc8763cae49572f75d8871b5e48ab2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 17:11:41 +00:00
Becca Hughes
3107fb0f96 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: Ifde2d297be711a957ce900ec5c7f1d30601bc6ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 17:11:36 +00:00
Becca Hughes
6df62b695c 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: I78f3ef0ab0e136e5e037b077fb993ebd9df8ef55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 17:04:37 +00:00
Becca Hughes
7378d6c66c 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: I2c3cdf15907f2e6e2a40a2547b9b6b92cdcfd35c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 17:04:31 +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
Piotr Wilczyński
0066bdea3e Merge "Revert "Back up the smooth display setting"" into udc-d1-dev 2023-04-27 16:06:37 +00:00
Zoey Chen
cfaa13442c [Settings] UI part: Add metrics for language 
Bug: 279915462
Test: atest
Change-Id: Ie13c57b2b398beb48dfe0ac289ec336483575445
 2023-04-27 15:55:45 +00:00
TreeHugger Robot
143f6aeb43 Merge "Change drop down strings to "View by ..."" into udc-dev am: d3897afda6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905739

Change-Id: I193bbf41ec079e0266357de47661e083594d3fe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 11:29:05 +00:00
TreeHugger Robot
d3897afda6 Merge "Change drop down strings to "View by ..."" into udc-dev 2023-04-27 11:12:45 +00:00