Commit Graph

1884 Commits

Author SHA1 Message Date
Stephen Chen
b8d2af244b Merge "Update "Open networks available" toggle to instead open notification channel preferences." into oc-dev am: de50fff3c2
am: 6455544f6e

Change-Id: I62689c3716e34c1c9faa4c0b56235c2a699552c1
2017-04-12 22:35:52 +00:00
Stephen Chen
6455544f6e Merge "Update "Open networks available" toggle to instead open notification channel preferences." into oc-dev
am: de50fff3c2

Change-Id: I500d13e65b8aa63b62e5eacb750ed2a6a1ffc163
2017-04-12 20:37:15 +00:00
TreeHugger Robot
de50fff3c2 Merge "Update "Open networks available" toggle to instead open notification channel preferences." into oc-dev 2017-04-12 20:24:22 +00:00
Doris Ling
943b6af1fc Merge "Allow settings preference title to span over multiple lines." into oc-dev am: d09c7e61f4
am: c6f5261619

Change-Id: I388c45690f8eb59db2d1d590268319ee8b72b983
2017-04-12 18:41:50 +00:00
Doris Ling
c6f5261619 Merge "Allow settings preference title to span over multiple lines." into oc-dev
am: d09c7e61f4

Change-Id: I81b0285f59195911e3b98ca6f4bf8333da9b23a4
2017-04-12 18:10:41 +00:00
TreeHugger Robot
d09c7e61f4 Merge "Allow settings preference title to span over multiple lines." into oc-dev 2017-04-12 17:57:28 +00:00
Niels Egberts
0b51491a46 Remove unused xml file.
am: 07e3f619eb

Change-Id: If5ab7a6c492d9ad02620ce61a52ddde59829d48b
2017-04-12 11:22:31 +00:00
Niels Egberts
07e3f619eb Remove unused xml file.
Bug: 36741587
Test: mmma packages/apps/Settings
Change-Id: I35eee7fb442a1cdeb54d8a9f54426322c75e3f99
(cherry picked from commit ecb613bd8d)
2017-04-12 08:55:21 +00:00
Amin Shaikh
27ea581cbe Merge "Wi-Fi network details page fixes." into oc-dev am: 52cf25d03d
am: 35caf331df

Change-Id: Ia1613cc4909e68cd1f1b40c70e9e1bfe6beecb72
2017-04-12 04:59:20 +00:00
Amin Shaikh
35caf331df Merge "Wi-Fi network details page fixes." into oc-dev
am: 52cf25d03d

Change-Id: Ic426479331d1946ea697301e2e015852c3d0fa46
2017-04-12 04:50:14 +00:00
TreeHugger Robot
52cf25d03d Merge "Wi-Fi network details page fixes." into oc-dev 2017-04-12 04:40:11 +00:00
Fan Zhang
752f902c2a Merge "Add placeholder summary to stablize app info pref height" into oc-dev
am: 0bc2aaea70

Change-Id: I5164fc54604abb057e8679d10965e9e0670da084
2017-04-12 02:45:56 +00:00
TreeHugger Robot
0bc2aaea70 Merge "Add placeholder summary to stablize app info pref height" into oc-dev 2017-04-12 02:36:12 +00:00
Tony Mantler
61492e99d7 Merge "Fix sketchy usage of new PreferenceScreen" into oc-dev am: 69faf046c0
am: d9200e5ba4

Change-Id: I4c125d7c62b94a351544a7b64547add0a774db3e
2017-04-11 23:56:08 +00:00
Tony Mantler
d9200e5ba4 Merge "Fix sketchy usage of new PreferenceScreen" into oc-dev
am: 69faf046c0

Change-Id: I6c8310037826f13e9d468e9b27dc26d347b11249
2017-04-11 23:48:17 +00:00
Amin Shaikh
399e1a5810 Wi-Fi network details page fixes.
- Fix NPE in WifiDetailPreferenceController#setIpText
- Add MAC address preference in the details section
- Set subnet mask and gateway preferences
- Do not show IP information preferences if no information is available
- Fix string capitalization errors
- Only show IPv4 DNS servers under "Network details" section

Bug: 36483230
Bug: 37096448
Bug: 36482499
Bug: 37165860
Test: m RunSettingsRoboTests
Change-Id: I0e3f0ccfc4a8d802b51ed6b3be81c75e384dd06f
2017-04-11 16:25:53 -07:00
Doris Ling
aa805e70ed Allow settings preference title to span over multiple lines.
- add singleLineTitle=false to SettingsPreference style, so that it will
not confined the title to a single line.
- remove the custom multi line title from DividerPreference and
MasterSwitchPreference.

Change-Id: I5a78d2cd6ac00c4482e252b0789fd2d265bd9adf
Fix: 34886787
Test: manual
2017-04-11 13:17:38 -07:00
Stephen Chen
2c4b42c0b7 Update "Open networks available" toggle to instead open notification channel preferences.
Bug: 36526438
Test: make ROBOTEST_FILTER=NotifyOpenNetworkPreferenceControllerTest RunSettingsRoboTests -j40
Change-Id: Idde3949856d050e62abff2c75a7b7db475a94d99
2017-04-11 11:54:51 -07:00
Tony Mantler
76f46fc869 Fix sketchy usage of new PreferenceScreen
Things get weird if you don't use PreferenceManager#createPreferenceScreen

Bug: 37216851
Test: Compiles and runs
Change-Id: I7cebec133c4f27f7eeda83c95d8acb4823f67dc4
2017-04-11 10:35:24 -07:00
Daniel Nishi
c717b54e5f Merge "Jostle the elements around in app storage settings." 2017-04-11 17:03:53 +00:00
TreeHugger Robot
4cf2523795 Merge "Add placeholder summary to stablize app info pref height" 2017-04-11 01:07:29 +00:00
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
Fan Zhang
6fabfc1f1d Add placeholder summary to stablize app info pref height
Change-Id: I6a62a94bb02271cdde9873745432aa829d6d4460
Fix: 36900036
Test: rebuild and existing robotests
2017-04-10 23:24:34 +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
Fan Zhang
4ec654c225 Add placeholder summary to stablize app info pref height
Change-Id: I6a62a94bb02271cdde9873745432aa829d6d4460
Fix: 36900036
Test: rebuild and existing robotests
2017-04-10 16:18:46 -07:00
Daniel Nishi
1075d16c59 Jostle the elements around in app storage settings.
This much more closely resembles the later mocks for
this page. The spacing, fonts, and colors are still off
and will be corrected once the final mocks land.

Bug: 34766830
Test: Manual
Change-Id: Id131e3596a0d08cb43c924a9f5cd9eb25329d7de
2017-04-10 16:14:33 -07: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