OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agoRevert "Add search bar to SearchActivity."
Andrew Sapperstein [Tue, 6 Jun 2017 16:33:13 +0000 (16:33 +0000)]
Revert "Add search bar to SearchActivity."

This reverts commit fac61b71e5b32bf8cd464049c2750a18911b75b2.

Bug: 37477506
Change-Id: I1ee66999fbb28b03feb5a51c7146f31a71c1252a
Merged-In: I4a0f0c91c51ff5820b61a596520d80a3337c3466

7 years agoAdd search bar to SearchActivity.
Andrew Sapperstein [Sun, 28 May 2017 23:28:08 +0000 (16:28 -0700)]
Add search bar to SearchActivity.

Styling doesn't look exactly right yet but there's a bar.
Creates an ItemDecoration to add a spacer above the first view.

Removes the action bar and replaces it with a SearchView
inside of a CardView.

Remaining work: pixel pushing

Bug: 37477506
Test: make RunSettingsRoboTests
Change-Id: Ibf38c3c2725551bc4cd90e98d0020ec49c2eab2b
Merged-In: I4a0f0c91c51ff5820b61a596520d80a3337c3466

7 years agoInitial search bar implementation.
Andrew Sapperstein [Sun, 28 May 2017 19:20:10 +0000 (12:20 -0700)]
Initial search bar implementation.

Replaces the default Toolbar in SettingsActivity with one that looks
like a search bar. It uses a Toolbar inside a CardView with some custom
styling.

Since the search bar is a floating element, the new toolbar lives in the
content frame of the dashboard. A FrameLayout is used to provide the
layering that is desired.

Since the search bar is on top, an additional spacer view is added to
the list of items in the dashboard. Its color changes based on what
the first view is so that it always matches.

Adds android-support-v7-cardview as a dependency (and reorders the
other deps to be in alphabetical order).

Remaining work (in future CLs):
- remove search menu option?
- clean up initial window
- remove the line between the header and the first condition
       when there's a condition

Change-Id: I627b406735c8e2280ac08f44ca32f7098621a830
Merged-In: Id7477b90fbaf30eb5cac1ee244c847bddb95b3fd
Bug: 37477506
Test: make RunSettingsRoboTests

7 years agoMerge "Align settings seekbar to match other preferences" into oc-dev
Christine Franks [Fri, 26 May 2017 20:12:24 +0000 (20:12 +0000)]
Merge "Align settings seekbar to match other preferences" into oc-dev

7 years agoMerge "Fix issue for new account not being shown in work profile." into oc-dev
TreeHugger Robot [Fri, 26 May 2017 19:38:37 +0000 (19:38 +0000)]
Merge "Fix issue for new account not being shown in work profile." into oc-dev

7 years agoAlign settings seekbar to match other preferences
Christine Franks [Fri, 26 May 2017 17:24:45 +0000 (10:24 -0700)]
Align settings seekbar to match other preferences

Change preference_widget_seekbar_settings start padding to 56dp
to match the updated standard.

Bug: 62104638
Test: manual - verify layout of night display intensity and a11y
TTS sliders.

Change-Id: I3eba7e04f7e6a2a4484e89cac3526dd23275b299

7 years agoMerge "Allow some system channels to be blocked" into oc-dev
Julia Reynolds [Fri, 26 May 2017 14:39:26 +0000 (14:39 +0000)]
Merge "Allow some system channels to be blocked" into oc-dev

7 years agoMerge "Revert "Adding SecureTouchListener to DeviceAdminAdd"" into oc-dev
TreeHugger Robot [Thu, 25 May 2017 23:17:43 +0000 (23:17 +0000)]
Merge "Revert "Adding SecureTouchListener to DeviceAdminAdd"" into oc-dev

7 years agoMerge "Show setting for work profile lock screen notification" into oc-dev
TreeHugger Robot [Thu, 25 May 2017 22:41:06 +0000 (22:41 +0000)]
Merge "Show setting for work profile lock screen notification" into oc-dev

7 years agoMerge "Sort app list after smeared on screen" into oc-dev
TreeHugger Robot [Thu, 25 May 2017 22:41:00 +0000 (22:41 +0000)]
Merge "Sort app list after smeared on screen" into oc-dev

7 years agoMerge "Update notification settings to match Notification Dot branding." into oc-dev
TreeHugger Robot [Thu, 25 May 2017 20:06:27 +0000 (20:06 +0000)]
Merge "Update notification settings to match Notification Dot branding." into oc-dev

7 years agoMerge "Add NPE check for refreshUi" into oc-dev
Lei Yu [Thu, 25 May 2017 19:51:13 +0000 (19:51 +0000)]
Merge "Add NPE check for refreshUi" into oc-dev

7 years agoShow setting for work profile lock screen notification
Fan Zhang [Thu, 25 May 2017 00:24:06 +0000 (17:24 -0700)]
Show setting for work profile lock screen notification

- Add work profile notification setting to security_lockscreen_setting
- Modify the preference controller to stop hardcode preference keys.

Merged-In: I779590e34c1eca2dab5b62dda473cfa4371fc064
Change-Id: I5966d82f6373b3bf784385423b87fb4d26aecf0e
Fix: 62051309
Fix: 62045663
Test: make RunSettingsRoboTests

7 years agoAllow some system channels to be blocked
Julia Reynolds [Wed, 24 May 2017 20:20:06 +0000 (16:20 -0400)]
Allow some system channels to be blocked

Test: manual
Bug: 38428796
Change-Id: If6853f1d847ade968d2bd3a7454ddce0fdda62f0

7 years agoSort app list after smeared on screen
jackqdyulei [Tue, 23 May 2017 22:08:24 +0000 (15:08 -0700)]
Sort app list after smeared on screen

Then we could make sure the app list is sorted

Bug: 62035385
Test: RunSettingsRoboTests
Change-Id: I3fa3d6ffc5930cf011e382632143e459fdbc4369
Merged-In: I3fa3d6ffc5930cf011e382632143e459fdbc4369

7 years agoUpdate notification settings to match Notification Dot branding.
Alison Cichowlas [Wed, 24 May 2017 17:15:27 +0000 (13:15 -0400)]
Update notification settings to match Notification Dot branding.

Bug: 38387970
Test: string changes only, manually verified

Change-Id: If4086c9c89bef07a6ce0bb1d2ea4259c6369e93b

7 years agoMerge "Turn on power accounting in AOSP" into oc-dev
TreeHugger Robot [Thu, 25 May 2017 03:57:27 +0000 (03:57 +0000)]
Merge "Turn on power accounting in AOSP" into oc-dev

7 years agoMerge "Recursively remove preference from screen." into oc-dev
TreeHugger Robot [Thu, 25 May 2017 03:22:50 +0000 (03:22 +0000)]
Merge "Recursively remove preference from screen." into oc-dev

7 years agoMerge "Listener to tether state change on Network & internet page." into oc-dev
TreeHugger Robot [Thu, 25 May 2017 02:25:55 +0000 (02:25 +0000)]
Merge "Listener to tether state change on Network & internet page." into oc-dev

7 years agoAdd NPE check for refreshUi
jackqdyulei [Wed, 24 May 2017 00:01:39 +0000 (17:01 -0700)]
Add NPE check for refreshUi

The reason for NPE is that callback is registered too early, so
one callback is invoked before controller is fully inited. This
cl fix it in two ways:
1. Add NPE check in refreshUi, since this method in InstalledAppDetail
is robost to NPE
2. Move the callback to the end of constructor.

Bug: 37913054
Test: RunSettingsRoboTests
Change-Id: I54b03fb51a958a8e63bfe8a7ccfda79be1fa1956

7 years agoListener to tether state change on Network & internet page.
Doris Ling [Wed, 24 May 2017 20:24:23 +0000 (13:24 -0700)]
Listener to tether state change on Network & internet page.

User can navigates to the page and turn hotspot on or off from the quick
settings. Need to listen to the tether state updates to refresh the
summary for the Hotspot & tethering preference accordingly.

Change-Id: I7c6869b909306b09556e19cf7b7543ce9dcd890e
Fix: 38452559
Test: make RunSettingsRoboTests

7 years agoRecursively remove preference from screen.
Fan Zhang [Wed, 24 May 2017 18:19:52 +0000 (11:19 -0700)]
Recursively remove preference from screen.

The preference framework does not remove pref recursively. So when a
preference is nested in preference hierarchy, it's not safe to simply
call screen.removePreference(). We need to first find its parent and
remove pref from its parent.

Change-Id: Ic7fefa498ed71a8877d862845ddcc2d6d6034a55
Fix: 38507066
Test: make RunSettingsRoboTests

7 years agoTether screen cleanup
Fan Zhang [Thu, 4 May 2017 18:28:16 +0000 (11:28 -0700)]
Tether screen cleanup

- Add a summary placeholder reserving 2 lines for wifi tether pref
- Replace DividerPreference with regular Preference

Change-Id: I2e0c36f27abe2c17625d00d80c816b526f59a6fd
Fix: 37518463
Test: visual
(cherry picked from commit d80117dcea2ae386dea238ae760a12f8004f4b4c)

7 years agoMerge "Make "Battery usage" accessible at any time" into oc-dev
TreeHugger Robot [Wed, 24 May 2017 19:19:54 +0000 (19:19 +0000)]
Merge "Make "Battery usage" accessible at any time" into oc-dev

7 years agoMerge "Revert "Revert "Replace dynamic summary text for SettingPref""" into oc-dev
TreeHugger Robot [Wed, 24 May 2017 17:12:34 +0000 (17:12 +0000)]
Merge "Revert "Revert "Replace dynamic summary text for SettingPref""" into oc-dev

7 years agoMake "Battery usage" accessible at any time
jackqdyulei [Mon, 22 May 2017 22:40:19 +0000 (15:40 -0700)]
Make "Battery usage" accessible at any time

Before this cl, user could go to "Battery usage" page only if
related app has battery usage. This cl breaks this rule so we
could open "Battery usage" without battery data.

Bug: 38497822
Test: RunSettingsRoboTests
Merged-In: Ic53c33b7dcbac82de58f31cf96e0bd8fa54e53ea
Change-Id: Ic53c33b7dcbac82de58f31cf96e0bd8fa54e53ea

7 years agoMerge "Show app battery usage in correct user" into oc-dev
TreeHugger Robot [Wed, 24 May 2017 10:49:11 +0000 (10:49 +0000)]
Merge "Show app battery usage in correct user" into oc-dev

7 years agoMerge "Split loading process for battery header" into oc-dev
TreeHugger Robot [Wed, 24 May 2017 01:22:23 +0000 (01:22 +0000)]
Merge "Split loading process for battery header" into oc-dev

7 years agoMerge "Update the strings for "show all apps"" into oc-dev
TreeHugger Robot [Wed, 24 May 2017 00:49:48 +0000 (00:49 +0000)]
Merge "Update the strings for "show all apps"" into oc-dev

7 years agoRevert "Adding SecureTouchListener to DeviceAdminAdd"
Suprabh Shukla [Wed, 24 May 2017 00:03:37 +0000 (00:03 +0000)]
Revert "Adding SecureTouchListener to DeviceAdminAdd"

This reverts commit c1f10cb9c6f4188b2b6b95fa35b8c2a584ff55cb.

Bug: 35056974,
     38306660
Change-Id: I42b8e60f05f57aad1d8851268a6b40dd295d219b

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Wed, 24 May 2017 00:10:58 +0000 (00:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

7 years agoSplit loading process for battery header
jackqdyulei [Fri, 19 May 2017 20:29:09 +0000 (13:29 -0700)]
Split loading process for battery header

This cl creates BatteryHeaderPreferenceController, which will first
load the battery level in ui thread(in displayPreference()), then
display the remaining time once we get the battery stats.

This is the best we can do to avoid ui flashing while removing the
animation

Bug: 38349587
Test: RunSettingsRoboTests

Merged-In: Ic3622bb73562ba42e69b37e5674a724c03c45f12
Change-Id: Ic3622bb73562ba42e69b37e5674a724c03c45f12

7 years agoTurn on power accounting in AOSP
jackqdyulei [Tue, 23 May 2017 22:35:54 +0000 (15:35 -0700)]
Turn on power accounting in AOSP

Bug: 38328724
Test: RunSettingsRoboTests
Change-Id: Ibb2691ffdf8581549a1e99f94a8dbaa849453742

7 years agoUpdate the strings for "show all apps"
jackqdyulei [Tue, 23 May 2017 21:30:47 +0000 (14:30 -0700)]
Update the strings for "show all apps"

Bug: 38328724
Test: Screenshot
Change-Id: If48ff26f691795dcf206346af6a9a0be62bbf733

7 years agoMerge "Remove duplicates in Security Settings" into oc-dev
TreeHugger Robot [Tue, 23 May 2017 22:13:37 +0000 (22:13 +0000)]
Merge "Remove duplicates in Security Settings" into oc-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 23 May 2017 22:05:15 +0000 (15:05 -0700)]
Import translations. DO NOT MERGE

Change-Id: I82f35157c3d1396be572d690b559ebfb6fa9910f
Auto-generated-cl: translation import

7 years agoRevert "Revert "Replace dynamic summary text for SettingPref""
Matthew Fritze [Tue, 23 May 2017 21:02:57 +0000 (21:02 +0000)]
Revert "Revert "Replace dynamic summary text for SettingPref""

This reverts commit 8061aaef621b38e269eaa34c0cfef48a9b7eb288.
Test: make RunSettingsRoboTests
Fixes: 36101902
Change-Id: Ide74780153fc7f36d897f559c7a3c138190e3320

7 years agoMerge "Refactored ConfirmationDialogFragment to use default construcutor." into oc-dev
TreeHugger Robot [Tue, 23 May 2017 20:44:08 +0000 (20:44 +0000)]
Merge "Refactored ConfirmationDialogFragment to use default construcutor." into oc-dev

7 years agoRemove duplicates in Security Settings
Matthew Fritze [Thu, 11 May 2017 18:56:27 +0000 (11:56 -0700)]
Remove duplicates in Security Settings

Duplicates:
- Location
- Scanning
- Encryption and Credentials
- Screen Pinning
- Device Admin Apps

Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: Id06b6d9e82769abfa31a0c3e9900bcebdbd0c13c
Merged-In: I91566b8fb7fdb3b39c8833a6fa8e52bbbf6507b6

7 years agoMerge "Fix storage summary background colors." into oc-dev
Daniel Nishi [Tue, 23 May 2017 17:35:14 +0000 (17:35 +0000)]
Merge "Fix storage summary background colors." into oc-dev

7 years agoRefactored ConfirmationDialogFragment to use default construcutor.
Felipe Leme [Thu, 18 May 2017 21:32:13 +0000 (14:32 -0700)]
Refactored ConfirmationDialogFragment to use default construcutor.

Test: manual verification
Test: make RunSettingsRoboTests -j90

Fixes: 38397850

Change-Id: Ie724e7e92a6a34d4db16e4406bf821f00d98d180

7 years agoMerge "Developer setting to enable notification channel warnings" into oc-dev
TreeHugger Robot [Tue, 23 May 2017 15:18:06 +0000 (15:18 +0000)]
Merge "Developer setting to enable notification channel warnings" into oc-dev

7 years agoShow app battery usage in correct user
Tony Mak [Mon, 22 May 2017 13:22:57 +0000 (14:22 +0100)]
Show app battery usage in correct user

Test: m -j RunSettingsRoboTests

Change-Id: I6c0f74b79468ee670f642edb0a50400c030d1925

Merged-In: I6c0f74b79468ee670f642edb0a50400c030d1925

Fix: 38447829

7 years agoMerge "Use BatteryStatsLoader in InstalledAppDetails" into oc-dev
Lei Yu [Tue, 23 May 2017 06:16:43 +0000 (06:16 +0000)]
Merge "Use BatteryStatsLoader in InstalledAppDetails" into oc-dev

7 years agoMerge "Revert "Add animation for battery asyncLoader."" into oc-dev
TreeHugger Robot [Tue, 23 May 2017 01:49:22 +0000 (01:49 +0000)]
Merge "Revert "Add animation for battery asyncLoader."" into oc-dev

7 years agoUse BatteryStatsLoader in InstalledAppDetails
jackqdyulei [Mon, 22 May 2017 21:23:37 +0000 (14:23 -0700)]
Use BatteryStatsLoader in InstalledAppDetails

InstalledAppDetails uses AsyncTask to update foreground mBatteryStatsHelper
in background thread, which is dangerous. This cl make
InstalledAppDetails use BatteryStatsLoader to update batteryStatsHelper
and only assign it once in UI thread.

Bug: 38497555
Test: RunSettingsRoboTests
Change-Id: I3078b60a2dae36995ae5f925b4d49e36e79bddfd

7 years agoRevert "Add animation for battery asyncLoader."
Lei Yu [Fri, 19 May 2017 17:47:44 +0000 (17:47 +0000)]
Revert "Add animation for battery asyncLoader."

This reverts commit a3c528f64db7aa96c258bdc2f6dad0a8d6897461.

Test: Build
Change-Id: Ib50221873e39dee40c5cf8e4b41dcf7aa13f6134
Merged-In: Ib50221873e39dee40c5cf8e4b41dcf7aa13f6134

7 years agoMerge "Queue events if enrollment sidecar listener is null" into oc-dev
TreeHugger Robot [Mon, 22 May 2017 22:40:41 +0000 (22:40 +0000)]
Merge "Queue events if enrollment sidecar listener is null" into oc-dev

7 years agoQueue events if enrollment sidecar listener is null
Kevin Chyn [Sat, 20 May 2017 01:01:18 +0000 (18:01 -0700)]
Queue events if enrollment sidecar listener is null

Fixes: 38102355

Test: manual
Change-Id: I98bd347ee98117f7489376abd94d276d20e7b762

7 years agoDeveloper setting to enable notification channel warnings
Geoffrey Pitsch [Thu, 11 May 2017 16:58:23 +0000 (12:58 -0400)]
Developer setting to enable notification channel warnings

Defaults to enabled for debuggable builds

Fixes: 37945054
Fixes: 38380608
Test: manual
Change-Id: I5d2101feffa7cf4433264eefc82b1b80f294d9f0

7 years agoMerge "Settings: Convert notifications to use NotificationChannel (2/2)" into oc-dev
TreeHugger Robot [Sat, 20 May 2017 01:33:36 +0000 (01:33 +0000)]
Merge "Settings: Convert notifications to use NotificationChannel (2/2)" into oc-dev

7 years agoMerge "Fix settings crash due to enrolling error" into oc-dev
TreeHugger Robot [Fri, 19 May 2017 23:56:11 +0000 (23:56 +0000)]
Merge "Fix settings crash due to enrolling error" into oc-dev

7 years agoSettings: Convert notifications to use NotificationChannel (2/2)
Hemant Gupta [Tue, 16 May 2017 09:57:33 +0000 (15:27 +0530)]
Settings: Convert notifications to use NotificationChannel (2/2)

Test Setup:
===========
HW DUT: Pixel O
Remote: MecApp (PBAP Client, MAP Client, SAP Client)

Steps:
=====
1. Enable BT on DUT and bond with Remote.
2. Connect from MecApp for PBAP, MAP, SAP and observe if
   connection goes through fine.

Reproducibility:
===============
5/5

Observation:
============
MAP, PBAP and SAP cannot be connected.

Root cause:
In Android O, notifications are hidden by default.
This must be changed to use notification channels so that the
priority of the notifications can be updated.

Test: PBAP/MAP/SAP connection works fine with MecApp.

Bug: 38331825
Change-Id: I51de0ea303037bf88773352d99f092673acda2e3
(cherry picked from commit bd9f532013f0397879101f68f21ac8841fec344b)

7 years agoFix settings crash due to enrolling error
Kevin Chyn [Fri, 19 May 2017 19:22:44 +0000 (12:22 -0700)]
Fix settings crash due to enrolling error

Test: There's a condition where FP enrollment fails and a fragment
transaction/commit occurs after onSaveInstanceState. We should be
using commitAllowingStateLoss() instead of commit()

I'm not able to repro this issue but from looking at the stack
trace this should fix the problem.

Fixes: 38432354

Change-Id: I56b9c8d2efc45e9d77f29b897280f5378c3a84a0

7 years agoMerge "Add aggregated partial wakelock time per uid" into oc-dev
Adam Bookatz [Fri, 19 May 2017 18:24:31 +0000 (18:24 +0000)]
Merge "Add aggregated partial wakelock time per uid" into oc-dev

7 years agoMerge "Raneme the wifi detail "Sign into network" button to "Sign in"." into oc-dev
TreeHugger Robot [Fri, 19 May 2017 03:01:27 +0000 (03:01 +0000)]
Merge "Raneme the wifi detail "Sign into network" button to "Sign in"." into oc-dev

7 years agoMerge "Remove Language and Input duplicates" into oc-dev
TreeHugger Robot [Fri, 19 May 2017 00:41:02 +0000 (00:41 +0000)]
Merge "Remove Language and Input duplicates" into oc-dev

7 years agoMerge "Make Storage settings title be "Storage"." into oc-dev
Daniel Nishi [Thu, 18 May 2017 21:57:21 +0000 (21:57 +0000)]
Merge "Make Storage settings title be "Storage"." into oc-dev

7 years agoMerge "Log preference change as count (in addition to action)" into oc-dev
TreeHugger Robot [Thu, 18 May 2017 20:29:10 +0000 (20:29 +0000)]
Merge "Log preference change as count (in addition to action)" into oc-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Thu, 18 May 2017 20:05:19 +0000 (20:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

7 years agoMerge "Show wifi and bluetooth item in battery settings" into oc-dev
TreeHugger Robot [Thu, 18 May 2017 19:13:33 +0000 (19:13 +0000)]
Merge "Show wifi and bluetooth item in battery settings" into oc-dev

7 years agoMerge "Add screen usage string for battery settings" into oc-dev
TreeHugger Robot [Thu, 18 May 2017 19:10:15 +0000 (19:10 +0000)]
Merge "Add screen usage string for battery settings" into oc-dev

7 years agoFix storage summary background colors.
Daniel Nishi [Tue, 9 May 2017 17:56:58 +0000 (10:56 -0700)]
Fix storage summary background colors.

This changes the donut background color to a lighter blue and changes
the overall background to be a grey. Both of these colors match the
Battery implementation.

Bug: 35245772
Test: Manual
Change-Id: I8e12afe4434a0e2428384fc496cab5c05dc998ee

7 years agoMake Storage settings title be "Storage".
Daniel Nishi [Mon, 15 May 2017 18:30:16 +0000 (11:30 -0700)]
Make Storage settings title be "Storage".

This more closely reflects the idea that the top level setting title
should match the actual screen title.

Change-Id: Ie7ab1756d799c182cad74041995768037bba710f
Fixes: 37923462
Test: Manual

7 years agoRemove Language and Input duplicates
Matthew Fritze [Tue, 11 Apr 2017 23:35:48 +0000 (16:35 -0700)]
Remove Language and Input duplicates

Change the keys in the Language and Input screen for the
gesture and tts-output settings so they can be disabled
in search. Then change the preference controllers to take
a key as input to avoid crashes on the other screens with
these settings.

Test: make RunSettingsRoboTests
Bug: 33701673
Change-Id: Ifeb2a2d34a3efded3f0a9ba02ac76fd6f8ffd087
Merged-In: I8bc0776131fcac5a6edf7e8271bc53252c2fc719

7 years agoMerge "Update no search results icon and move image to top of page" into oc-dev
TreeHugger Robot [Thu, 18 May 2017 17:11:28 +0000 (17:11 +0000)]
Merge "Update no search results icon and move image to top of page" into oc-dev

7 years agoMerge changes I573e4fb9,I8e7baadc into oc-dev
Lei Yu [Thu, 18 May 2017 17:00:26 +0000 (17:00 +0000)]
Merge changes I573e4fb9,I8e7baadc into oc-dev

* changes:
  Drop the misc and not smear it.
  Smear screen power usage based on activity time.

7 years agoRaneme the wifi detail "Sign into network" button to "Sign in".
Lorenzo Colitti [Thu, 18 May 2017 15:04:19 +0000 (00:04 +0900)]
Raneme the wifi detail "Sign into network" button to "Sign in".

Bug: 36656914
Test: button looks reasonable in English, Italian, Japanese, Dutch
Change-Id: Icaba16a4ef1ddfc03fc45fd1d1c64bcca9913d7c

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 18 May 2017 05:58:00 +0000 (22:58 -0700)]
Import translations. DO NOT MERGE

Change-Id: I79790dae43f96a35c56970f27acb47ba689f731e
Auto-generated-cl: translation import

7 years agoDrop the misc and not smear it.
jackqdyulei [Tue, 16 May 2017 23:39:03 +0000 (16:39 -0700)]
Drop the misc and not smear it.

Bug: 38347725
Test: RunSettingsRoboTests
Change-Id: I573e4fb945bc212505c9211d9b92f77a6a9a2739

7 years agoSmear screen power usage based on activity time.
jackqdyulei [Tue, 16 May 2017 23:09:14 +0000 (16:09 -0700)]
Smear screen power usage based on activity time.

Bug: 38328636
Test: RunSettingsRoboTests
Change-Id: I8e7baadcd88a8e9d674f5bc8d8e42e0f3953c98a

7 years agoMerge "Fix bug where accounts are duplicated in user&account list." into oc-dev
Fan Zhang [Thu, 18 May 2017 01:05:38 +0000 (01:05 +0000)]
Merge "Fix bug where accounts are duplicated in user&account list." into oc-dev

7 years agoMerge "Fix robolectric test failure" into oc-dev
Fan Zhang [Thu, 18 May 2017 00:41:17 +0000 (00:41 +0000)]
Merge "Fix robolectric test failure" into oc-dev

7 years agoLog preference change as count (in addition to action)
Fan Zhang [Thu, 18 May 2017 00:01:44 +0000 (17:01 -0700)]
Log preference change as count (in addition to action)

Bug: 38258793
Test: rerun robotests, and inspected log
Change-Id: I23fabddc1336709af424bbcb7250535833a8ada6

7 years agoFix bug where accounts are duplicated in user&account list.
Fan Zhang [Wed, 17 May 2017 19:32:59 +0000 (12:32 -0700)]
Fix bug where accounts are duplicated in user&account list.

This happens when user has different accounts with same account name. For
example: user@domain.com for type1 and same email for type2, etc. When
we refresh the account list during onResume(), the same account name
incorrectly causes the logic to think they are the same account and
updates the account list by mistake.

- Introduced a util method to generate unique key from Account object.
And set it as preference key.
- when updating preference on screen, use key to find preference instead
of the preference instance itself.

Change-Id: I0aa692cb965b7037155a746389a919cd155843da
Fix: 34035653
Test: make RunSettingsRoboTests

7 years agoMerge "TelephonyMonitor: Replace boolean decision with multiple status." into oc-dev
Youhan Wang [Wed, 17 May 2017 23:38:07 +0000 (23:38 +0000)]
Merge "TelephonyMonitor: Replace boolean decision with  multiple status." into oc-dev

7 years agoUpdate no search results icon and move image to top of page
Matthew Fritze [Fri, 12 May 2017 17:10:37 +0000 (10:10 -0700)]
Update no search results icon and move image to top of page

Change-Id: Ib57bdc49095091ff6e432be922da676806ee3e2f
Fixes: 36597112
Test: search for "aaa" and observe image

7 years agoFix robolectric test failure
Fan Zhang [Wed, 17 May 2017 22:37:03 +0000 (15:37 -0700)]
Fix robolectric test failure

Default UserManager caches instance across entire test suite, so
test becomes flakey depending on the order they are run. Using a
a ShadowUserManager without the cache ensures each test class gets
a UserManager with clean state.

Change-Id: Ia54f6a3259859add5a1e5d0101829497fb985ab1
Fix: 38393235
Test: make RunSettingsRoboTests

7 years agoAdd screen usage string for battery settings
jackqdyulei [Wed, 17 May 2017 01:38:12 +0000 (18:38 -0700)]
Add screen usage string for battery settings

In advanced battery page we still use "Used for"

Bug: 38328647
Test: Build & Screenshot
Change-Id: Ic194bfed45a76c811c431a13b5554f5bc978bca5

7 years agoMerge "Add a "Use high quality audio" option to Bluetooth A2DP device settings" into...
TreeHugger Robot [Wed, 17 May 2017 18:59:48 +0000 (18:59 +0000)]
Merge "Add a "Use high quality audio" option to Bluetooth A2DP device settings" into oc-dev

7 years agoMerge "Remove duplicates from sound settings" into oc-dev
TreeHugger Robot [Wed, 17 May 2017 18:29:53 +0000 (18:29 +0000)]
Merge "Remove duplicates from sound settings" into oc-dev

7 years agoMerge "Remove Backup and Reset duplicates from Settings search" into oc-dev
TreeHugger Robot [Wed, 17 May 2017 18:28:34 +0000 (18:28 +0000)]
Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev

7 years agoMerge "Disable managed profile version of shortcut picker." into oc-dev
TreeHugger Robot [Wed, 17 May 2017 17:38:29 +0000 (17:38 +0000)]
Merge "Disable managed profile version of shortcut picker." into oc-dev

7 years agoShow wifi and bluetooth item in battery settings
jackqdyulei [Wed, 17 May 2017 17:29:55 +0000 (10:29 -0700)]
Show wifi and bluetooth item in battery settings

Change-Id: Icc1824758908b14ad895dcc28a63a5d9c685b490
Fix: 38328856
Fix: 38328641
Test: RunSettingsRoboTests

7 years agoMerge "Remove Network Restrictions duplicate from setting search" into oc-dev
TreeHugger Robot [Wed, 17 May 2017 17:27:56 +0000 (17:27 +0000)]
Merge "Remove Network Restrictions duplicate from setting search" into oc-dev

7 years agoMerge "Remove Legal Information duplicate from Settings search" into oc-dev
TreeHugger Robot [Wed, 17 May 2017 17:17:14 +0000 (17:17 +0000)]
Merge "Remove Legal Information duplicate from Settings search" into oc-dev

7 years agoMerge "Remove default app duplicates in search" into oc-dev
TreeHugger Robot [Wed, 17 May 2017 17:08:11 +0000 (17:08 +0000)]
Merge "Remove default app duplicates in search" into oc-dev

7 years agoMerge "Remove Wallpaper duplicate from setting search" into oc-dev
TreeHugger Robot [Wed, 17 May 2017 17:06:17 +0000 (17:06 +0000)]
Merge "Remove Wallpaper duplicate from setting search" into oc-dev

7 years agoDisable managed profile version of shortcut picker.
Kenny Guy [Tue, 16 May 2017 17:54:21 +0000 (18:54 +0100)]
Disable managed profile version of shortcut picker.

Don't show managed profile version of shortcut
picker as it lunaches same activities as personal
one.

Test: manual - check badged shortcut isn't present in launcher.
Bug: 38333213
Change-Id: Iade6595255524a8dbf223a70a6c8312087258c23

7 years agoMerge "Properly remove fingerprints when removing device lock." into oc-dev
Charles He [Wed, 17 May 2017 12:58:15 +0000 (12:58 +0000)]
Merge "Properly remove fingerprints when removing device lock." into oc-dev

7 years agoMerge "Revert "Replace dynamic summary text for SettingPref"" into oc-dev
TreeHugger Robot [Wed, 17 May 2017 04:34:00 +0000 (04:34 +0000)]
Merge "Revert "Replace dynamic summary text for SettingPref"" into oc-dev

7 years agoRevert "Replace dynamic summary text for SettingPref"
Matthew Fritze [Wed, 17 May 2017 02:48:24 +0000 (02:48 +0000)]
Revert "Replace dynamic summary text for SettingPref"

This reverts commit 03dfa50996d8365eb600b52999c78fec489cd371.

Change-Id: I1f7188b35ad657f3d9721bab3bbdec697d3c1ae3
Bug: 36101902
Fixes: 38352100

7 years agoTelephonyMonitor: Replace boolean decision with multiple status.
Youhan Wang [Wed, 10 May 2017 20:50:28 +0000 (13:50 -0700)]
TelephonyMonitor: Replace boolean decision with  multiple status.

Test: make ROBOTEST_FILTER=TelephonyMonitorPreferenceControllerTest
RunSettingsRoboTests -j40

Use enable, disable, user_enable, user_disable four statuses to
replace the old boolean value,

Bug:36704500
Change-Id: I5d3fd36aecaf36bb6969a6f6354c85bb162a0293

7 years agoFix issue for new account not being shown in work profile.
Doris Ling [Wed, 17 May 2017 00:23:55 +0000 (17:23 -0700)]
Fix issue for new account not being shown in work profile.

When refreshing the UI, we tried to only create profile data for new
profile, and skip the initialization for existing profiles. However,
the authentication helper will not get the updated account list, since
the account update listener is being paused. Re-create the
authentication helper to get the latest list of enabled accounts.

Change-Id: Ie29699456e5b32747e8158d51382afaa2c0c5908
Fix: 38302246
Test: make RunSettingsRoboTests

7 years agoRemove duplicates from sound settings
Matthew Fritze [Thu, 11 May 2017 23:35:11 +0000 (16:35 -0700)]
Remove duplicates from sound settings

Duplicates include:
- Do not disturb preferences
- Block Visual Disturbances
- Emergency broadcasts

Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I3de430b80fd11d7937d3bec908fbbaa6a176e785

7 years agoRemove Backup and Reset duplicates from Settings search
Matthew Fritze [Thu, 11 May 2017 19:39:32 +0000 (12:39 -0700)]
Remove Backup and Reset duplicates from Settings search

Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I3539f9581939255d94ccf04134278414fbe9c72b

7 years agoProperly remove fingerprints when removing device lock.
Charles He [Thu, 11 May 2017 18:51:46 +0000 (19:51 +0100)]
Properly remove fingerprints when removing device lock.

When strong auth (PIN, password, or pattern) is removed from a user,
fingerprints enrolled for that user should also be removed. Then, if the
user has a work profile guarded by a unified work challenge, the work
profile's fingerprints should also be removed.

Previously, when removing the fingerprints of the current user,
ChooseLockGeneric checked the finger id of the onRemovalSucceeded() and
onRemovalError() callbacks, and assumed the removal had completed when
the id was 0. Only after this would it initiate the removal of work
profile fingerprints, if any.

However, the finger id is actually non-zero even for the user's last
fingerprint. This means the work profile fingerprints (under unified
challenge) were never removed. Another more visible symptom was that
when the user removed the device lock by choosing "None" or "Swipe" in
ChooseLockGeneric, the activity failed to exit, since finish() is called
only at the end of the removal flow which was not executed.

In this CL, we check the number of remaining fingerprints instead of
relying on the finger id, thus allowing the removal flow to complete and
the activity to finish().

Bug: 37938345
Test: manual, both with and without work profile
Test: make SettingsRoboTests
Change-Id: Ic04fd01177ad6d4a061023a4b6889af585f8f2b7

7 years agoRemove Legal Information duplicate from Settings search
Matthew Fritze [Fri, 12 May 2017 00:15:45 +0000 (17:15 -0700)]
Remove Legal Information duplicate from Settings search

Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: Icee65b7a683ad80cd587e22a575b4abc4b009d8f

7 years agoMerge "Remove Special App Access duplicate from Setting search" into oc-dev
TreeHugger Robot [Tue, 16 May 2017 22:37:21 +0000 (22:37 +0000)]
Merge "Remove Special App Access duplicate from Setting search" into oc-dev

7 years agoMerge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791...
Steven Ng [Tue, 16 May 2017 21:36:53 +0000 (21:36 +0000)]
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791 am: e05ef08a8e  -s ours
am: 6496c3757b  -s ours

Change-Id: I2c58871339e8d2591afe38d58b2ec26b66f917b5