Commit Graph

1860 Commits

Author SHA1 Message Date
Jack He
0ff39bc114 Merge "Add developer menu entry to enable Bluetooth inband ringing" am: 3d08bedba2 am: 9e1e430f06 am: 336a7ccca7
am: 075ee6109f

Change-Id: I6f525a905f9472aae6f227de3f3b1dd1eac5fcaa
2017-04-10 23:32:11 +00:00
Jack He
075ee6109f Merge "Add developer menu entry to enable Bluetooth inband ringing" am: 3d08bedba2 am: 9e1e430f06
am: 336a7ccca7

Change-Id: I1a7ff476de330fbe0c0b48ce27c8dd363cd49c8f
2017-04-10 23:20:34 +00:00
Doris Ling
0ec7d2eb0d Merge "Add summary text to Lock screen preferences." into oc-dev am: a258e424a2
am: f8dead2f40

Change-Id: Id623c73b1bce56b3ec25a5b0dc7f4016a5fce72e
2017-04-07 20:12:28 +00:00
TreeHugger Robot
a258e424a2 Merge "Add summary text to Lock screen preferences." into oc-dev 2017-04-07 20:03:36 +00:00
Daniel Nishi
27d8d2b46e Merge "Update the automatic storage management preferences." into oc-dev am: 7badf46542
am: af587b0cfc

Change-Id: Icec5b8d5118497a7e4af21cc1c262400695b75e1
2017-04-07 19:50:05 +00:00
Daniel Nishi
7badf46542 Merge "Update the automatic storage management preferences." into oc-dev 2017-04-07 19:38:27 +00:00
Doris Ling
cee83e4bbf Add summary text to Lock screen preferences.
Each time we refresh the security preference page, get the current
summary text from "On the lock screen" and populate to Lock screen
preferences summary.

Bug: 36540633
Test: make RunSettingsRoboTests
Change-Id: I317e3892b35b30981b62f7b7aee9cfdacd04a3ed
2017-04-07 11:11:45 -07:00
Doris Ling
17d103e9d3 Merge "Add summary text for Encryption & credential." into oc-dev am: 65682e7fa5
am: 64c8244524

Change-Id: I5eec7aab71e3990d6f132a6f807f006a918f4c78
2017-04-07 02:55:03 +00:00
TreeHugger Robot
65682e7fa5 Merge "Add summary text for Encryption & credential." into oc-dev 2017-04-07 02:40:13 +00:00
Doris Ling
388a138fd6 Merge "Update summary text for Trust agent." into oc-dev am: b9a54bae08
am: 4e33cc1279

Change-Id: I71cebb56677c1cc9f502c1578f2de3fbcfa88f26
2017-04-07 02:21:17 +00:00
TreeHugger Robot
b9a54bae08 Merge "Update summary text for Trust agent." into oc-dev 2017-04-07 02:09:36 +00:00
Doris Ling
2db8c867d1 Update summary text for Trust agent.
Update the summary text to show the number of active trust agent.

Bug: 36540633
Test: make RunSettingsRoboTests
Change-Id: I6627564a8356022c89694c84cfd47e875a0916b1
2017-04-06 17:29:12 -07:00
Doris Ling
415ce9a77d Add summary text for Encryption & credential.
Add the static summary to the preference in the xml.

Bug: 36540633
Test: visual
Change-Id: Ie1bb01a42acf969e26c3c9b036d2db68d1817e97
2017-04-06 16:31:02 -07:00
jackqdyulei
9d78a655fa Merge "Fix crash when clicking item in Battery screen" into oc-dev am: bac9b527e7
am: 23f8052652

Change-Id: Ie1895e12f4628dd80aca7eeb41bcbeac9599dc0e
2017-04-06 23:03:55 +00:00
TreeHugger Robot
bac9b527e7 Merge "Fix crash when clicking item in Battery screen" into oc-dev 2017-04-06 21:50:07 +00:00
jackqdyulei
fefdd5d47f Fix crash when clicking item in Battery screen
"last full charge/Screen usage since full charge" goes crash when
clicking on it. This is because The default behaviour for
PowerGaugePreference is to start detail page and the above two items
are PowerGaugePreference.

This cl set these two items as non-selectable.

Bug: 37080048
Test: make -j40 SettingsTest
Change-Id: Ide4e151dcd0b44fb795a5753c91f2197b2a24a56
2017-04-06 12:52:50 -07:00
Doris Ling
766643750a Merge "Re-order the display settings items." into oc-dev am: 5a03e321bc
am: 5221d1cd0a

Change-Id: Icabaab149f5fbe5d816cd7b8d440ff5593fa4e3b
2017-04-06 17:20:21 +00:00
Doris Ling
5a03e321bc Merge "Re-order the display settings items." into oc-dev 2017-04-06 17:01:46 +00:00
Jack He
8d64a93c6a Add developer menu entry to enable Bluetooth inband ringing
Bug: 19171297
Test: Make, HFP regression test, testplans/82144
Change-Id: Ib24463347323f83daf8b4d9f1d38bb9c3071fb95
2017-04-04 16:20:14 -07:00
jackqdyulei
273ad50a3a Ui changes in battery main page
1. Refine the battery header view
2. Move stats section to the place above power management
3. Add last full charge battery stat
4. Add the disclaimer as a footer

Also update the method name in test file, and this ui changes
also fix the header flash problem.

Bug: 36576021
Bug: 36494178
Test: RunSettingsRoboTests
Change-Id: I9784dbbbe16e61da7287f300183347dd4eee6a2b
(cherry picked from commit edfd09d590)
2017-04-04 10:06:35 -07:00
Daniel Nishi
1ee13fd386 Update the automatic storage management preferences.
This updates this page to match the newer mocks. The changes
include:

* Changing the toggle from a switch to a switch bar.
* Removing the Deletion Helper flow from the screen.
* Unit testing the previously untested functionality.

Change-Id: I35eb1e065c9acfbf32a64d659d35e18034025472
Fixes: 36486021
Test: Robotest
2017-04-03 13:05:08 -07:00
Lei Yu
851e73b8a2 Merge "Ui changes in battery main page" 2017-04-02 07:03:10 +00:00
TreeHugger Robot
57a0771bf5 Merge "Device management info: Refer to current user, not primary user" into oc-dev 2017-04-01 05:12:39 +00:00
Suprabh Shukla
6221a5b8d2 Disabling switch preference when unknown sources are blocked
When the user restriction DISALLOW_INSTALL_UNKNOWN_SOURCES is set,
changing the preferences in settings is meaningless as package installer
will not let the install proceed. Disabling the settings switch and
updated the summaries to reflect when a switch is disabled. Removing
robolectric test as the logic is no longer testable due to missing stubs
for UserManager and UserHandle.

Test: CtsVerifier -> Device Owner Tests -> Policy Transparency Test

Bug: 34688413
Change-Id: I7cf6cc09a5d29721186a0df9405d3c7e486295ee
Merged-In: I7cf6cc09a5d29721186a0df9405d3c7e486295ee
2017-04-01 02:58:00 +00:00
Suprabh Shukla
d9a3f31019 Merge "Disabling switch preference when unknown sources are blocked" 2017-04-01 02:40:22 +00:00
Suprabh Shukla
cb9164ad48 Disabling switch preference when unknown sources are blocked
When the user restriction DISALLOW_INSTALL_UNKNOWN_SOURCES is set,
changing the preferences in settings is meaningless as package installer
will not let the install proceed. Disabling the settings switch and
updated the summaries to reflect when a switch is disabled. Removing
robolectric test as the logic is no longer testable due to missing stubs
for UserManager and UserHandle.

Test: CtsVerifier -> Device Owner Tests -> Policy Transparency Test

Bug: 34688413
Change-Id: I7cf6cc09a5d29721186a0df9405d3c7e486295ee
2017-03-31 16:16:20 -07:00
Doris Ling
11b224e34f Re-order the display settings items.
Move Night light and Adaptive brightness up.

Change-Id: Ic5302e26e1c5c6c74fea955ad90723c2eeb94a31
Fix: 35959978
Test: visual
2017-03-31 13:14:03 -07:00
jackqdyulei
edfd09d590 Ui changes in battery main page
1. Refine the battery header view
2. Move stats section to the place above power management
3. Add last full charge battery stat
4. Add the disclaimer as a footer

Also update the method name in test file, and this ui changes
also fix the header flash problem.

Bug: 36576021
Bug: 36494178
Test: RunSettingsRoboTests
Change-Id: I9784dbbbe16e61da7287f300183347dd4eee6a2b
2017-03-31 10:16:14 -07:00
Bartosz Fabianowski
1fca17ce2e Device management info: Refer to current user, not primary user
The device management info page should show information about the
current user's policies, not the primary user's.

Bug: 32692748
Test: m RunSettingsRoboTests

Change-Id: I5d8afa7fae1c0f3a4da78b085365882827e6721b
(cherry picked from commit b836da263d)
2017-03-31 09:26:12 +00:00
TreeHugger Robot
901c8e8e6e Merge "Device management info: Refer to current user, not primary user" 2017-03-31 09:25:25 +00:00
TreeHugger Robot
b9f570ff44 Merge "Remove android:visibility attributes from Preferences" into oc-dev 2017-03-30 19:57:01 +00:00
Stephen Chen
db45e51514 Merge "Add link speed to Wifi details page." into oc-dev am: 0df5281fe6
am: 659c66a3ca

Change-Id: I89b6bdfabf841f8027ae5c6870ec9ec40b8388bc
2017-03-30 18:25:32 +00:00
TreeHugger Robot
115b880063 Merge "Remove unused xml file." 2017-03-30 14:39:34 +00:00
Bartosz Fabianowski
b836da263d Device management info: Refer to current user, not primary user
The device management info page should show information about the
current user's policies, not the primary user's.

Bug: 32692748
Test: m RunSettingsRoboTests

Change-Id: I5d8afa7fae1c0f3a4da78b085365882827e6721b
2017-03-30 16:18:44 +02:00
Niels Egberts
ecb613bd8d Remove unused xml file.
Bug: 36741587
Test: mmma packages/apps/Settings
Change-Id: I35eee7fb442a1cdeb54d8a9f54426322c75e3f99
2017-03-30 11:06:37 +01:00
Bartosz Fabianowski
49a3c626fb Remove android:visibility attributes from Preferences
The android:visibility attribute is not applicable to Preferences and
does nothing.

Bug: 32692748
Test: None

Change-Id: I9aa6c3df824b61f96466cc7de6c046870a46678c
(cherry picked from commit 28a03aeb48)
2017-03-30 08:28:11 +00:00
Stephen Chen
c6453a5bca Add link speed to Wifi details page.
Also make detail items unselectable.

Bug: 36444504
Test: make RunSettingsRoboTests
Change-Id: I393a3a25c8c036da1df1dc2788accfecb3563e14
2017-03-29 16:28:08 -07:00
Daniel Nishi
56a078d46d Merge "Add a movies & tv apps category to storage settings." 2017-03-29 21:13:05 +00:00
Bartosz Fabianowski
28a03aeb48 Remove android:visibility attributes from Preferences
The android:visibility attribute is not applicable to Preferences and
does nothing.

Bug: 32692748
Test: None

Change-Id: I9aa6c3df824b61f96466cc7de6c046870a46678c
2017-03-29 17:13:48 +02:00
Maurice Lam
c48f29f038 Merge "Add DEFERRED_SETUP as exclusive suggestion" 2017-03-29 01:25:22 +00:00
Daniel Nishi
c2157ab443 Add a movies & tv apps category to storage settings.
Change-Id: Idfabe83739272b19cbef4b13a82339170f8f97b3
Fixes: 36223441
Test: Settings Robotest
2017-03-28 17:18:15 -07:00
TreeHugger Robot
9502f112e6 Merge "Use buttons for EncryptionInterstitial" 2017-03-28 23:11:41 +00:00
Steven Moreland
20f9ab272a Merge "Revert "Development Options: toggle binderized hals"" am: 21de66bc0c am: 68b580f346
am: efb7925e7a

Change-Id: I0d97c4ecfb4cd04ee0a19468c0c8382e61f4ae79
2017-03-28 01:27:24 +00:00
TreeHugger Robot
f85ebb24bb Merge "Changes to installed app details screen for instant apps" 2017-03-28 01:22:47 +00:00
Steven Moreland
68b580f346 Merge "Revert "Development Options: toggle binderized hals""
am: 21de66bc0c

Change-Id: If9288dda590a4f7fe5a60faeec695045e038ead1
2017-03-28 01:18:00 +00:00
Treehugger Robot
21de66bc0c Merge "Revert "Development Options: toggle binderized hals"" 2017-03-28 01:12:14 +00:00
TreeHugger Robot
8d3a639784 Merge "Move automatic rules to main DND settings page." 2017-03-27 23:35:45 +00:00
Maurice Lam
a2218a938f Add DEFERRED_SETUP as exclusive suggestion
Add the suggestion category DEFERRED_SETUP, and mark as exclusive
which will prevent suggestions from other categories to be shown when
this is available.

Test: Manual
Bug: 35668836
Change-Id: I2b8ddb65482a39ce8bcb2d673af5dfec759b40c8
2017-03-27 15:52:13 -07:00
Daniel Nishi
16e9247d21 Merge "Badge the icons for profile storage screen." 2017-03-27 22:20:09 +00:00
Antony Sargent
09955c3865 Changes to installed app details screen for instant apps
Bug: 35098444
Test: make RunSettingsRoboTests

This implements the following changes to the app details screen:

-Suppresses the "Uninstall" and "Force Stop" buttons
-Adds "Install app" and "Clear app" buttons
-Adds a mechanism for showing a link to the store's app details
 page that can be different from the default for installed apps.

Change-Id: Icea83f7d1fde62d4101cb0c8a6d03849f6c56bca
2017-03-27 14:34:56 -07:00