Commit Graph

33904 Commits

Author SHA1 Message Date
Bartosz Fabianowski
ba66a0ef09 Update strings and layout for enterprise privacy
This CL continues the finalization of UI layout and strings for the
enterprise privacy page:
* Turn footer into a header
* Update strings
* Dynamically generate summaries for entry points in security page

Bug: 32692748
Test: m RunSettingsRoboTests

Change-Id: Ibf248ac269380fb1b919b01f88f721130060b7f9
2017-03-13 23:59:35 +01:00
Daniel Nishi
26a5a71d31 Merge "Don't show owner as a secondary user." 2017-03-13 22:11:00 +00:00
TreeHugger Robot
bb5509f84f Merge "Extends the touch area for the switch in Master Switch preference." 2017-03-13 21:26:30 +00:00
TreeHugger Robot
14ed46c5a3 Merge "Prevent whitelisted apps from blocking and silencing" 2017-03-13 21:02:27 +00:00
TreeHugger Robot
15e53a3f57 Merge "Specify disallowed action in AdminSupportDetailsDialog" 2017-03-13 20:11:35 +00:00
Matthew Fritze
8145b0f35a Merge "Add optional feedback button for settings search" 2017-03-13 19:39:50 +00:00
Daniel Nishi
092e3c0b3c Don't show owner as a secondary user.
Change-Id: I0a67eb176528a0f95595107b12c6ecc679a1041f
Fixes: 36138657
Test: Robotest
2017-03-13 12:27:22 -07:00
TreeHugger Robot
a6b01f19da Merge "Add battery percentage switch to display settings" 2017-03-13 19:09:46 +00:00
Julia Reynolds
dcee38d02e Prevent whitelisted apps from blocking and silencing
Change-Id: I34cb5c2c59d56b68ed1500c8c79cd65676c0af25
Fixes: 35841524
Test: manual
2017-03-13 18:46:03 +00:00
Saige McVea
6c2f9fe6d7 Merge "Revert "Accessibility settings refresh."" 2017-03-13 18:30:41 +00:00
Saige McVea
31d855e739 Revert "Accessibility settings refresh."
This reverts commit 89a5c62963.

Change-Id: I97e420e4f78ee3e48b8aa10c8f5c1e2861032fab
2017-03-13 18:04:00 +00:00
phweiss
15931742ac Specify disallowed action in AdminSupportDetailsDialog
The title of an AdminSupportDetailsDialog "Action not allowed" is
replaced by specialized strings such as "Screenshot not allowed" if
the action is specified by the extra DevicePolicyManager.EXTRA_RESTRICTION
in the calling intent.

This is done because these intents can be created by
third-party apps via the new public API
DevicePolicyManager.createAdminSupportIntent, and the disallowed action
might not be obvious in context of the third party app.

Bug: 31215663
Test: CtsVerifier in separate CL
Change-Id: I0c9e360cea34bec8eda29d86c5bf55d8c38c47ec
2017-03-13 18:53:18 +01:00
Doris Ling
6467d2027e Extends the touch area for the switch in Master Switch preference.
- set view click listener on the entire widget view instead of only
listening to the switch button event.
- move the preference layout end padding into the widget frame, so that
clicking on the empty space at the end will send the click event to the
widget frame instead of the preference view.

Change-Id: I98025f723465f3941cebbbd03b812209c0240590
Fix: 35872094
Test: make RunSettingsRoboTests
2017-03-13 10:29:34 -07:00
Doris Ling
397a1b80ef Merge "Add logging to Bluetooth settings." 2017-03-13 17:24:14 +00:00
Matthew Fritze
2beb03f4b7 Add optional feedback button for settings search
Adds mechanism for adding a button in the search screen
and stubs to show and hide the button.

Fixes: 35164702
Test: make -j40 RunSettingsRoboTests
Change-Id: I34d245e84b62cedf2dc6e5de4ea336c5a99ffd31
2017-03-13 09:55:05 -07:00
Gustav Sennton
72c7a83141 Merge "WebView implementation Dev setting: Show the version number after name" 2017-03-13 14:25:28 +00:00
Jeff Sharkey
0f0e3adac8 Merge commit '11324dcedfd9d4cccba0b1e493c44fe80bb05da4' into manual_merge_11324dcedf
Change-Id: Icd2605fd1572dd21bb27a7d42bc62ba9b06bd9ad
2017-03-12 17:22:21 -06:00
Jeff Sharkey
11324dcedf Merge "Fix network name for Passpoint network" am: 742bd03f12
am: a41debeacd

Change-Id: I6cffc06b4d792501fd3cc158cbc119b3c388c9be
2017-03-12 23:13:42 +00:00
Jeff Sharkey
a41debeacd Merge "Fix network name for Passpoint network"
am: 742bd03f12

Change-Id: Ia9ae9d6034f72be5f8d34340efce5b52d71fa6c2
2017-03-12 23:09:11 +00:00
Jeff Sharkey
742bd03f12 Merge "Fix network name for Passpoint network" 2017-03-12 23:03:20 +00:00
TreeHugger Robot
9ba477b62b Merge "Add setting for the assist gesture sensitivity control." 2017-03-11 03:17:38 +00:00
TreeHugger Robot
75ff40e409 Merge "Add DynamicAvailabilityPreferenceController" 2017-03-11 03:07:31 +00:00
Philip Quinn
5473f68cdd Add setting for the assist gesture sensitivity control.
The sensitivity control is only visible when the assist gesture itself
is enabled.

Test: make -j RunSettingsRoboTests; manual test on supported/unsupported
      configurations.

Change-Id: I584975794c5cf9d788e93167292d142ae2faf1c5
2017-03-10 17:23:14 -08:00
TreeHugger Robot
700fc363ef Merge "Fix the Storage settings title." 2017-03-11 00:01:15 +00:00
TreeHugger Robot
f0110a1de7 Merge "Use color accent as background color for app info pages." 2017-03-10 23:58:30 +00:00
TreeHugger Robot
85478422e2 Merge "Disable wifi display activity if device can't support it." 2017-03-10 23:35:26 +00:00
Fan Zhang
6a56b8feb0 Merge "Refactor sound setting -> work profile initialization logic." 2017-03-10 22:39:31 +00:00
Bartosz Fabianowski
436873f156 Add DynamicAvailabilityPreferenceController
This is a PreferenceController that correctly handles the case of
isAvailable() changing dynamically, while the Settings page containing
the preference in question is open.

Bug: 32692748
Test: m RunSettingsRoboTests

Change-Id: I95e22bbc7bdc17bacd2bf6b82fa5b535494d5bce
2017-03-10 23:25:36 +01:00
Doris Ling
b2032416e9 Use color accent as background color for app info pages.
Bug: 34977561
Test: visual
Change-Id: Idc03d33a318d7908a47e76738f7d098ab60fb0fe
2017-03-10 14:15:14 -08:00
TreeHugger Robot
f11c16710c Merge "Update the Manage Storage preference." 2017-03-10 22:01:58 +00:00
Daniel Nishi
f4febcc7bb Fix the Storage settings title.
The wrong resource id was passed in for the title.

Change-Id: I5d4bc4d127903f58c0df671504a140fe883c2f17
Fixes: 35961000,36126458
Test: Manual
2017-03-10 13:15:25 -08:00
Fan Zhang
4fcd5ed29f Disable wifi display activity if device can't support it.
Change-Id: I19ab9d0d480b66e56b87cef7c49d4391a3608111
Fix: 36069170
Test: make RunSettingsRoboTests
2017-03-10 13:03:47 -08:00
Evan Laird
3822f122a7 Add battery percentage switch to display settings
Test: mmma packages/apps/Settings/tests/robotests
Bug:32539932
Change-Id: I08c1d0f3b6cb8be7d1456268498356f7ed833e5c
2017-03-10 14:35:40 -05:00
Anton Philippov
a540a978bc Merge "Hide "Factory reset" item for secondary users" 2017-03-10 19:05:19 +00:00
Paul Duffin
c1542f1fd4 Refactor code incompatible with Mockito 2.7.13
Bug: 32912773
Test: make checkbuild
Change-Id: Idcd89438aa05ed2d010934cc6613763d4cfb9885
2017-03-10 14:59:09 +00:00
Gustav Sennton
75f0b1b2e4 WebView implementation Dev setting: Show the version number after name
Show the package version of each WebView implementation after their
package name in the WebView Implementation Dev Setting. Showing a
package version is useful for debugging purposes.

Bug: 35621558
Test: run make RunSettingsRoboTests
Test: Ensure package version is shown in titles of items in WebView
Implementation Dev Setting.
Change-Id: If195dd87aebeac1783600b7c9f376ff8e791c3be
2017-03-10 14:40:37 +00:00
TreeHugger Robot
e11cb90ed2 Merge "Replaced auto-fill by autofill to keep it consistent with API style." 2017-03-10 07:05:36 +00:00
TreeHugger Robot
a94c818330 Merge "Fix misc style issue in "Open by default" screen." 2017-03-10 03:40:40 +00:00
Doris Ling
133b096288 Add logging to Bluetooth settings.
- Add logging when users selects the listed devices to connect or
disconnect, and when connection error is shown
- Update the event for the top level bluetooth master switch toggle to
have its own event.

Change-Id: I58f21256fdd07fad9d733ff987ff38df1148f4f8
Fix: 35065258
Test: make RunSettingsRoboTests
2017-03-09 18:14:30 -08:00
Fan Zhang
1c1d11002d Fix misc style issue in "Open by default" screen.
Fix: 35960603
Test: visual

Change-Id: I6d3f471bb31e8c945d4d3346ad9512cda095ed64
2017-03-09 18:10:59 -08:00
Fan Zhang
3515cc8217 Refactor sound setting -> work profile initialization logic.
- Some formatting change
- Merge work profile sound settings into main sound setting xml file, and
  use existing WorkCategory to host it. This category automatically hides
  everything within if user is not using work profile.
- Remove logic for manually populating work profile sound setting into
  the UI, thus removing the animation glitch when expanding advanced
  button.

Change-Id: I90459e5cd1d3d20a97ea3629e143ebf13dbd0f76
Fix: 35959624
Test: make RunSettingsRoboTests
2017-03-09 17:49:54 -08:00
Fan Zhang
1f5fdab61e Misc fixes
- Remove tiny icon in bluetooth subheader
- Turn new search on

Fix: 35917435
Test: make RunSettingsRoboTests

Change-Id: I97a02319108a46a0c3df2295ddec49d47f13b597
2017-03-09 14:06:43 -08:00
Dmitry Dementyev
5e2545c3e6 resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217 am: def3eddb43 am: 3964c51bf2 -s ours am: f1fb452863 am: 2569925151 am: efb9f74486 am: d5f3ae5cac am: 0fb3d55e3a
am: dd48f602bb

Change-Id: I69d192ea59bd5c2b79abd513e88aecc78a0d6980
2017-03-09 18:35:40 +00:00
Dmitry Dementyev
4ea31956fb resolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f am: 8c5c5b5cec am: 3b5b2d6d20 am: c28fb3e071 am: 5330df501f
am: 7a3593cbc6  -s ours

Change-Id: Iab4a431d43dade3cbe26b5be7e4166f090a26d2e
2017-03-09 18:35:27 +00:00
Dmitry Dementyev
dd48f602bb resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217 am: def3eddb43 am: 3964c51bf2 -s ours am: f1fb452863 am: 2569925151 am: efb9f74486 am: d5f3ae5cac
am: 0fb3d55e3a

Change-Id: I6c19c6e9ee3586ee954ffe6fc195072c073b489e
2017-03-09 18:32:28 +00:00
Dmitry Dementyev
7a3593cbc6 resolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f am: 8c5c5b5cec am: 3b5b2d6d20 am: c28fb3e071
am: 5330df501f

Change-Id: I32c0ac9a2a38b01417ccf9135b4bfc002af68cc7
2017-03-09 18:32:13 +00:00
Dmitry Dementyev
0fb3d55e3a resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217 am: def3eddb43 am: 3964c51bf2 -s ours am: f1fb452863 am: 2569925151 am: efb9f74486
am: d5f3ae5cac

Change-Id: Iacd8197fe2d48921a7b5adc71298ae8a00bb871d
2017-03-09 18:29:27 +00:00
Dmitry Dementyev
5330df501f resolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f am: 8c5c5b5cec am: 3b5b2d6d20
am: c28fb3e071

Change-Id: I1944207165459d9bbd946eb6f30b18809a561c3c
2017-03-09 18:29:12 +00:00
Dmitry Dementyev
d5f3ae5cac resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217 am: def3eddb43 am: 3964c51bf2 -s ours am: f1fb452863 am: 2569925151
am: efb9f74486

Change-Id: I947fecd7b54fac9c3253decff4d635cad7706baa
2017-03-09 18:25:27 +00:00
Dmitry Dementyev
c28fb3e071 resolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f am: 8c5c5b5cec
am: 3b5b2d6d20

Change-Id: I52945a6de0678ae91a1eba0201dc252402146260
2017-03-09 18:25:11 +00:00