Commit Graph

11610 Commits

Author SHA1 Message Date
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
Lei Yu
af95b3d3c2 Merge "Add textAlignment for preference_widget_summary" into oc-dev
am: 8bb9f33c6f

Change-Id: Icece4eeeeefa2da5ce0a0d9318757b1270dcfce6
2017-04-11 17:34:58 +00:00
Lei Yu
8bb9f33c6f Merge "Add textAlignment for preference_widget_summary" into oc-dev 2017-04-11 17:10:08 +00:00
Fan Zhang
00d8ff5d6e Revert "Revert "Convert BT preference to use TwoTargetPreference""
This reverts commit 457c3cbec2.

Revert with fix/test.
The fix is that we removed DevicePickerFragment#initDevicePreference(),
which incorrectly set a useless widget on preference, and removes the
gear icon from preference, preventing bind() call to go through

Change-Id: Ia70cdb51d13cca6035a4e7fe8008d195f7f00c6e
Fix: 36511169
Test: runtest --path tests/app/src/com/android/settings/bluetooth/DevicePickerActivityTest.java
2017-04-11 09:45:27 -07:00
Fan Zhang
2700a3148f Update string char limits
am: d017f22372

Change-Id: Ia91e931c93a53d77a1c1ad554d60982b0c0c084a
2017-04-11 16:27:17 +00:00
Fan Zhang
d017f22372 Update string char limits
Fix: 36852178
Fix: 36851715
Fix: 36657781
Fix: 36700992
Fix: 36650008
Fix: 36657636
Test: builds and robotests
Change-Id: I14c21b2cb37b911c14dff40343fa094d7150f201
2017-04-11 09:09:23 -07:00
Evan Laird
5c51987432 Merge "Add "Current screen saver" string" into oc-dev
am: 42a1cb9e12

Change-Id: I411b6735ce8388274a120ea1a4097b1a7a618f27
2017-04-11 15:55:18 +00:00
TreeHugger Robot
42a1cb9e12 Merge "Add "Current screen saver" string" into oc-dev 2017-04-11 15:44:30 +00:00
Doris Ling
47a44f0fea Merge "Update text for security preference." into oc-dev
am: 74eee7838c

Change-Id: Ic09b5837c2fab9a5f11051c297f7571fe79ac7a1
2017-04-11 15:31:43 +00:00
Doris Ling
74eee7838c Merge "Update text for security preference." into oc-dev 2017-04-11 15:24:44 +00:00
Paul Stewart
14633029d2 Merge "Allow user to specify EAP-SIM under PEAP" into oc-dev
am: 6d7f210c0b

Change-Id: I37c91c9df8e2b8ff86cf4e11ffbc8bbbfb8ad9dd
2017-04-11 07:47:36 +00:00
TreeHugger Robot
6d7f210c0b Merge "Allow user to specify EAP-SIM under PEAP" into oc-dev 2017-04-11 07:22:52 +00:00
Bill Yi
57eb971024 Import translations. DO NOT MERGE
Change-Id: Ib38bbcc49ccc93de1730d806ed369cce9b7ecb40
Auto-generated-cl: translation import
2017-04-10 19:55:40 -07:00
Sean Stout
2fcca5a647 Merge "Remove Night Light suggestion. DO NOT MERGE" into oc-dev
am: e4c73c24bc

Change-Id: I87b734b9fc79d09f6e4aa847b06311d8c92b75a2
2017-04-11 02:05:52 +00:00
jackqdyulei
adcedce4e0 Add textAlignment for preference_widget_summary
To make sure the text are aligned to the "viewEnd".

Bug: 37159537
Test: Screenshot
Change-Id: Ifab03dda6c9954d6b83ce4db0708303e0c5d32bd
2017-04-10 18:57:12 -07:00
TreeHugger Robot
e4c73c24bc Merge "Remove Night Light suggestion. DO NOT MERGE" into oc-dev 2017-04-11 01:24:09 +00:00
Sean Stout
40067bee4d Remove Night Light suggestion. DO NOT MERGE
Test: make ROBOTEST_FILTER=SettingsSuggestionsTest RunSettingsRoboTests
Bug: 37207263
Change-Id: Ieeb660abdcbe07cb66f1ae3b6e86d8fd27a26478
2017-04-10 16:22:01 -07: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
Jack He
336a7ccca7 Merge "Add developer menu entry to enable Bluetooth inband ringing" am: 3d08bedba2
am: 9e1e430f06

Change-Id: I8fe93eebafb60a237bfbe1009652672e17411a3d
2017-04-10 23:11:42 +00:00
Doris Ling
ca95a90c11 Update text for security preference.
Swap location to screen lock in title and summary.

Bug: 37161482
Test: builds
Change-Id: Ie95f1d8c984587bf3898a431edde0868b0e17fce
2017-04-10 15:21:18 -07:00
Hyunyoung Song
ebc17237c3 Add shadow to AdaptiveIconDrawables using View level shadow
Test: $ make RunSettingsRoboTests -j40
RunSettingsRoboTests: ......
RunSettingsRoboTests: Time: 151.394
RunSettingsRoboTests:
RunSettingsRoboTests: OK (1355 tests)
RunSettingsRoboTests:

Bug: 36088922

Change-Id: I5b5651d2305ab65e1358609a4110e248dee9eab2
2017-04-10 14:43:02 -07:00
Evan Laird
044001f991 Add "Current screen saver" string
This one was missed originally.

Test: none
Bug:35031991
Change-Id: I9b1bff9a9c834c306fe03e4405950bc1ac3ac3ac
2017-04-10 16:35:45 -04:00
TreeHugger Robot
4c4f2a7c4c Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-08 08:06:37 +00:00
Lei Yu
451964a124 Merge "Extend the translation limit to 60" into oc-dev
am: 2a3a92b513

Change-Id: Iba43130a4d300ad62e775d6167aa888b4de9a437
2017-04-07 21:08:11 +00:00
Lei Yu
2a3a92b513 Merge "Extend the translation limit to 60" into oc-dev 2017-04-07 21:03:16 +00:00
Doris Ling
f8dead2f40 Merge "Add summary text to Lock screen preferences." into oc-dev
am: a258e424a2

Change-Id: I11366b87d3f3920a79096dad0dd29938da2f8a52
2017-04-07 20:07:55 +00:00
TreeHugger Robot
a258e424a2 Merge "Add summary text to Lock screen preferences." into oc-dev 2017-04-07 20:03:36 +00:00
Andrew Sapperstein
e6db78a2f1 Merge "Increase char limit for adaptive brightness text." into oc-dev
am: a9acbd924a

Change-Id: Ie7dea50e40606b39d29247740f7fb659738684a3
2017-04-07 20:02:37 +00:00
TreeHugger Robot
a9acbd924a Merge "Increase char limit for adaptive brightness text." into oc-dev 2017-04-07 19:55:54 +00:00
Daniel Nishi
af587b0cfc Merge "Update the automatic storage management preferences." into oc-dev
am: 7badf46542

Change-Id: Ic9311706e67f28607f17e036eee5bfa8290af82b
2017-04-07 19:46: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
jackqdyulei
145cb81c21 Extend the translation limit to 60
Bug: 36830908
Test: Build
Change-Id: Ib7664ac4e625701d928359104ef5e75d158e74ee
2017-04-07 10:29:58 -07:00
Paul Stewart
9b26496d03 Allow user to specify EAP-SIM under PEAP
Allow the user to select EAP-SIM methods as a second phase after
an outer PEAP authentication.  This hides the "identity" and
"password" fields if one of these methods is selected.

Bug: 34835771
Test: Manual: Connect to PEAP/EAP-SIM AP
Change-Id: I7e448fbebd352a4b0facbfafa74afaff6b704386
2017-04-07 10:28:49 -07:00
Andrew Sapperstein
12bdb22400 Increase char limit for adaptive brightness text.
Change-Id: I4bab996d94812cf9a2a148ef3dc1119c5dab7a8e
Fixes: 37014409
Test: string change
2017-04-07 17:23:30 +00:00
Bill Yi
2de5bb8291 Import translations. DO NOT MERGE
Change-Id: Ibe3f320c6df848eea67091636daf2edeab020c51
Auto-generated-cl: translation import
2017-04-07 09:27:04 -07:00
Doris Ling
64c8244524 Merge "Add summary text for Encryption & credential." into oc-dev
am: 65682e7fa5

Change-Id: I47fa8dffba03f8666972843046537dcbededef9c
2017-04-07 02:47:53 +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
4e33cc1279 Merge "Update summary text for Trust agent." into oc-dev
am: b9a54bae08

Change-Id: I16a2423d405c34afe1cd589f9007a4b4dafb6925
2017-04-07 02:17:22 +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
Daniel Nishi
11bd2c3084 Merge ""% used" instead of "% full" in storage donut." into oc-dev
am: b52a341914

Change-Id: Ie0df09915c2bc3e8c8926e2cec81835a37a7c7b0
2017-04-06 23:25:10 +00:00
Daniel Nishi
b52a341914 Merge ""% used" instead of "% full" in storage donut." into oc-dev 2017-04-06 23:19:18 +00:00
jackqdyulei
672a85aaa5 Merge "Update foreground string in battery page" into oc-dev
am: 020bb3bb99

Change-Id: Ie23192f5e28c274e6d750dfa28effc8d17c3b762
2017-04-06 22:35:29 +00:00
TreeHugger Robot
020bb3bb99 Merge "Update foreground string in battery page" into oc-dev 2017-04-06 22:25:55 +00:00
jackqdyulei
23f8052652 Merge "Fix crash when clicking item in Battery screen" into oc-dev
am: bac9b527e7

Change-Id: I5ebed1fea938019771aecf964bfe54bcbc6f156b
2017-04-06 22:00:23 +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
Daniel Nishi
f588f7678d Add a movies & tv apps category to storage settings.
Change-Id: I055e93d2a151195b90a5fd64f4fddebbbcffef59
Merged-In: Idfabe83739272b19cbef4b13a82339170f8f97b3
Fixes: 36223441
Test: Settings Robotest
2017-04-06 13:36:12 -07:00