Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,946 Commits 1 Branch 0 Tags
a90da5ea94c19d238d591eb247e7995425b2ae3d
Commit Graph

17638 Commits

Author SHA1 Message Date
TreeHugger Robot
a90da5ea94 Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2019-12-05 18:33:31 +00:00
Bill Yi
45ded2ad1e Import translations. DO NOT MERGE 
Change-Id: I5889a4f6f9637d34eb5df1f844770dd68cc04e39
Auto-generated-cl: translation import
 2019-12-05 03:22:50 -08:00
Jay Aliomer
f4bc80c45c Battery saver mode should disable dark mode modification 
disable toggle options and disable the dark theme drop down selection

Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.DarkUIPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeActivationPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeObserverTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeScheduleSelectorControllerTest"

Fixes: 	145098277
Fixes: 145297188
Fixes: 	145254016
Change-Id: I5c81a295810cc2d9a45657978104647e9c15da46
 2019-12-02 18:19:52 +00:00
Bill Yi
5dd4272ee4 Import translations. DO NOT MERGE 
Change-Id: I0258ef130ec225a374ae445da558755f621556d0
Auto-generated-cl: translation import
 2019-11-24 04:38:04 -08:00
Jay Aliomer
26ce6885c9 Merge "Revert "Revert "Add settings for scheduling dark theme""" into qt-qpr1-dev 2019-11-22 22:29:43 +00:00
Jay Aliomer
53ad4fedc6 Revert "Revert "Add settings for scheduling dark theme"" 
This reverts commit 50c0fa136c.

Reason for revert: Fixed the error which is code incompatibility
Test: run all settings tests
Change-Id: I8f05b50f8198c4b2565bb9b6f62ddda5029c8365
Merged-In: I8f05b50f8198c4b2565bb9b6f62ddda5029c8365
Bug: 141567787
 2019-11-22 20:58:23 +00:00
Bill Yi
adfc51a550 Import translations. DO NOT MERGE 
Change-Id: I64d2c2f4a3053bf7d163962d8a27929fd055b24b
Auto-generated-cl: translation import
 2019-11-22 10:44:01 -08:00
Preston O'Neal
50c0fa136c Revert "Add settings for scheduling dark theme" 
This reverts commit 7141b142df.

Reason for revert: This is breaking builds on git_qt-qpr1-dev

Change-Id: I7766826d3fc86a12fc8411b027a52eceb5a66019
 2019-11-21 22:09:53 +00:00
Jay Aliomer
7141b142df Add settings for scheduling dark theme 
Adding a settings page similar to night light for Dark theme. it will allow the user to schedule
dark mode from sunrise to sunset

Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.DarkUIPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeActivationPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeObserverTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeScheduleSelectorControllerTest"

Fixes: 141567787

Change-Id: I3094b655c04f59c23a95162a1be5ee8260e28a48
(cherry picked from commit 0828e6be9c)
 2019-11-21 20:07:24 +00:00
TreeHugger Robot
713143df37 Merge "Add a dark theme slice" into qt-qpr1-dev 2019-11-19 01:26:30 +00:00
Bill Yi
60f2a277e0 Import translations. DO NOT MERGE 
Change-Id: I8c576fcd3e758334750e0fa24253cff9ee95466b
Auto-generated-cl: translation import
 2019-11-15 12:09:15 -08:00
Sunny Shao
abcbc79d7d Add a dark theme slice 
Fixes: 142476879
Test: make RunSettingsGoogleRoboTests -j ROBOTEST_FILTER=com.android.settings.homepage.contextualcards.slices.DarkThemeSliceTest
Change-Id: I4865c3c4a807bc4ac96762a882b193a3e2595019
 2019-11-15 13:41:49 +08:00
Bill Yi
8134971f00 Import translations. DO NOT MERGE 
Change-Id: I5b9dc323282c81680df423e4df855f9f25e3c028
Auto-generated-cl: translation import
 2019-11-08 23:40:50 -08:00
TreeHugger Robot
8b348f1f30 Merge "Fix Battery page animation" into qt-qpr1-dev 2019-11-05 05:34:41 +00:00
Raff Tsai
6a3433b67a Fix Battery page animation 
TextView summary1 has default height 2 line. If the content is longer
than 2 line, the TextView increases itself which causes the animation.
By increasing minLines to 3, it can avoid the animation. And remove
summary2 because it is only for debug purpose, the debug information
can be merged to summary1.

Fixes: 139554919
Test: visual, make RunSettingsRoboTests
Change-Id: I167ac87c9bd83035e00d4991961599e76f4f69e1
(cherry picked from commit 648ada031d)
Merged-In: I167ac87c9bd83035e00d4991961599e76f4f69e1
 2019-11-05 12:11:51 +08:00
Bill Yi
9db5fcb2ff Import translations. DO NOT MERGE 
Change-Id: Ie3137ceba6f623d0a7aa1176166930b522dee60e
Auto-generated-cl: translation import
 2019-11-02 17:25:40 -07:00
Kevin Chyn
1876b8c6dd Merge "Revert "Remove attention controller"" into qt-qpr1-dev 2019-11-01 17:01:32 +00:00
Kevin Chyn
eac6fcff2d Revert "Remove attention controller" 
Bug: 142979808

This reverts commit 8e1d1ca3ab.

Change-Id: I78b7572bcb384de2984f4d81946aceb03aec6758
 2019-10-31 20:50:35 +00:00
Kevin Chyn
44efb41d98 Revert "Update attention string" 
Bug: 142979808

This reverts commit 821fbc83a1.

Change-Id: Ibe426d3175b8b44fadaf78316201031f229d736e
 2019-10-31 20:49:43 +00:00
Bill Yi
f54c040bde Import translations. DO NOT MERGE 
Change-Id: I7256e981ee4f567d1b09dce74e476375f4f58bb3
Auto-generated-cl: translation import
 2019-10-30 18:50:23 -07:00
Bill Yi
ff9bcdbcd3 Import translations. DO NOT MERGE 
Change-Id: I519674aef33bc822977cf0e00edf02aff7b8245f
Auto-generated-cl: translation import
 2019-10-27 08:01:49 -07:00
Bill Yi
476d82715a Import translations. DO NOT MERGE 
Change-Id: I0d35ecce542fee9f4f6367d2a11a4cca2d4b4b60
Auto-generated-cl: translation import
 2019-10-19 00:50:29 -07:00
SongFerngWang
dfd9aa99e5 String "CDME" is wrong 
Bug: 142376028
Test: build pass
Change-Id: Ifaed6ca8aba8f34ecb27abb863aeaf679132934f
 2019-10-10 20:18:30 +08:00
TreeHugger Robot
42eff7e319 Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2019-10-06 19:48:23 +00:00
Bill Yi
4c257b0ef8 Import translations. DO NOT MERGE 
Change-Id: Ie4fdf91f299defd2a361d76455093db5a410d0d6
Auto-generated-cl: translation import
 2019-10-06 07:50:11 -07:00
SongFerngWang
ec384c2f6f RadioInfo network mode list and network mode string add 5G 
Bug: 131888757
Test: 1.build pass 2.RadioInfo set network mode work.
Change-Id: I945d3c2fd175f45151bbeee475e388ccc2d67642
 2019-10-04 12:39:59 +08:00
Bill Yi
ccd0c91498 Import translations. DO NOT MERGE 
Change-Id: I33d1ef5a92b84fc166b35f7b5b341e7a92b35820
Auto-generated-cl: translation import
 2019-10-02 16:55:04 -07:00
Bill Yi
d57831b7d2 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 141777841
Change-Id: I5ef0e8ee2f723c81d4cc1c0be5daf311c7c38e84
 2019-10-01 16:05:46 -07:00
TreeHugger Robot
833512a1d2 Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2019-10-01 22:08:03 +00:00
Joshua Mccloskey
262f5fe91f Merge "Added new string." into qt-qpr1-dev 2019-10-01 22:05:41 +00:00
Bill Yi
881736b7ef Import translations. DO NOT MERGE 
Change-Id: I594742575ea6729d9c71e0ef04658f6513875aaf
Auto-generated-cl: translation import
 2019-10-01 12:53:15 -07:00
Bill Yi
0631ad6efb Import translations. DO NOT MERGE 
Change-Id: I10e5b04a3a580ba34f945305d011ac192a3c4dd3
Auto-generated-cl: translation import
 2019-09-30 03:35:57 -07:00
Bill Yi
f7de50f5be Import translations. DO NOT MERGE 
Change-Id: Idfb9ca3c6ddf6aa0a9bc04a262b8e0fd76032867
Auto-generated-cl: translation import
 2019-09-28 04:11:34 -07:00
joshmccloskey
4259495574 Added new string. 
Fixes: 141762646
Test: Verified that string translates to spanish after changing
the language.

Change-Id: I48e34de15460c93c8f50d26821c4d64984f20c6d
 2019-09-27 23:15:32 +00:00
joshmccloskey
bba7632f28 Added different flow for re-enrollment 
In order to enable this new flow, a user must currently have an enrolled
face and the security setting face_unlock_re_enroll must be non-zero.

Ex.
1. Enroll Face.
2. adb shell settings put
(secure face_unlock_re_enroll|secure_face_unlock_must_re_enroll) 1
3. If settings is opened, close it.
4. Open settings
5. Verify the new flow appears.

Bug: 141380252
Bug: 141254937
Test: Verified that the user's face is deleted after clicking delete.
Test: Verified that the user can re-enroll after removing their face.
Change-Id: I2b36a0bda5cb10fb33dfb2a5627d8fa40f14fb7e
 2019-09-26 23:54:59 +00:00
Bill Yi
0b39e54783 Import translations. DO NOT MERGE 
Change-Id: I92110fede16a12a445efbd96896e17f46f89a203
Auto-generated-cl: translation import
 2019-09-22 07:52:20 -07:00
joshmccloskey
7abb800c9f Updated face remove dialog string. 
Test: Verified that the correct string shows after deleting
face data.
Fixes: 141145591

Change-Id: I836c79fb4775157ae4995f706e05d1fd1233bc8f
 2019-09-17 23:46:46 +00:00
Mady Mellor
eac42583a1 Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev 2019-09-16 21:55:52 +00:00
Bill Yi
1ae748b09f Import translations. DO NOT MERGE 
Change-Id: If6b8f670eb54a3f5b45efa0ba2a540cd25327260
Auto-generated-cl: translation import
 2019-09-14 18:38:18 -07:00
Bill Yi
f066797849 Import translations. DO NOT MERGE 
Change-Id: I27cfc6c9ffa9def49d83eea920b88a5ce762fb53
Auto-generated-cl: translation import
 2019-09-12 16:10:45 -07:00
Bill Yi
deee385ba8 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I1b2826dd790519a2946d8505aec03f72b1815f04
 2019-09-11 19:26:07 -07:00
Mady Mellor
91ba8e9b66 qt-r1-bubbles-dev @ build 5835883 
Test: presubmit setup on source branch

Bug: 129158983
Bug: 136034310
Bug: 137876221

Change-Id: I5ade70c2101d09eed4698ce29bd3242483ec7f8b
Merged-In: If2b813f24cf5998829fe417e32179c5e8283d308
Merged-In: I58f0287ed99a4daf3758316e4004bca05f17b0d1
 2019-09-11 22:42:17 +00:00
Bill Yi
d62965ba03 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 140445577
Change-Id: Ica56884b49d5f16a84096f4c4f34bc0b639ad3e1
 2019-09-11 03:03:16 +00:00
Joshua Mccloskey
b8e4bd45c2 Merge "Modified text to cancel enrollment" into qt-r1-dev am: fde49ec3ad 
am: cbeeed9942

Change-Id: I6a62cccc71ce78f49ab85713b162be1395f8769d
 2019-09-05 16:10:00 -07:00
Joshua Mccloskey
cbeeed9942 Merge "Modified text to cancel enrollment" into qt-r1-dev 
am: fde49ec3ad

Change-Id: I7691e528d2ceb433509558885ad8af750ddc6678
 2019-09-05 16:00:59 -07:00
Joshua Mccloskey
fde49ec3ad Merge "Modified text to cancel enrollment" into qt-r1-dev 2019-09-05 22:44:12 +00:00
Joshua Mccloskey
27c1468940 Merge "Updated security settings string." into qt-r1-dev am: b7ac44e643 
am: 648db67fec

Change-Id: Id42bb590b657ab4e3ae5164f51dcc50abb62a544
 2019-09-05 13:22:56 -07:00
Joshua Mccloskey
648db67fec Merge "Updated security settings string." into qt-r1-dev 
am: b7ac44e643

Change-Id: Ib890b97401801fb5bcea20d1cd4fa284c1dec09f
 2019-09-05 12:50:45 -07:00
joshmccloskey
a55cbf036f Modified text to cancel enrollment 
Fixes: 140446388
Test: Manual.
Change-Id: If3f0affb390743cd7973957b5dea69d5e012dcb1
 2019-09-05 12:23:44 -07:00
Joshua Mccloskey
b7ac44e643 Merge "Updated security settings string." into qt-r1-dev 2019-09-05 19:22:29 +00:00