PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
120,751 Commits 1 Branch 0 Tags
18b54c93bc18bd31e2a3834ffff89b8b760bfa2c
Commit Graph

120751 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Henri Chataing
5bb48d9250 Merge "Nfc: Rename system properties in Nfc settings" am: fa88ad84be am: 1325de7875 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2452247

Change-Id: Ia03c857e442f801d7fb042dda4c186aeb1dce1e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 23:54:34 +00:00
Will Leshner
ca1379f0b3 Restrict screen saver settings searches to enabled users. 
If a user can't enable screen saver, they shouldn't be able to
accidentally find screen saver related settings in Settings.

Bug: 260276394
Test: atest ScreenSaverPreferenceControllerTest
Test: manually by settings up a second user on a device that supports
screen saver, switching to that user, and making sure that searches for
"screen saver" don't accidentally reveal settings that can't be
accessed.

Change-Id: If2f465b2acb548455f0868507cf47217ea1a626f
 2023-02-24 15:36:48 -08:00
Henri Chataing
1325de7875 Merge "Nfc: Rename system properties in Nfc settings" am: fa88ad84be 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2452247

Change-Id: Ibbe1f8ed19c421b32f24675734eeb233b61e5468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 23:02:43 +00:00
TreeHugger Robot
a6ea56f774 Merge "Allow Magnification Settings launch from outside of AccessibilitySettings" into udc-dev am: 3a445a3ea1 am: ade18c1ffe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21489373

Change-Id: I79215a2118df5ebb87af54718c18b9eb1a803e16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 20:42:24 +00:00
TreeHugger Robot
92efcd50c9 Merge "Allow Magnification Settings launch from outside of AccessibilitySettings" into udc-dev am: 3a445a3ea1 am: d9d0d1bb7a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21489373

Change-Id: Id3e0bc1edbe1827d79d935a085926bba51c06070
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 20:26:02 +00:00
TreeHugger Robot
ade18c1ffe Merge "Allow Magnification Settings launch from outside of AccessibilitySettings" into udc-dev am: 3a445a3ea1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21489373

Change-Id: I639c4bab90359dd33d557b05acd1d43556c7a184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 19:55:37 +00:00
Becca Hughes
b52fb4ce0b Update strings based on UX/product feedback 
Update settings strings for cred man based
on feedback.

Test: make
Bug: 264939770
Change-Id: I1e89e99ef11cd1fb64750709e331e1f059d2eeaf
(cherry picked from commit 0172ff6942)
Merged-In: I1e89e99ef11cd1fb64750709e331e1f059d2eeaf
 2023-02-24 19:50:50 +00:00
TreeHugger Robot
d9d0d1bb7a Merge "Allow Magnification Settings launch from outside of AccessibilitySettings" into udc-dev am: 3a445a3ea1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21489373

Change-Id: I3cb57e455477a21b130862be572b421663d16dfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 19:46:05 +00:00
Becca Hughes
d9ce857fd5 Merge "Update strings based on UX/product feedback" 2023-02-24 19:45:33 +00:00
Henri Chataing
fa88ad84be Merge "Nfc: Rename system properties in Nfc settings" 2023-02-24 18:57:25 +00:00
TreeHugger Robot
3a445a3ea1 Merge "Allow Magnification Settings launch from outside of AccessibilitySettings" into udc-dev 2023-02-24 18:54:44 +00:00
TreeHugger Robot
9713d1ce2d Merge "Fix b/270656372 unit test failure." into udc-dev am: f9ef8e39f5 am: f52774ec73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578803

Change-Id: I3fc4b391adece41faa7fe8157854d62a30f77e57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 18:53:29 +00:00
TreeHugger Robot
f52774ec73 Merge "Fix b/270656372 unit test failure." into udc-dev am: f9ef8e39f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578803

Change-Id: I9cb9e491dd4f356ac9fc3c0e67a180d45a8230e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 17:55:37 +00:00
Darrell Shi
6b6c68fd94 Merge "Hide "additional info" when active dream does not support." into tm-qpr-dev 2023-02-24 16:10:13 +00:00
TreeHugger Robot
2ef53d0a79 Merge "Fix b/270656372 unit test failure." into udc-dev am: f9ef8e39f5 am: fa2b0ef4ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578803

Change-Id: I494c6d1c211318e1bcce47a5ae2b173455d05c72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 14:08:30 +00:00
Zaiyue Xue
95c4e00924 Merge "Fix b/265387286: The total percentage of all apps is not 100%" into udc-dev am: ae0d935dcc am: 1ee1cc368f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21502689

Change-Id: I5c2d6b84f10504df73d15cff263202fbc90eeb4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 14:05:48 +00:00
TreeHugger Robot
6ebf140fd7 Merge "Fix b/270656372 unit test failure." into udc-dev am: f9ef8e39f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578803

Change-Id: I1c9f640d8681e68cb6277724d412251fac2008df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 13:34:45 +00:00
TreeHugger Robot
fa2b0ef4ae Merge "Fix b/270656372 unit test failure." into udc-dev am: f9ef8e39f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578803

Change-Id: I285a39d07df9cf76fac6ebb4de1a6e1909771030
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 13:32:50 +00:00
Zaiyue Xue
1ee1cc368f Merge "Fix b/265387286: The total percentage of all apps is not 100%" into udc-dev am: ae0d935dcc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21502689

Change-Id: I7c47d61fd6cf6f1662dc77e7bf744b71f393a7be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 13:31:44 +00:00
Zaiyue Xue
c6166bc07d Merge "Fix b/265387286: The total percentage of all apps is not 100%" into udc-dev am: ae0d935dcc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21502689

Change-Id: Ib0c1ebd27bc65db95fccae3a67514b7687d662b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 13:31:35 +00:00
TreeHugger Robot
f9ef8e39f5 Merge "Fix b/270656372 unit test failure." into udc-dev 2023-02-24 13:06:28 +00:00
Zaiyue Xue
ae0d935dcc Merge "Fix b/265387286: The total percentage of all apps is not 100%" into udc-dev 2023-02-24 12:55:21 +00:00
Vincent Wang
ac92edd8cf Merge "Refactor FingerprintEnrollEnrolling to fragment" into udc-dev am: d17704196f am: 35ec32bb18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578805

Change-Id: Ic703f7095014c9c34fb8395d7c2cffc88c401c94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 12:53:34 +00:00
Vincent Wang
35ec32bb18 Merge "Refactor FingerprintEnrollEnrolling to fragment" into udc-dev am: d17704196f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578805

Change-Id: I0017be373d3a5003913fd9d9fa86c2c8ced16c98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 12:19:09 +00:00
Vincent Wang
731ded4f9a Merge "Refactor FingerprintEnrollEnrolling to fragment" into udc-dev am: d17704196f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578805

Change-Id: I5afdcebedeff7b17cbcf3499d2b81c09502eedac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 12:19:01 +00:00
Vincent Wang
d17704196f Merge "Refactor FingerprintEnrollEnrolling to fragment" into udc-dev 2023-02-24 11:42:26 +00:00
TreeHugger Robot
60c8c5e985 Merge "[Settings] Re-enable previous work on data saver" into udc-dev am: fa57dd3f2e am: 5d32369ec8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578800

Change-Id: I74832d8b7d850c582e25a5d881bc8c78718bc418
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 11:26:06 +00:00
Tom Hsu
4c30d29dd5 Merge "Switch off Calendar UI fo regional preferences" into udc-dev am: 7e2ea92559 am: ad6359cfbb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578799

Change-Id: I4239916ef65de0a83712890ec8092c49971d1183
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 11:24:32 +00:00
Zaiyue Xue
6d939b34dc Fix b/265387286: The total percentage of all apps is not 100% 
Bug: 265387286
Fix: 265387286
Test: manual
Change-Id: I654f8211a45c818f9a2d4867ac679e72c9ce6eb1
 2023-02-24 19:19:28 +08:00
Zaiyue Xue
d4dbf039ea Fix b/270656372 unit test failure. 
Failed test: sendBatteryEntryData_nullBatteryUsageStats_sendFakeDataIntoProvider

Bug: 270656372
Fix: 270656372
Test: presubmit
Change-Id: Idd1b3be07ec72c3cf7050b96e5320d67dcdc5463
 2023-02-24 19:13:50 +08:00
TreeHugger Robot
58333856cd Merge "[Settings] Re-enable previous work on data saver" into udc-dev am: fa57dd3f2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578800

Change-Id: Idc4b057032a4efcbeb48fce1767d06a4e163b0a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 10:50:10 +00:00
TreeHugger Robot
5d32369ec8 Merge "[Settings] Re-enable previous work on data saver" into udc-dev am: fa57dd3f2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578800

Change-Id: I090cef5138a424af861d3e2a306c8f8657c421d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 10:49:58 +00:00
Tom Hsu
a74a9bf6c2 Merge "Switch off Calendar UI fo regional preferences" into udc-dev am: 7e2ea92559 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578799

Change-Id: I4a1b9290a8729271ac08e4283432af32ec524931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 10:48:57 +00:00
Tom Hsu
ad6359cfbb Merge "Switch off Calendar UI fo regional preferences" into udc-dev am: 7e2ea92559 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578799

Change-Id: Iea1de3d7bfe3db293deed904c1459da57478d6cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 10:48:26 +00:00
TreeHugger Robot
fa57dd3f2e Merge "[Settings] Re-enable previous work on data saver" into udc-dev 2023-02-24 10:15:32 +00:00
Tom Hsu
7e2ea92559 Merge "Switch off Calendar UI fo regional preferences" into udc-dev 2023-02-24 09:47:01 +00:00
Vincent Wang
882b49c8fb Refactor FingerprintEnrollEnrolling to fragment 
Bug: b/260957933
Test: NA
Change-Id: I281ec7a7373f6863e2e6f8f20bbbb01fa01e009a
 2023-02-24 08:43:17 +00:00
Charles Chen
638f2309fe [automerger skipped] Make Settings show in two-pane on portrait tablet am: 159b42a247 -s ours am: dce4259653 -s ours am: 4aaf6c191b -s ours am: 84c1cbe2cd -s ours 
am skip reason: Merged-In I0c26a7443882cc28edb5500f8d135c5f00dee515 with SHA-1 1881749f09 is already in history

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

Change-Id: Ia099fe16988487f3c02a45ae3864363ec920dd3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 08:12:21 +00:00
TreeHugger Robot
6da120c7b5 Merge "Fix b/265364351: Light theme icons opacity is too light" into udc-dev am: 802bff9092 am: 8748b299bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517325

Change-Id: I94a8257092fbb7dbae7daeeb9b4b5a65eb4833f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 08:10:21 +00:00
TreeHugger Robot
25fabae5ac Merge "Clarify string for translation" into udc-dev am: 6d3a9b40d4 am: 76baf341d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21534693

Change-Id: I4a7145554f6167828cda024ba7b56cd7528b563d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 08:07:43 +00:00
Daniel Huang
871122ca24 Merge "Change key name "Meta" to "Action key"" into udc-dev am: 6e6b067863 am: 3b00f28b6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21552503

Change-Id: I4bfdaafed08ab563aa8e49574e47cd27f6647d17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 08:03:35 +00:00
Arc Wang
1596a2838d Allow Magnification Settings launch from outside of AccessibilitySettings 
Before this CL, Magnification Settings can only be
launched from MagnificationPreferenceController.

This CL initializes FooterPreferenceController if the
parent class does not initialize it from Intent extras.

Bug: 268411305
Test: manual
      make RunSettingsRoboTests ROBOTEST_FILTER=MagnificationGesturesPreferenceControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=ToggleScreenMagnificationPreferenceFragmentTest
Change-Id: I954739c39c823ce7fe0daa711743f729d182571b
 2023-02-24 15:56:43 +08:00
Zaiyue Xue
a000f98438 Merge "Fix b/265364507: Merge GPU and TPU into Others in battery usage system components list" into udc-dev am: 2959831d59 am: d99ae387d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21546834

Change-Id: I37dd3f4cbc493c169d0f81b96383f4f12cb0115d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 07:54:31 +00:00
Avinash Vadlamudi
a491337497 Merge "[Auto Pin Confirm]: Fix the usage of LockPatternUtils#isAutoPinConfirmFeatureAvailable method" into udc-dev am: 2a619718ee am: d4e541f101 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21537112

Change-Id: Id69e9e8e86dfcfd5945e9f426233788b64fe8de9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 07:54:13 +00:00
Bonian Chen
fb9f85ec65 Merge "[Settings] Customizable resource for hiding 3G preferred network type" into udc-dev am: 7d76797f94 am: 7bfa22df7b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21548828

Change-Id: I4a13552fe5d9dfb7d06b0e5caad3b06359d39f3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 07:49:24 +00:00
Charles Chen
84c1cbe2cd [automerger skipped] Make Settings show in two-pane on portrait tablet am: 159b42a247 -s ours am: dce4259653 -s ours am: 4aaf6c191b -s ours 
am skip reason: Merged-In I0c26a7443882cc28edb5500f8d135c5f00dee515 with SHA-1 1881749f09 is already in history

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

Change-Id: I6c496790a26b516bf003aefc30e9bb52ff816727
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 07:38:36 +00:00
TreeHugger Robot
8748b299bb Merge "Fix b/265364351: Light theme icons opacity is too light" into udc-dev am: 802bff9092 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517325

Change-Id: Ied1b19f97d2c170c21c00f4425b54bbb494eb6ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 07:33:20 +00:00
TreeHugger Robot
76baf341d2 Merge "Clarify string for translation" into udc-dev am: 6d3a9b40d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21534693

Change-Id: Ia72afbbe0cdc696dc42e84e199374bf2ef993cf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 07:30:34 +00:00
Daniel Huang
3b00f28b6f Merge "Change key name "Meta" to "Action key"" into udc-dev am: 6e6b067863 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21552503

Change-Id: Iad85e0c130b774e9df08aa75df5ed08467280d80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 07:14:40 +00:00
Zaiyue Xue
d99ae387d8 Merge "Fix b/265364507: Merge GPU and TPU into Others in battery usage system components list" into udc-dev am: 2959831d59 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21546834

Change-Id: I9f64cc6e3a11f76ee920b557ad5ec6d77dc5f73a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 07:13:30 +00:00