OSDN Git Service

android-x86/packages-apps-Settings.git
7 years agoMerge "Use correct title when opening from notification" into oc-dev
Christine Franks [Wed, 12 Apr 2017 17:33:29 +0000 (17:33 +0000)]
Merge "Use correct title when opening from notification" into oc-dev
am: f61d4f38be

Change-Id: I671f893935c908f00464fb97612dd7486c5b3438

7 years agoMerge "Use correct title when opening from notification" into oc-dev
Christine Franks [Wed, 12 Apr 2017 17:19:40 +0000 (17:19 +0000)]
Merge "Use correct title when opening from notification" into oc-dev

7 years agoMerge "VPN settings: better a11y voice for legacy dialog" into oc-dev
Charles He [Wed, 12 Apr 2017 11:22:47 +0000 (11:22 +0000)]
Merge "VPN settings: better a11y voice for legacy dialog" into oc-dev
am: 2371009a22

Change-Id: Ifcdac1ef4c6fee959aab46ca2025d2c71a2e657d

7 years agoRemove unused xml file.
Niels Egberts [Wed, 12 Apr 2017 11:22:31 +0000 (11:22 +0000)]
Remove unused xml file.
am: 07e3f619eb

Change-Id: If5ab7a6c492d9ad02620ce61a52ddde59829d48b

7 years agoMerge "VPN settings: better a11y voice for legacy dialog" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 11:20:08 +0000 (11:20 +0000)]
Merge "VPN settings: better a11y voice for legacy dialog" into oc-dev

7 years agoRemove unused xml file.
Niels Egberts [Thu, 30 Mar 2017 10:06:37 +0000 (11:06 +0100)]
Remove unused xml file.

Bug: 36741587
Test: mmma packages/apps/Settings
Change-Id: I35eee7fb442a1cdeb54d8a9f54426322c75e3f99
(cherry picked from commit ecb613bd8d485b6c0eed1b7ec10a8dae8d1da08f)

7 years agoMerge "Remove hotspot receiver from manifest." into oc-dev
Doris Ling [Wed, 12 Apr 2017 08:27:20 +0000 (08:27 +0000)]
Merge "Remove hotspot receiver from manifest." into oc-dev
am: 44cfdcc9a7

Change-Id: If2461a2b66be0dbc76d6504dc4a8dca12782c86b

7 years agoMerge "Remove hotspot receiver from manifest." into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 08:20:05 +0000 (08:20 +0000)]
Merge "Remove hotspot receiver from manifest." into oc-dev

7 years agoMerge "Wi-Fi network details page fixes." into oc-dev
Amin Shaikh [Wed, 12 Apr 2017 04:50:14 +0000 (04:50 +0000)]
Merge "Wi-Fi network details page fixes." into oc-dev
am: 52cf25d03d

Change-Id: Ic426479331d1946ea697301e2e015852c3d0fa46

7 years agoMerge "Renaming intent action for unknown sources" into oc-dev
Suprabh Shukla [Wed, 12 Apr 2017 04:45:58 +0000 (04:45 +0000)]
Merge "Renaming intent action for unknown sources" into oc-dev
am: 3fa963b28e

Change-Id: I16886b1a1975e06c5593aa513ab09425a302475e

7 years agoMerge "Wi-Fi network details page fixes." into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 04:40:10 +0000 (04:40 +0000)]
Merge "Wi-Fi network details page fixes." into oc-dev

7 years agoMerge "Renaming intent action for unknown sources" into oc-dev
Suprabh Shukla [Wed, 12 Apr 2017 04:32:45 +0000 (04:32 +0000)]
Merge "Renaming intent action for unknown sources" into oc-dev

7 years agoMerge "Add placeholder summary to stablize app info pref height" into oc-dev
Fan Zhang [Wed, 12 Apr 2017 02:45:56 +0000 (02:45 +0000)]
Merge "Add placeholder summary to stablize app info pref height" into oc-dev
am: 0bc2aaea70

Change-Id: I5164fc54604abb057e8679d10965e9e0670da084

7 years agoMerge "Add placeholder summary to stablize app info pref height" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 02:36:11 +0000 (02:36 +0000)]
Merge "Add placeholder summary to stablize app info pref height" into oc-dev

7 years agoMerge "Fix nav up button from running process details." into oc-dev
Fan Zhang [Wed, 12 Apr 2017 01:35:30 +0000 (01:35 +0000)]
Merge "Fix nav up button from running process details." into oc-dev
am: 5ebfe92f09

Change-Id: I3fe9ed12b497584d079b94e89ac7cfeec63752e4

7 years agoMerge "Fake the cache size to be 0 bytes when cleared." into oc-dev
Daniel Nishi [Wed, 12 Apr 2017 01:35:15 +0000 (01:35 +0000)]
Merge "Fake the cache size to be 0 bytes when cleared." into oc-dev
am: 375c22d031

Change-Id: I2672ff3a908272feb1b1e8c2fd8584be745d71f1

7 years agoMerge "Fix nav up button from running process details." into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 01:25:36 +0000 (01:25 +0000)]
Merge "Fix nav up button from running process details." into oc-dev

7 years agoMerge "Fake the cache size to be 0 bytes when cleared." into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 01:25:21 +0000 (01:25 +0000)]
Merge "Fake the cache size to be 0 bytes when cleared." into oc-dev

7 years agoMerge "Remove divider above ExpandPreference." into oc-dev
Andrew Sapperstein [Wed, 12 Apr 2017 00:20:08 +0000 (00:20 +0000)]
Merge "Remove divider above ExpandPreference." into oc-dev
am: abac8823b2

Change-Id: Id03d2e44fe8da8dc98b1a6694b2281d29c72a04d

7 years agoMerge "Remove divider above ExpandPreference." into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 00:03:05 +0000 (00:03 +0000)]
Merge "Remove divider above ExpandPreference." into oc-dev

7 years agoMerge "Fix sketchy usage of new PreferenceScreen" into oc-dev
Tony Mantler [Tue, 11 Apr 2017 23:48:17 +0000 (23:48 +0000)]
Merge "Fix sketchy usage of new PreferenceScreen" into oc-dev
am: 69faf046c0

Change-Id: I6c8310037826f13e9d468e9b27dc26d347b11249

7 years agoMerge "Fix sketchy usage of new PreferenceScreen" into oc-dev
TreeHugger Robot [Tue, 11 Apr 2017 23:43:26 +0000 (23:43 +0000)]
Merge "Fix sketchy usage of new PreferenceScreen" into oc-dev

7 years agoMerge "Don't show vpn info box when we don't have anything useful" into oc-dev
Fan Zhang [Tue, 11 Apr 2017 23:43:01 +0000 (23:43 +0000)]
Merge "Don't show vpn info box when we don't have anything useful" into oc-dev
am: d70abb53ee

Change-Id: I98af02698f46eb483cf5d64380854dd632d26113

7 years agoMerge "Revert "Revert "Convert BT preference to use TwoTargetPreference""" into oc-dev
Fan Zhang [Tue, 11 Apr 2017 23:42:46 +0000 (23:42 +0000)]
Merge "Revert "Revert "Convert BT preference to use TwoTargetPreference""" into oc-dev
am: fd29aada6b

Change-Id: I30e9087f3e90055ccc1192743814c42f3a28a21e

7 years agoMerge "Don't show vpn info box when we don't have anything useful" into oc-dev
TreeHugger Robot [Tue, 11 Apr 2017 23:35:37 +0000 (23:35 +0000)]
Merge "Don't show vpn info box when we don't have anything useful" into oc-dev

7 years agoMerge "Revert "Revert "Convert BT preference to use TwoTargetPreference""" into oc-dev
TreeHugger Robot [Tue, 11 Apr 2017 23:35:13 +0000 (23:35 +0000)]
Merge "Revert "Revert "Convert BT preference to use TwoTargetPreference""" into oc-dev

7 years agoWi-Fi network details page fixes.
Amin Shaikh [Fri, 7 Apr 2017 21:01:41 +0000 (14:01 -0700)]
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

7 years agoMerge "Fixes instant apps on the Opening links screen" into oc-dev
Jesse Evans [Tue, 11 Apr 2017 22:52:09 +0000 (22:52 +0000)]
Merge "Fixes instant apps on the  Opening links screen" into oc-dev
am: 15f963bed9

Change-Id: I21b6b40c9abb52c52e525000b1e5f063a1c4c475

7 years agoMerge "Fixes instant apps on the Opening links screen" into oc-dev
TreeHugger Robot [Tue, 11 Apr 2017 22:36:30 +0000 (22:36 +0000)]
Merge "Fixes instant apps on the  Opening links screen" into oc-dev

7 years agoUse correct title when opening from notification
Christine Franks [Tue, 11 Apr 2017 16:56:09 +0000 (09:56 -0700)]
Use correct title when opening from notification

Bug: 36070413
Test: tap system alert window notification, which brings up Settings
with the correct title.

Change-Id: I6f346a7336a71c046cbc58b7291a851a7537d5ac

7 years agoFix nav up button from running process details.
Fan Zhang [Tue, 11 Apr 2017 20:40:10 +0000 (13:40 -0700)]
Fix nav up button from running process details.

Change-Id: I08fbbc1dab886dd26e7d780c0fc1b50c98a0e2f8
Fix: 36667083
Test: manual

7 years agoMerge "Sort channels and groups by id" into oc-dev
Julia Reynolds [Tue, 11 Apr 2017 19:43:06 +0000 (19:43 +0000)]
Merge "Sort channels and groups by id" into oc-dev
am: 665c1ced58

Change-Id: I3878ed917d63b9454b332f714ac83054452fab31

7 years agoMerge "Add shadow to AdaptiveIconDrawables using View level shadow" into oc-dev
Hyunyoung Song [Tue, 11 Apr 2017 19:42:47 +0000 (19:42 +0000)]
Merge "Add shadow to AdaptiveIconDrawables using View level shadow" into oc-dev
am: 9234a34a80

Change-Id: I25a0968edf534242130fdfda405bb6dfb8afc24a

7 years agoRemove divider above ExpandPreference.
Andrew Sapperstein [Tue, 11 Apr 2017 01:30:21 +0000 (18:30 -0700)]
Remove divider above ExpandPreference.

Change-Id: Ib1841d99025af3f97495efd6d6186b328af33f84
Fixes: 36479214
Test: manual, visual update

7 years agoMerge "Sort channels and groups by id" into oc-dev
Julia Reynolds [Tue, 11 Apr 2017 19:18:52 +0000 (19:18 +0000)]
Merge "Sort channels and groups by id" into oc-dev

7 years agoRemove hotspot receiver from manifest.
Doris Ling [Thu, 30 Mar 2017 21:40:25 +0000 (14:40 -0700)]
Remove hotspot receiver from manifest.

The hotspot receiver if used to cancel any tethering alarm set when wifi
ap state changes. Removing it from the manifest, and only register the
receiver when we schedule the tethering alarm.

Change-Id: I97c3be6e2a374949208bbdd4ac5ccc2fabf0291a
Fix: 35968322
Test: make RunSettingsRoboTests

7 years agoDon't show vpn info box when we don't have anything useful
Fan Zhang [Tue, 11 Apr 2017 18:28:11 +0000 (11:28 -0700)]
Don't show vpn info box when we don't have anything useful

Change-Id: I12a71b38486cab8a6a188c299e90a7674926dc98
Fix: 36068109
Test: make RunSettingsRoboTests -j40

7 years agoVPN settings: better a11y voice for legacy dialog
Charles He [Tue, 11 Apr 2017 18:37:05 +0000 (19:37 +0100)]
VPN settings: better a11y voice for legacy dialog

Previously, the user input fields in the legacy VPN config dialog would
simply be read out as "edit box", "drop-down list", etc., without
reference to their corresponding labels. This is not optimal for
low-vision users.

In this CL, we add a "labelFor" attribute to the prompt TextView of each
field. The resulting input fields would instead be read out as "edit box
for username", "drop-down list for type", etc., which are much less
ambiguous than before.

Bug: 37202471
Test: make SettingsGoogle and navigate the dialog with TalkBack on
Change-Id: Id23d0563984e3de4a4a3d03a587ca130b50508fc

7 years agoFake the cache size to be 0 bytes when cleared.
Daniel Nishi [Tue, 28 Mar 2017 17:44:37 +0000 (10:44 -0700)]
Fake the cache size to be 0 bytes when cleared.

The fast track storage calculation returns a non-zero answer after
the storage has been cleared. The simplest workaround here is to
fake the size as 0 bytes in the view after cache clearing.

It will not be zero if the user exits and comes back, but this
should be fine.

MARK IT ZERO!

Change-Id: Ia012c2cf2842040d5eac3d4a72539ec7dcfb9570
Fixes: 34965659
Test: Settings Robotest
(cherry picked from commit bf1f8e9ca74736ea2d795ce918e45c972dfea52c)

7 years agoMerge "Add shadow to AdaptiveIconDrawables using View level shadow" into oc-dev
Hyunyoung Song [Tue, 11 Apr 2017 18:11:48 +0000 (18:11 +0000)]
Merge "Add shadow to AdaptiveIconDrawables using View level shadow" into oc-dev

7 years agoFix sketchy usage of new PreferenceScreen
Tony Mantler [Mon, 10 Apr 2017 22:20:59 +0000 (15:20 -0700)]
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

7 years agoMerge "Add textAlignment for preference_widget_summary" into oc-dev
Lei Yu [Tue, 11 Apr 2017 17:34:58 +0000 (17:34 +0000)]
Merge "Add textAlignment for preference_widget_summary" into oc-dev
am: 8bb9f33c6f

Change-Id: Icece4eeeeefa2da5ce0a0d9318757b1270dcfce6

7 years agoMerge "Add textAlignment for preference_widget_summary" into oc-dev
Lei Yu [Tue, 11 Apr 2017 17:10:07 +0000 (17:10 +0000)]
Merge "Add textAlignment for preference_widget_summary" into oc-dev

7 years agoRevert "Revert "Convert BT preference to use TwoTargetPreference""
Fan Zhang [Mon, 10 Apr 2017 23:26:42 +0000 (16:26 -0700)]
Revert "Revert "Convert BT preference to use TwoTargetPreference""

This reverts commit 457c3cbec2cf38a671a101e9c9426b318aff1564.

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

7 years agoUpdate string char limits
Fan Zhang [Tue, 11 Apr 2017 16:27:17 +0000 (16:27 +0000)]
Update string char limits
am: d017f22372

Change-Id: Ia91e931c93a53d77a1c1ad554d60982b0c0c084a

7 years agoUpdate string char limits
Fan Zhang [Mon, 10 Apr 2017 22:42:00 +0000 (15:42 -0700)]
Update string char limits

Fix: 36852178
Fix: 36851715
Fix: 36657781
Fix: 36700992
Fix: 36650008
Fix: 36657636
Test: builds and robotests
Change-Id: I14c21b2cb37b911c14dff40343fa094d7150f201

7 years agoMerge "Add "Current screen saver" string" into oc-dev
Evan Laird [Tue, 11 Apr 2017 15:55:18 +0000 (15:55 +0000)]
Merge "Add "Current screen saver" string" into oc-dev
am: 42a1cb9e12

Change-Id: I411b6735ce8388274a120ea1a4097b1a7a618f27

7 years agoMerge "Add "Current screen saver" string" into oc-dev
TreeHugger Robot [Tue, 11 Apr 2017 15:44:29 +0000 (15:44 +0000)]
Merge "Add "Current screen saver" string" into oc-dev

7 years agoMerge "Update text for security preference." into oc-dev
Doris Ling [Tue, 11 Apr 2017 15:31:43 +0000 (15:31 +0000)]
Merge "Update text for security preference." into oc-dev
am: 74eee7838c

Change-Id: Ic09b5837c2fab9a5f11051c297f7571fe79ac7a1

7 years agoMerge "Update text for security preference." into oc-dev
Doris Ling [Tue, 11 Apr 2017 15:24:43 +0000 (15:24 +0000)]
Merge "Update text for security preference." into oc-dev

7 years agoMerge "Allow user to specify EAP-SIM under PEAP" into oc-dev
Paul Stewart [Tue, 11 Apr 2017 07:47:36 +0000 (07:47 +0000)]
Merge "Allow user to specify EAP-SIM under PEAP" into oc-dev
am: 6d7f210c0b

Change-Id: I37c91c9df8e2b8ff86cf4e11ffbc8bbbfb8ad9dd

7 years agoMerge "Allow user to specify EAP-SIM under PEAP" into oc-dev
TreeHugger Robot [Tue, 11 Apr 2017 07:22:51 +0000 (07:22 +0000)]
Merge "Allow user to specify EAP-SIM under PEAP" into oc-dev

7 years agoMerge "Remove Night Light suggestion. DO NOT MERGE" into oc-dev
Sean Stout [Tue, 11 Apr 2017 02:05:52 +0000 (02:05 +0000)]
Merge "Remove Night Light suggestion. DO NOT MERGE" into oc-dev
am: e4c73c24bc

Change-Id: I87b734b9fc79d09f6e4aa847b06311d8c92b75a2

7 years agoAdd textAlignment for preference_widget_summary
jackqdyulei [Fri, 7 Apr 2017 19:09:40 +0000 (12:09 -0700)]
Add textAlignment for preference_widget_summary

To make sure the text are aligned to the "viewEnd".

Bug: 37159537
Test: Screenshot
Change-Id: Ifab03dda6c9954d6b83ce4db0708303e0c5d32bd

7 years agoMerge "Remove Night Light suggestion. DO NOT MERGE" into oc-dev
TreeHugger Robot [Tue, 11 Apr 2017 01:24:08 +0000 (01:24 +0000)]
Merge "Remove Night Light suggestion. DO NOT MERGE" into oc-dev

7 years agoMerge "Reindex on OTA and locale change" into oc-dev
Matthew Fritze [Tue, 11 Apr 2017 00:19:36 +0000 (00:19 +0000)]
Merge "Reindex on OTA and locale change" into oc-dev
am: f84c8d3480

Change-Id: Ia8730a65d7199eefc6054954d2f0f5923dd6aad0

7 years agoMerge "Reindex on OTA and locale change" into oc-dev
TreeHugger Robot [Mon, 10 Apr 2017 23:54:54 +0000 (23:54 +0000)]
Merge "Reindex on OTA and locale change" into oc-dev

7 years agoMerge "Title is different after tapping "Memory used by apps"" am: 7d9146e10a am...
Honglu Yin [Mon, 10 Apr 2017 23:23:44 +0000 (23:23 +0000)]
Merge "Title is different after tapping "Memory used by apps"" am: 7d9146e10a am: 4604741c51
am: b9b563d243

Change-Id: Id276fbc68b12985074393454f729f950612685ed

7 years agoMerge "Title is different after tapping "Memory used by apps"" am: 7d9146e10a
Honglu Yin [Mon, 10 Apr 2017 23:22:49 +0000 (23:22 +0000)]
Merge "Title is different after tapping "Memory used by apps"" am: 7d9146e10a
am: 4604741c51

Change-Id: I1168d6d5862745210045efea402f6d0f1e85acab

7 years agoRemove Night Light suggestion. DO NOT MERGE
Sean Stout [Mon, 10 Apr 2017 22:31:25 +0000 (15:31 -0700)]
Remove Night Light suggestion. DO NOT MERGE

Test: make ROBOTEST_FILTER=SettingsSuggestionsTest RunSettingsRoboTests
Bug: 37207263
Change-Id: Ieeb660abdcbe07cb66f1ae3b6e86d8fd27a26478

7 years agoMerge "Add developer menu entry to enable Bluetooth inband ringing" am: 3d08bedba2...
Jack He [Mon, 10 Apr 2017 23:20:34 +0000 (23:20 +0000)]
Merge "Add developer menu entry to enable Bluetooth inband ringing" am: 3d08bedba2 am: 9e1e430f06
am: 336a7ccca7

Change-Id: I1a7ff476de330fbe0c0b48ce27c8dd363cd49c8f

7 years agoAdd placeholder summary to stablize app info pref height
Fan Zhang [Mon, 10 Apr 2017 23:17:33 +0000 (16:17 -0700)]
Add placeholder summary to stablize app info pref height

Change-Id: I6a62a94bb02271cdde9873745432aa829d6d4460
Fix: 36900036
Test: rebuild and existing robotests

7 years agoMerge "Add developer menu entry to enable Bluetooth inband ringing" am: 3d08bedba2
Jack He [Mon, 10 Apr 2017 23:11:42 +0000 (23:11 +0000)]
Merge "Add developer menu entry to enable Bluetooth inband ringing" am: 3d08bedba2
am: 9e1e430f06

Change-Id: I8fe93eebafb60a237bfbe1009652672e17411a3d

7 years agoMerge "Title is different after tapping "Memory used by apps""
Honglu Yin [Mon, 10 Apr 2017 23:04:57 +0000 (23:04 +0000)]
Merge "Title is different after tapping "Memory used by apps""
am: 7d9146e10a

Change-Id: I26268a618800ffacec55f26830d0d2a265efe8f8

7 years agoMerge "Add developer menu entry to enable Bluetooth inband ringing"
Jack He [Mon, 10 Apr 2017 23:00:11 +0000 (23:00 +0000)]
Merge "Add developer menu entry to enable Bluetooth inband ringing"
am: 3d08bedba2

Change-Id: I70542c676f8c738e0d846dd119a9af4ebc293175

7 years agoMerge "Title is different after tapping "Memory used by apps""
Treehugger Robot [Mon, 10 Apr 2017 22:53:07 +0000 (22:53 +0000)]
Merge "Title is different after tapping "Memory used by apps""

7 years agoMerge "Add developer menu entry to enable Bluetooth inband ringing"
Jack He [Mon, 10 Apr 2017 22:47:54 +0000 (22:47 +0000)]
Merge "Add developer menu entry to enable Bluetooth inband ringing"

7 years agoUpdate text for security preference.
Doris Ling [Mon, 10 Apr 2017 22:21:18 +0000 (15:21 -0700)]
Update text for security preference.

Swap location to screen lock in title and summary.

Bug: 37161482
Test: builds
Change-Id: Ie95f1d8c984587bf3898a431edde0868b0e17fce

7 years agoAdd shadow to AdaptiveIconDrawables using View level shadow
Hyunyoung Song [Thu, 6 Apr 2017 18:04:53 +0000 (11:04 -0700)]
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

7 years agoReindex on OTA and locale change
Matthew Fritze [Mon, 3 Apr 2017 18:35:48 +0000 (11:35 -0700)]
Reindex on OTA and locale change

When the user gets an OTA or changes language, settings
will clear the database and reindex it.

Test: make RunSettingsRoboTests
Change-Id: I379ece86b2d41d673bbbffbcf947774f3ccd4cb9
Fixes: 36859162

7 years agoMerge "Fix the intent to launch storage details." into oc-dev
Garfield Tan [Mon, 10 Apr 2017 20:41:47 +0000 (20:41 +0000)]
Merge "Fix the intent to launch storage details." into oc-dev
am: 66871d8531

Change-Id: I6b082e06a434a9d1ea098458e665c19a4975fb84

7 years agoAdd "Current screen saver" string
Evan Laird [Mon, 10 Apr 2017 20:31:06 +0000 (16:31 -0400)]
Add "Current screen saver" string

This one was missed originally.

Test: none
Bug:35031991
Change-Id: I9b1bff9a9c834c306fe03e4405950bc1ac3ac3ac

7 years agoMerge "Fix the intent to launch storage details." into oc-dev
Garfield Tan [Mon, 10 Apr 2017 20:24:19 +0000 (20:24 +0000)]
Merge "Fix the intent to launch storage details." into oc-dev

7 years agoMerge "Add user icon to the other user preferences." into oc-dev
Daniel Nishi [Mon, 10 Apr 2017 17:32:27 +0000 (17:32 +0000)]
Merge "Add user icon to the other user preferences." into oc-dev
am: b1c336de5f

Change-Id: Icce728807ace666984af3a93ef495c448cdb9e7b

7 years agoMerge "Add user icon to the other user preferences." into oc-dev
Daniel Nishi [Mon, 10 Apr 2017 17:27:24 +0000 (17:27 +0000)]
Merge "Add user icon to the other user preferences." into oc-dev

7 years agoMerge "Add log for BatteryUtils" into oc-dev
Lei Yu [Mon, 10 Apr 2017 17:13:22 +0000 (17:13 +0000)]
Merge "Add log for BatteryUtils" into oc-dev
am: 27dc9b69ac

Change-Id: I5bad76814ac4b6346c634498e0a5952f5d539f17

7 years agoMerge "Add log for BatteryUtils" into oc-dev
Lei Yu [Mon, 10 Apr 2017 17:06:44 +0000 (17:06 +0000)]
Merge "Add log for BatteryUtils" into oc-dev

7 years agoSort channels and groups by id
Julia Reynolds [Mon, 10 Apr 2017 16:47:13 +0000 (12:47 -0400)]
Sort channels and groups by id

Test: manual
Change-Id: I3949e9eb7b901bd897d848627682878937aac0c1

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Sat, 8 Apr 2017 08:19:51 +0000 (08:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 4c4f2a7c4c  -s ours

Change-Id: Ibcdcd69068104c8db306d0b5d02276fd351064e6

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Sat, 8 Apr 2017 08:06:36 +0000 (08:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

7 years agoFix the intent to launch storage details.
Garfield Tan [Sat, 8 Apr 2017 01:42:32 +0000 (18:42 -0700)]
Fix the intent to launch storage details.

Test: Manual tests & robo tests.
Bug: 37164357
Change-Id: Ia73a6286edadb9c9e1691dcc0c9e391ce2981dee

7 years agoAdd user icon to the other user preferences.
Daniel Nishi [Fri, 24 Mar 2017 19:23:27 +0000 (12:23 -0700)]
Add user icon to the other user preferences.

This icon is loaded in the background to avoid doing IO on
the main thread. Once we know there are more users and also
have the icon loaded, we add the category to the view.

Fixes: 36252572
Test: Robotest

Change-Id: Ib50287bb7ed323f22fbe407b56be1bf2fe98f121

7 years agoMerge "Extend the translation limit to 60" into oc-dev
Lei Yu [Fri, 7 Apr 2017 21:08:11 +0000 (21:08 +0000)]
Merge "Extend the translation limit to 60" into oc-dev
am: 2a3a92b513

Change-Id: Iba43130a4d300ad62e775d6167aa888b4de9a437

7 years agoMerge "Extend the translation limit to 60" into oc-dev
Lei Yu [Fri, 7 Apr 2017 21:03:15 +0000 (21:03 +0000)]
Merge "Extend the translation limit to 60" into oc-dev

7 years agoMerge "renaming/removing fingerprints should be reflected in UI immediately" into...
Kevin Chyn [Fri, 7 Apr 2017 21:01:09 +0000 (21:01 +0000)]
Merge "renaming/removing fingerprints should be reflected in UI immediately" into oc-dev
am: 78dce02079

Change-Id: I453db9fc9af0ab8f44535aa39517967e8ec9761c

7 years agoMerge "renaming/removing fingerprints should be reflected in UI immediately" into...
TreeHugger Robot [Fri, 7 Apr 2017 20:55:10 +0000 (20:55 +0000)]
Merge "renaming/removing fingerprints should be reflected in UI immediately" into oc-dev

7 years agoMerge "Add summary text to Lock screen preferences." into oc-dev
Doris Ling [Fri, 7 Apr 2017 20:07:55 +0000 (20:07 +0000)]
Merge "Add summary text to Lock screen preferences." into oc-dev
am: a258e424a2

Change-Id: I11366b87d3f3920a79096dad0dd29938da2f8a52

7 years agoMerge "Add summary text to Lock screen preferences." into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 20:03:35 +0000 (20:03 +0000)]
Merge "Add summary text to Lock screen preferences." into oc-dev

7 years agoMerge "Increase char limit for adaptive brightness text." into oc-dev
Andrew Sapperstein [Fri, 7 Apr 2017 20:02:37 +0000 (20:02 +0000)]
Merge "Increase char limit for adaptive brightness text." into oc-dev
am: a9acbd924a

Change-Id: Ie7dea50e40606b39d29247740f7fb659738684a3

7 years agoMerge "Increase char limit for adaptive brightness text." into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 19:55:53 +0000 (19:55 +0000)]
Merge "Increase char limit for adaptive brightness text." into oc-dev

7 years agoMerge "Update the automatic storage management preferences." into oc-dev
Daniel Nishi [Fri, 7 Apr 2017 19:46:05 +0000 (19:46 +0000)]
Merge "Update the automatic storage management preferences." into oc-dev
am: 7badf46542

Change-Id: Ic9311706e67f28607f17e036eee5bfa8290af82b

7 years agoMerge "Update the automatic storage management preferences." into oc-dev
Daniel Nishi [Fri, 7 Apr 2017 19:38:26 +0000 (19:38 +0000)]
Merge "Update the automatic storage management preferences." into oc-dev

7 years agorenaming/removing fingerprints should be reflected in UI immediately
Kevin Chyn [Thu, 6 Apr 2017 18:11:57 +0000 (11:11 -0700)]
renaming/removing fingerprints should be reflected in UI immediately

Fixes 30252265
Test: manual

Change-Id: I5b1bcfff6a6a9ae407db6084562d0244cc5c45c2

7 years agoAdd log for BatteryUtils
jackqdyulei [Wed, 5 Apr 2017 22:21:36 +0000 (15:21 -0700)]
Add log for BatteryUtils

This cl add logs to get more data for app usage time.

Also refactor BatteryUtils to singleton pattern because we need
to extract package name from uid.

Bug: 36909166
Test: RunSettingsRoboTests
Change-Id: I6ede354035c46e46cb856b7cf57bd1b7ccbd6d4f

7 years agoAdd summary text to Lock screen preferences.
Doris Ling [Thu, 6 Apr 2017 23:01:37 +0000 (16:01 -0700)]
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

7 years agoMerge "Remove misc data in battery main page." into oc-dev
Lei Yu [Fri, 7 Apr 2017 17:51:50 +0000 (17:51 +0000)]
Merge "Remove misc data in battery main page." into oc-dev
am: abde170529

Change-Id: I6552e8280746f53b05421b767fd92adafecdbf4f

7 years agoMerge "Remove misc data in battery main page." into oc-dev
Lei Yu [Fri, 7 Apr 2017 17:37:17 +0000 (17:37 +0000)]
Merge "Remove misc data in battery main page." into oc-dev

7 years agoExtend the translation limit to 60
jackqdyulei [Fri, 7 Apr 2017 17:29:58 +0000 (10:29 -0700)]
Extend the translation limit to 60

Bug: 36830908
Test: Build
Change-Id: Ib7664ac4e625701d928359104ef5e75d158e74ee

7 years agoAllow user to specify EAP-SIM under PEAP
Paul Stewart [Thu, 26 Jan 2017 04:54:27 +0000 (20:54 -0800)]
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

7 years agoIncrease char limit for adaptive brightness text.
Andrew Sapperstein [Thu, 6 Apr 2017 19:46:00 +0000 (12:46 -0700)]
Increase char limit for adaptive brightness text.

Change-Id: I4bab996d94812cf9a2a148ef3dc1119c5dab7a8e
Fixes: 37014409
Test: string change