Commit Graph

55039 Commits

Author SHA1 Message Date
Sunny Shao
c83bb787c5 Use FooterPreference in xml explicitly
Removed the FooterPreferenceMixin from the AutoBrightness page.

Fixes: 138916403
Test: manual test

Change-Id: I131d5cede156e2dae890342d5b456f347b025e27
2019-08-05 18:29:01 +08:00
TreeHugger Robot
87ecb5deed Merge "Import RadioButtonPreference from SettingsLib" 2019-08-03 02:52:36 +00:00
Raff Tsai
d68802cf6d Fix robolectric test error
jobService is moved to mainline module. It is not registered in
the system at the beginning, therefore getSystemService returns
null. Instead of getSystemService, directly create a JobSchedulerImpl
and mock getSystemService method to return the JobSchedulerImpl
instance.

Fixes: 138714772
Test: make RunSettingsRoboTests
Change-Id: If91b6a63c0de92530d69f7b80515669352aab760
2019-08-02 10:22:20 +00:00
TreeHugger Robot
c078ee3b5d Merge "Add Tapjacking Protection for SettingsHomepageActivity" 2019-08-02 06:32:01 +00:00
Edgar Wang
32b0ab179c Merge "Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am: 8e3b202070 am: 063cc34713" into qt-qpr1-dev-plus-aosp
am: 1c98867b18

Change-Id: Iad2a374266f3c4c3595d6b1eb06b1433c03b161f
2019-08-01 23:14:34 -07:00
Edgar Wang
677b943ae1 Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am: 8e3b202070 am: 3448917d8e
am: fc0aec7f1a

Change-Id: Icb23c10cf6f6b4bf4c8fcb81d23d1c2b8d7ddd33
2019-08-01 23:13:14 -07:00
Android Build Merger (Role)
1c98867b18 Merge "Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am: 8e3b202070 am: 063cc34713" into qt-qpr1-dev-plus-aosp 2019-08-02 06:01:14 +00:00
Edgar Wang
73ae3701fc Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am: 8e3b202070
am: 063cc34713

Change-Id: I1f16586a9268f9afb6e8f85319ba03e91e5c98b4
2019-08-01 23:00:28 -07:00
Edgar Wang
fc0aec7f1a Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am: 8e3b202070
am: 3448917d8e

Change-Id: Ib451284c689f984e8064af58ef538b34e8ec6784
2019-08-01 23:00:21 -07:00
Edgar Wang
063cc34713 Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev
am: 8e3b202070

Change-Id: Ib1cf35ee24f88a9eae71714349fe40cb982214b0
2019-08-01 22:49:22 -07:00
Edgar Wang
3448917d8e Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev
am: 8e3b202070

Change-Id: Ic8c1eb744a1612fedd187902e65d7718500f4e8d
2019-08-01 22:49:22 -07:00
Edgar Wang
8e3b202070 Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev 2019-08-02 05:38:23 +00:00
Daniel Solomon
638e83263b Merge "Settings: change the color mode preview image" into qt-r1-dev am: c5fbd7b669 am: 4c1fa1a5d1
am: 2b40b40a95

Change-Id: I6ac505e1691008921ccd3819aab72c6cc205a123
2019-08-01 14:25:07 -07:00
Daniel Solomon
8884ceecd0 Merge "Settings: change the color mode preview image" into qt-r1-dev am: c5fbd7b669 am: 8e699b6ec8
am: 442a2b26b4

Change-Id: I47dd2dd53bcbdcc6570d0f53e4ee8385612127d6
2019-08-01 14:19:20 -07:00
Daniel Solomon
2b40b40a95 Merge "Settings: change the color mode preview image" into qt-r1-dev am: c5fbd7b669
am: 4c1fa1a5d1

Change-Id: Iedf98f0f2b96ff79c567457c2aad7f2ef8e2e434
2019-08-01 13:54:52 -07:00
Daniel Solomon
442a2b26b4 Merge "Settings: change the color mode preview image" into qt-r1-dev am: c5fbd7b669
am: 8e699b6ec8

Change-Id: I5fb775ba96631cbf9ac28b2c9946d2915ea99c10
2019-08-01 13:53:32 -07:00
Daniel Solomon
8e699b6ec8 Merge "Settings: change the color mode preview image" into qt-r1-dev
am: c5fbd7b669

Change-Id: I719cdde36a264519900584b9835d5c6e70cc5818
2019-08-01 13:38:20 -07:00
Daniel Solomon
4c1fa1a5d1 Merge "Settings: change the color mode preview image" into qt-r1-dev
am: c5fbd7b669

Change-Id: Icfc151ca32fa3ab44a68acc4732e3e9307372f22
2019-08-01 13:37:33 -07:00
TreeHugger Robot
c5fbd7b669 Merge "Settings: change the color mode preview image" into qt-r1-dev 2019-08-01 19:58:47 +00:00
Youming Ye
9c8fe39c91 [automerger skipped] Check the missing useHomeWfMode case am: b7923f5a3f am: 84049d217d -s ours
am: a427771754 -s ours
am skip reason: change_id If89c67c0595808a1339517c6084f1d1e23f5974b with SHA1 b7923f5a3f is in history

Change-Id: Ia380c3680e2de26f768df48c9cc92fc2fa5e7006
2019-08-01 12:02:21 -07:00
Youming Ye
ac52b6f68d [automerger skipped] Check the missing useHomeWfMode case am: b7923f5a3f am: de8c3c5fd3
am: 34599f661d -s ours
am skip reason: change_id If89c67c0595808a1339517c6084f1d1e23f5974b with SHA1 31608ace73 is in history

Change-Id: I2c0a12855188b0b33dd8b9da6a9688bcbff3c200
2019-08-01 11:57:17 -07:00
Youming Ye
a427771754 [automerger skipped] Check the missing useHomeWfMode case am: b7923f5a3f
am: 84049d217d -s ours
am skip reason: change_id If89c67c0595808a1339517c6084f1d1e23f5974b with SHA1 b7923f5a3f is in history

Change-Id: I3bf159aeec518e09d910ca4ec9c96dc74f68fae3
2019-08-01 11:43:22 -07:00
Youming Ye
34599f661d Check the missing useHomeWfMode case am: b7923f5a3f
am: de8c3c5fd3

Change-Id: I068d40471deb73869b0586e2bd4ebbba522ac85d
2019-08-01 11:41:05 -07:00
Youming Ye
84049d217d Check the missing useHomeWfMode case
am: b7923f5a3f

Change-Id: I81aadd772a8c8b07ca6c967868789aa91fe0dba9
2019-08-01 11:27:48 -07:00
Youming Ye
de8c3c5fd3 Check the missing useHomeWfMode case
am: b7923f5a3f

Change-Id: I8ffa6acb13e07b4a28b8f46b348ffc47c143a317
2019-08-01 11:24:55 -07:00
Sunny Shao
647e49e7cf Add Tapjacking Protection for SettingsHomepageActivity
Add/remove the SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS flag into/from
SettingsHomepageActivity and SettingsPanelActivity with lifecycle.

Bug: 138442483
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.homepage
      make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.panel
      manual test
Change-Id: I72f9a947f57f74a8c09127d6c39173594c248ddc
2019-08-01 23:36:12 +08:00
Raff Tsai
1ebf80446f Fix arabic language % character in wrong place
info.batteryPercentString is applied language format.
We don't need to format it again in BidiFormatter.

Fixes: 136699046
Test: visual
Change-Id: Ie89823c23fd23bd6a9a97821f3062cad4dfb3709
2019-08-01 18:31:13 +08:00
Raff Tsai
71a37d138b Import RadioButtonPreference from SettingsLib
Bug: 138620011
Test: manual, robolectric
Change-Id: I3b8a2be021a1b4a07aae61483f2329b7a5bd4655
2019-08-01 07:16:55 +00:00
Raff Tsai
5939f73740 Fix test case error
Bug: 138714772
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.core.codeinspection"
Change-Id: I10ff1983793e1e158eb72e93d838ccda97728084
2019-08-01 12:22:03 +08:00
Edgar Wang
58a5be4401 Add skip lock screen in Notification & security lock screen settings
Users may have trouble finding this setting in face auth.
Heard this from dogfood/executive feedback and customer support discussion.
So add Skip Lock Screen preference in
Display > Lock screen display > What to show >
and
App & Notifications > Notifications > Lock Screen >

Bug: 138458558
Test: robotest & manual

Change-Id: I10e420821423821743d65b00c8b7e6d4d1224e00
2019-08-01 11:17:05 +08:00
Antony Sargent
8cb89e9d78 Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev am: 4685c785b9 am: e744ee1295
am: afb537f589

Change-Id: Ibc1ed12d09551b67eb5090c58c166e1f3c3b3806
2019-07-31 17:20:19 -07:00
Bill Yi
d49c3d90f4 [automerger skipped] Import translations. DO NOT MERGE am: 5a690f3c4c -s ours am: f580528464 -s ours
am: f3eb3758eb -s ours
am skip reason: subject contains skip directive

Change-Id: I73969c23c425ce9867d70347aa66d0d2b8aabea9
2019-07-31 16:43:24 -07:00
Youming Ye
b7923f5a3f Check the missing useHomeWfMode case
Bug: 133812904
Test: Build
Change-Id: If89c67c0595808a1339517c6084f1d1e23f5974b
Merged-In: If89c67c0595808a1339517c6084f1d1e23f5974b
2019-07-31 16:38:32 -07:00
Antony Sargent
fa99ea7dc6 Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev am: 4685c785b9 am: ad2f49f851
am: bf2c5ce274

Change-Id: Ia0d2a348088ac2dc72e5b5218718aa80105d3e16
2019-07-31 16:35:58 -07:00
Bill Yi
58ff9ea4d5 [automerger skipped] Import translations. DO NOT MERGE am: 5a690f3c4c -s ours am: 1ccff0ddc6 -s ours
am: 1aef5e268e -s ours
am skip reason: subject contains skip directive

Change-Id: I07b5bb4f5cfdaec20778a7db0e96eae0395b330b
2019-07-31 16:26:41 -07:00
Antony Sargent
afb537f589 Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev am: 4685c785b9
am: e744ee1295

Change-Id: I823994fa96593030d1baf3baa3fa10940dc1c9c5
2019-07-31 16:24:14 -07:00
Bill Yi
f3eb3758eb [automerger skipped] Import translations. DO NOT MERGE am: 5a690f3c4c -s ours
am: f580528464 -s ours
am skip reason: subject contains skip directive

Change-Id: Iff96dd12f5e8ce6ea3f63d442ca549d78a94eb54
2019-07-31 16:07:46 -07:00
Antony Sargent
bf2c5ce274 Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev am: 4685c785b9
am: ad2f49f851

Change-Id: I3caaf466e7c62cee4de6ef2a4e9695e8725736f1
2019-07-31 16:06:59 -07:00
Bill Yi
1aef5e268e [automerger skipped] Import translations. DO NOT MERGE am: 5a690f3c4c -s ours
am: 1ccff0ddc6 -s ours
am skip reason: subject contains skip directive

Change-Id: I4d033bda95f189c0617f59cffb021c31f477cab7
2019-07-31 16:05:53 -07:00
Antony Sargent
e744ee1295 Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev
am: 4685c785b9

Change-Id: I1ce1afeee9ab139ff47a1deec14d536c8c9529ad
2019-07-31 16:04:54 -07:00
Quang Luong
c2e859edee Merge "Copy WifiSettings base code into WifiSettings2 without WifiTracker" 2019-07-31 23:03:31 +00:00
Antony Sargent
ad2f49f851 Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev
am: 4685c785b9

Change-Id: I5792ff5333005e2e0c66fd24d594b79bf67d140c
2019-07-31 15:56:00 -07:00
Bill Yi
1ccff0ddc6 [automerger skipped] Import translations. DO NOT MERGE
am: 5a690f3c4c -s ours
am skip reason: subject contains skip directive

Change-Id: Ic10bfa052664715f150c09abfc3f0015aa530ee8
2019-07-31 15:53:52 -07:00
Bill Yi
f580528464 [automerger skipped] Import translations. DO NOT MERGE
am: 5a690f3c4c -s ours
am skip reason: subject contains skip directive

Change-Id: Ibc64425d1a731f6cbd45d44b18537edfdd88acbd
2019-07-31 15:53:13 -07:00
TreeHugger Robot
4685c785b9 Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev 2019-07-31 22:39:22 +00:00
Antony Sargent
482415d37e Protect entry points to add an eSIM when admin restricted
If the DISALLOW_CONFIG_MOBILE_NETWORKS admin policy is set, we were
accidentally still allowing access to the flow where you add an eSIM
subscription via the "plus" button on the Network & internet page. While
fixing this, I also noticed that the mobile networks list page (which
only becomes available if you have multiple subscriptions) has a link at
the bottom to start the flow as well, and that wasn't being protected.

The fix for the plus button on the Network & internet page was just to
make sure not to call setEnabled(true) if the preference was already
disabled by admin policy, since that has the effect of overriding the
admin-disabling.

The fix for the mobile networks list page just needed to add the
relevant tags in the layout XML, and then we get it for free.

Fixes: 137627845
Test: make RunSettingsRoboTests
Change-Id: I896ac248f50aaeecc157791938a0a0a98265aa07
2019-07-31 12:53:39 -07:00
Daniel Solomon
56574d5924 Settings: change the color mode preview image
Change the color mode preview image to better illustrate the difference
between Natural and Boosted color modes.

Bug: 138126243
Test: manual testing on Pixel
Change-Id: I367b383f9f2da9b2e2d5960e51c3ec7821d4915b
2019-07-31 12:48:23 -07:00
Bill Yi
5a690f3c4c Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I3e51c61d9bdff182bc83a04242ccd6e1e4f9629d
2019-07-31 12:09:08 -07:00
Quang Luong
b061428938 Copy WifiSettings base code into WifiSettings2 without WifiTracker
Copied main logic from WifiSettings into WifiSettings2, removing
all instances of WifiTracker in preparation of adding WifiTracker2.

Removed:
 - WifiDialog (to be added back in)
 - Context Menu (to be added back in)
 - Leftover SUW code (Next button)

WifiSettings2Test also copied directly from WifiSettingsTest, without
context menu test.

Bug: 70983952
Test: atest WifiSettings2Test

Change-Id: Ie1ef5bf0ca14f5989f4add2165422609f12c2c84
2019-07-31 11:46:15 -07:00
Raff Tsai
a64c7b2698 Merge "Fix Settings crash when click uninstall button" 2019-07-31 01:16:47 +00:00