OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agoMerge "Add shadow and wrapper classes" into oc-mr1-dev
TreeHugger Robot [Mon, 31 Jul 2017 23:44:43 +0000 (23:44 +0000)]
Merge "Add shadow and wrapper classes" into oc-mr1-dev

6 years agoMerge "Fix DataUsageSummary non-indexable keys" into oc-mr1-dev
TreeHugger Robot [Mon, 31 Jul 2017 23:35:29 +0000 (23:35 +0000)]
Merge "Fix DataUsageSummary non-indexable keys" into oc-mr1-dev

6 years agoFix DataUsageSummary non-indexable keys
Matthew Fritze [Mon, 31 Jul 2017 16:44:57 +0000 (09:44 -0700)]
Fix DataUsageSummary non-indexable keys

Indexing in DataUsage was not conventional, since it
blocked adding XML based on current sim status rather than
indexing everything and changing non-indexabe keys.

Manual merge for: ag/2631595

Change-Id: I7bb3cdb0f11772bbaefb6c21c61eb63bd0b17c7e
Fixes: 64193449
Test: robotests

6 years agoMerge "Fixing bug in UsageGraph rendering." into oc-dr1-dev
Alex Kulesza [Mon, 31 Jul 2017 19:30:16 +0000 (19:30 +0000)]
Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev
am: 8fd9c28b7e

Change-Id: I47a18bcfc174e06964aaa3a7140ebcf5be12919c

6 years agoMerge "Fixing bug in UsageGraph rendering." into oc-dr1-dev
TreeHugger Robot [Mon, 31 Jul 2017 19:19:03 +0000 (19:19 +0000)]
Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev

6 years agoMerge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev
Fan Zhang [Mon, 31 Jul 2017 19:09:10 +0000 (19:09 +0000)]
Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev
am: 9064072ed7

Change-Id: I8aec2dc4de1ec18375ce3af177f1c9769499f8e3

6 years agoMerge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev
jackqdyulei [Mon, 31 Jul 2017 19:08:31 +0000 (19:08 +0000)]
Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev
am: d6c9a8b5b2

Change-Id: Id708356c38b10789974e35193c1d71dc0c9fdf34

6 years agoMerge "Use package from sipper if default is null" into oc-mr1-dev
TreeHugger Robot [Mon, 31 Jul 2017 18:58:22 +0000 (18:58 +0000)]
Merge "Use package from sipper if default is null" into oc-mr1-dev

6 years agoMerge "Layout tweak for app action buttons" into oc-mr1-dev
TreeHugger Robot [Mon, 31 Jul 2017 18:57:09 +0000 (18:57 +0000)]
Merge "Layout tweak for app action buttons" into oc-mr1-dev

6 years agoMerge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev
TreeHugger Robot [Mon, 31 Jul 2017 18:56:02 +0000 (18:56 +0000)]
Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev

6 years agoMerge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev
TreeHugger Robot [Mon, 31 Jul 2017 18:55:40 +0000 (18:55 +0000)]
Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev

6 years agoMerge "Change vision settings suggestion title" into oc-mr1-dev
Ajay Nadathur [Mon, 31 Jul 2017 18:19:12 +0000 (18:19 +0000)]
Merge "Change vision settings suggestion title" into oc-mr1-dev

6 years agoMerge "Align screen lock options to view start" into oc-dr1-dev
Maurice Lam [Mon, 31 Jul 2017 17:41:12 +0000 (17:41 +0000)]
Merge "Align screen lock options to view start" into oc-dr1-dev
am: 5e2e0df356

Change-Id: I38de58cc51e58c831e513a7dae13f06f3db0fce3

6 years agoMerge "Align screen lock options to view start" into oc-dr1-dev
Maurice Lam [Mon, 31 Jul 2017 17:35:07 +0000 (17:35 +0000)]
Merge "Align screen lock options to view start" into oc-dr1-dev

6 years agoMerge "Add string needed to support carrier wifi in UI." into oc-mr1-dev
Pankaj Kanwar [Mon, 31 Jul 2017 17:09:00 +0000 (17:09 +0000)]
Merge "Add string needed to support carrier wifi in UI." into oc-mr1-dev

6 years agoFixing bug in UsageGraph rendering.
Alex Kulesza [Sun, 30 Jul 2017 22:11:24 +0000 (18:11 -0400)]
Fixing bug in UsageGraph rendering.

The calculateLocalPaths() method of UsageGraph converts a set of paths
in (milliseconds, percent) coordinates into the actual pixel values that
will be used for drawing. For the most part this is a one to one
process, but not always: input points that are too closely spaced to
draw accurately are skipped. The last point in the path, however, is
never skipped, in order to ensure that the graph ends at the correct
location.

The previous implementation of this method had a bug: the y-coordinates
of points that were skipped would be stored indefinitely (in the local
variable pendingYLoc) and then added back at the very end of the path
(under the condition i == mPaths.size() - 1 && pendingYLoc !=
PATH_DELIM). Under the right conditions, this led to the strange uptick
at the end of the graph seen in the associated bug.

This CL fixes the problem and attempts to make the logic slightly
clearer. It also adds tests, one of which (_similarPointMiddle) fails
for the previous code.

In more detail, previously pendingXLoc was used to hold the last x
coordinate seen, while pendingYLoc was used to hold the last *skipped* y
coordinate, or PATH_DELIM otherwise. The difference between these was
somewhat subtle and hard to understand from a quick read of the code,
and there was a bug: pendingYLoc never got reset to PATH_DELIM even if
later points were added. In this CL I have removed the pendingLoc
variables in favor of a single lx/ly pair, which always holds the local
coordinates of the most recent point, and I added an explicit boolean
skippedLastPoint to track whether the point (lx, ly) has already been
added or was skipped.

Bug: 64065296
Test: make RunSettingsRoboTests
Change-Id: I45ccffea1280d851bfae5143c2e84d188e133731

6 years agoMerge "Update search bar's navup content description" into oc-dr1-dev
Fan Zhang [Sat, 29 Jul 2017 00:16:22 +0000 (00:16 +0000)]
Merge "Update search bar's navup content description" into oc-dr1-dev
am: b79d38f2f3

Change-Id: I774c5a2d4e456cfcb1fb4d37a5fd6373336400e5

6 years agoMerge "Update search bar's navup content description" into oc-dr1-dev
Fan Zhang [Sat, 29 Jul 2017 00:10:10 +0000 (00:10 +0000)]
Merge "Update search bar's navup content description" into oc-dr1-dev

6 years agoAdd shadow and wrapper classes
jackqdyulei [Tue, 25 Jul 2017 00:43:23 +0000 (17:43 -0700)]
Add shadow and wrapper classes

These classes are used for accessibility service. Also
add a new Availablity type.

Bug: 62022517
Test: Build
Change-Id: Ia2ff72dd04fd99b17809822907746c2411cecb62

6 years agoAdd string needed to support carrier wifi in UI.
pkanwar [Fri, 28 Jul 2017 22:56:22 +0000 (15:56 -0700)]
Add string needed to support carrier wifi in UI.

Add strings which will be used to indicate to the user in the wifi
picker and wifi config that they are connecting/connected to carrier
wifi.

Bug:30988281
Test: manual
Change-Id: I6f3b6a047bb28fddf81ed967c89fac5824d34f9f

6 years agoLayout tweak for app action buttons
Fan Zhang [Fri, 21 Jul 2017 22:06:36 +0000 (15:06 -0700)]
Layout tweak for app action buttons

Now shadow is no longer cropped when pressing button

Change-Id: I6ac8588abb75ca23912f62808a57e8402857e18b
Fixes: 62550425
Test: visual
(cherry picked from commit ee308b950f5d4bc0312ed7f439ff02f9ef065d17)

6 years agoChange vision settings suggestion title
Ajay Nadathur [Fri, 28 Jul 2017 21:24:39 +0000 (14:24 -0700)]
Change vision settings suggestion title

bug: 63867327
Test: Manually tested and verified
Change-Id: I358508534d0ef77c99851430f979b61702519313

6 years agoRemove DND and all gesture suggestions from Settings
Fan Zhang [Fri, 28 Jul 2017 21:20:23 +0000 (14:20 -0700)]
Remove DND and all gesture suggestions from Settings

Change-Id: I2f59c426132ca907e556b8bb2fbc869f4e830768
Fix: 64156274
Test: robotests

6 years agoUse package from sipper if default is null
jackqdyulei [Thu, 27 Jul 2017 21:44:58 +0000 (14:44 -0700)]
Use package from sipper if default is null

The BatteryEntry need a background thread to update the
package name and icon. However in InstalledAppDetails we
don't have this thread and it is unnecessary because we
already has the package name.

This cl:
1. Use the mPackageName from InstalledAppDetails directly in
BatteryEntry
2. Double check the defaultPackageName in AdvancedPowerUsageDetail,
use packageName from sipper if default is null

This cl is cherry picked from oc-dr to fix the test breakage.

Bug: 64127162
Test: RunSettingsRoboTests

Change-Id: I5d21afca17f177817976758c28ed86b3a10e95eb

6 years agoMerge "Turn off some anomaly detectors by default" into oc-dr1-dev
Lei Yu [Fri, 28 Jul 2017 20:49:48 +0000 (20:49 +0000)]
Merge "Turn off some anomaly detectors by default" into oc-dr1-dev
am: f940431d32

Change-Id: I1d3672b40a0de6dfe481295134a5cb9eeea91b89

6 years agoMerge "Turn off some anomaly detectors by default" into oc-dr1-dev
Lei Yu [Fri, 28 Jul 2017 20:39:57 +0000 (20:39 +0000)]
Merge "Turn off some anomaly detectors by default" into oc-dr1-dev

6 years agoCreate wrapper and shadow for AccessibilityManager
jackqdyulei [Thu, 27 Jul 2017 23:13:03 +0000 (16:13 -0700)]
Create wrapper and shadow for AccessibilityManager

This is for testing, because robolectric doesn't recognize new
API.

Bug: 62022517
Test: Build
Change-Id: I1c150d86366305eacf3245bbabdf3d3e26124c77

6 years agoMerge "Query search result intent before launching to avoid crash" into oc-dr1-dev
Fan Zhang [Fri, 28 Jul 2017 19:29:44 +0000 (19:29 +0000)]
Merge "Query search result intent before launching to avoid crash" into oc-dr1-dev
am: 9f93faf7ae

Change-Id: I596f52f4db123c3df485a1a194966771706650db

6 years agoMerge "Query search result intent before launching to avoid crash" into oc-dr1-dev
TreeHugger Robot [Fri, 28 Jul 2017 19:21:45 +0000 (19:21 +0000)]
Merge "Query search result intent before launching to avoid crash" into oc-dr1-dev

6 years agoAlign screen lock options to view start
Maurice Lam [Mon, 24 Jul 2017 23:39:00 +0000 (16:39 -0700)]
Align screen lock options to view start

Test: Manual
Bug: 63715610
Change-Id: If723a200ee402dcd7204e20e2a02cb151935d1fd

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 28 Jul 2017 18:34:04 +0000 (18:34 +0000)]
Import translations. DO NOT MERGE
am: 8432802275  -s ours

Change-Id: I6dacb50f9fe4d6ba5a44e3a1249c58afe24747de

6 years agoMerge "Fix fingerprint enrollment bug that fails during last leg" into oc-mr1-dev
Ajay Nadathur [Fri, 28 Jul 2017 17:45:22 +0000 (17:45 +0000)]
Merge "Fix fingerprint enrollment bug that fails during last leg" into oc-mr1-dev

6 years agoMerge "Update text for lock screen notifications" into oc-mr1-dev
Ajay Nadathur [Fri, 28 Jul 2017 17:45:00 +0000 (17:45 +0000)]
Merge "Update text for lock screen notifications" into oc-mr1-dev

6 years agoMerge "Remove extra steps in fingerprint flow" into oc-mr1-dev
Ajay Nadathur [Fri, 28 Jul 2017 17:44:44 +0000 (17:44 +0000)]
Merge "Remove extra steps in fingerprint flow" into oc-mr1-dev

6 years agoUpdate search bar's navup content description
Fan Zhang [Fri, 28 Jul 2017 17:22:07 +0000 (10:22 -0700)]
Update search bar's navup content description

It should read "Search settings"

Change-Id: I1a55f905949341b290ea5f224171592cf5021e31
Fix: 64140213
Test: talkback

6 years agoMerge "Fix null pointer exception when updating action bar shadow." into oc-mr1-dev
Doris Ling [Fri, 28 Jul 2017 17:03:49 +0000 (17:03 +0000)]
Merge "Fix null pointer exception when updating action bar shadow." into oc-mr1-dev

6 years agoTurn off some anomaly detectors by default
jackqdyulei [Wed, 19 Jul 2017 17:46:21 +0000 (10:46 -0700)]
Turn off some anomaly detectors by default

1. Wakeup alarm detector
   Because we cannot distinguish it between foreground and background
2. Bluetooth unoptimized scanning detector
   There is a bug in framework that may undercount the scanning time

Bug: 63390581
Bug: 63964363
Test: RunSettingsRoboTests
Change-Id: Ia762f580462823e8eddccbeb12dec3876b0ef47a

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 28 Jul 2017 10:27:50 +0000 (03:27 -0700)]
Import translations. DO NOT MERGE

Change-Id: If9cb3de5de1845431f075d5ca6c7935d49e0e6f7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 28 Jul 2017 10:08:41 +0000 (03:08 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie25fb80dbf73c1681c72adf0cfac13c319f952b7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoAdd ResultPayload for Allow notification dots
jackqdyulei [Fri, 28 Jul 2017 02:40:00 +0000 (02:40 +0000)]
Add ResultPayload for Allow notification dots
am: c50495ba06  -s ours

Change-Id: I96dd4e021bf51c330b10a9bba8901d66165cd787

6 years agoQuery search result intent before launching to avoid crash
Fan Zhang [Fri, 28 Jul 2017 00:50:41 +0000 (17:50 -0700)]
Query search result intent before launching to avoid crash

If intent cannot launch, log error.

Change-Id: Ib6f37da467749be1ef09e6665dcab122e71a52d3
Fix: 64065678
Test: robotests

6 years agoMerge "Limit the suggestions to be shown to 5." into oc-dr1-dev
Doris Ling [Thu, 27 Jul 2017 23:53:47 +0000 (23:53 +0000)]
Merge "Limit the suggestions to be shown to 5." into oc-dr1-dev
am: 70f0013e43  -s ours

Change-Id: Ic60a092e88422210572ff2ae455793165453ae73

6 years agoAdd ResultPayload for Allow notification dots
jackqdyulei [Tue, 25 Jul 2017 01:34:33 +0000 (18:34 -0700)]
Add ResultPayload for Allow notification dots

Bug: 62022517
Test: robotests
Change-Id: I86caa1c8604ae8eff27574ca45b5e9f3f6830f8f
Merged-In: I86caa1c8604ae8eff27574ca45b5e9f3f6830f8f

6 years agoMerge "Limit the suggestions to be shown to 5." into oc-dr1-dev
TreeHugger Robot [Thu, 27 Jul 2017 23:41:35 +0000 (23:41 +0000)]
Merge "Limit the suggestions to be shown to 5." into oc-dr1-dev

6 years agoMerge "Change visibility of some UsbBackend fields/methods" into oc-dr1-dev
Salvador Martinez [Thu, 27 Jul 2017 22:26:58 +0000 (22:26 +0000)]
Merge "Change visibility of some UsbBackend fields/methods" into oc-dr1-dev
am: 7f87347eb9

Change-Id: I0f300734820634009197c7b9ca85e3973d87a0cb

6 years agoMerge "Change visibility of some UsbBackend fields/methods" into oc-dr1-dev
TreeHugger Robot [Thu, 27 Jul 2017 22:16:48 +0000 (22:16 +0000)]
Merge "Change visibility of some UsbBackend fields/methods" into oc-dr1-dev

6 years agoUpdate condition tile action button text color
Fan Zhang [Thu, 27 Jul 2017 22:10:35 +0000 (22:10 +0000)]
Update condition tile action button text color
am: 951decebb4

Change-Id: Ie7d0b97ebb61654ad6ea0570ee033a7a037a2b09

6 years agoRemove extra steps in fingerprint flow
Ajay Nadathur [Thu, 27 Jul 2017 19:11:30 +0000 (12:11 -0700)]
Remove extra steps in fingerprint flow

bug: 63900851
Test: Manually tested and verified
Change-Id: Ic7ff0b21dac971edf40a9a9398aef68c2fccd971
(cherry picked from commit e24f1ab745ba29fbfc5dbc43a4f422b3916798a9)

6 years agoMerge "Limit the suggestions to be shown to 5." into oc-mr1-dev
TreeHugger Robot [Thu, 27 Jul 2017 21:14:43 +0000 (21:14 +0000)]
Merge "Limit the suggestions to be shown to 5." into oc-mr1-dev

6 years agoLimit the suggestions to be shown to 5.
Doris Ling [Wed, 26 Jul 2017 23:20:13 +0000 (16:20 -0700)]
Limit the suggestions to be shown to 5.

- when creating the dashboard data, pass the sublist of suggestions to
cap the total number of suggestions to be shown to 5.
- if user swipe away the suggestion, it will only remove the suggestion
from the suggestion adapater, and will not trigger rebuilding the whole
UI.

Change-Id: I3bbc08bb67c411ff5671a837efa40da0ac885983
Merged-In: I1efabeb2a805c670007c631d3ccb0fdfbde7b55a
Fix: 64072051
Test: make RunSettingsRoboTests

6 years agoUpdate condition tile action button text color
Fan Zhang [Thu, 27 Jul 2017 19:24:27 +0000 (12:24 -0700)]
Update condition tile action button text color

Text color needs to be darker for accessibility reasons.

Change-Id: I3ff37f36281d70dd180c0747a707b597139157c2
Fix: 64068145
Test: visual

6 years agoChange visibility of some UsbBackend fields/methods
Salvador Martinez [Tue, 25 Jul 2017 18:11:48 +0000 (11:11 -0700)]
Change visibility of some UsbBackend fields/methods

Some utility methods in UsbBackend were needed elsewhere so this CL
increases their visibility slightly rather than copying the code.

Test: Robotests still pass
Bug: 62271803
Change-Id: If8ac5494e306ac7f4f6d8eeef75f516308c78026

6 years agoMerge "Don't update the header when toggle menu" into oc-dr1-dev
jackqdyulei [Thu, 27 Jul 2017 18:21:16 +0000 (18:21 +0000)]
Merge "Don't update the header when toggle menu" into oc-dr1-dev
am: 4ab4966e7a

Change-Id: I3a814981c648d9b777d2fbf5a2d243864aaaee3c

6 years agoMerge "Don't update the header when toggle menu" into oc-dr1-dev
TreeHugger Robot [Thu, 27 Jul 2017 18:15:55 +0000 (18:15 +0000)]
Merge "Don't update the header when toggle menu" into oc-dr1-dev

6 years agoFix null pointer exception when updating action bar shadow.
Doris Ling [Thu, 27 Jul 2017 18:14:44 +0000 (11:14 -0700)]
Fix null pointer exception when updating action bar shadow.

Check for valid activity when trying to access the action bar as the
activity can become null when in monkey test.

Change-Id: I684d873b9eabb9d8461e99bb4385d411a48c0c52
Fix: 64084651
Test: make RunSettingsRoboTests

6 years agoMerge "Update suggestion ranking model coefficients." into oc-dr1-dev
Soroosh Mariooryad [Thu, 27 Jul 2017 17:54:48 +0000 (17:54 +0000)]
Merge "Update suggestion ranking model coefficients." into oc-dr1-dev
am: c3bb4cd8c0

Change-Id: Ia59839d3b952420390896d06c030905853df92e7

6 years agoMerge "Add ResultPayload for Allow notification dots" into oc-mr1-dev
TreeHugger Robot [Thu, 27 Jul 2017 17:53:54 +0000 (17:53 +0000)]
Merge "Add ResultPayload for Allow notification dots" into oc-mr1-dev

6 years agoLimit the suggestions to be shown to 5.
Doris Ling [Thu, 27 Jul 2017 17:45:30 +0000 (10:45 -0700)]
Limit the suggestions to be shown to 5.

- when creating the dashboard data, pass the sublist of suggestions to
cap the total number of suggestions to be shown to 5.
- if user swipe away the suggestion, it will only remove the suggestion
from the suggestion adapater, and will not trigger rebuilding the whole
UI.

Bug: 64072051
Change-Id: I1efabeb2a805c670007c631d3ccb0fdfbde7b55a
Fix: 63309218
Test: make RunSettingsRoboTests

6 years agoMerge "Update suggestion ranking model coefficients." into oc-dr1-dev
Soroosh Mariooryad [Thu, 27 Jul 2017 17:39:04 +0000 (17:39 +0000)]
Merge "Update suggestion ranking model coefficients." into oc-dr1-dev

6 years agoMerge "Revert string change" into oc-dr1-dev
Julia Reynolds [Thu, 27 Jul 2017 12:43:21 +0000 (12:43 +0000)]
Merge "Revert string change" into oc-dr1-dev
am: 4b8f2c9ad5

Change-Id: I7460c5c8ad88e7a504b8b246fbbf50d2757f3df6

6 years agoMerge "Revert string change" into oc-dr1-dev
TreeHugger Robot [Thu, 27 Jul 2017 12:36:55 +0000 (12:36 +0000)]
Merge "Revert string change" into oc-dr1-dev

6 years agoUpdate suggestion ranking model coefficients.
Soroosh Mariooryad [Thu, 27 Jul 2017 00:51:19 +0000 (17:51 -0700)]
Update suggestion ranking model coefficients.

- This is not a functional change and it only updates the model weights
which affects the ranking of suggestion items. The previous weights were
tuned to force the ranking to have immediate response to signal changes.
But, the current weights are tuned to maximize the user interactions
with suggestion.

Test: RunSettingsRoboTests & also manually testing suggestions
Bug: 64093782

Change-Id: I9f50ed6c4ed22d1a14110ec61156c14ba74aef64

6 years agoMerge "Add ambient notifications as inline setting." into oc-dr1-dev
Andrew Sapperstein [Thu, 27 Jul 2017 05:41:56 +0000 (05:41 +0000)]
Merge "Add ambient notifications as inline setting." into oc-dr1-dev
am: 3bd56d970d  -s ours

Change-Id: If5bdc4ddce79552eb06001f29afb550cc48ebd83

6 years agoMerge "Add ambient notifications as inline setting." into oc-dr1-dev
TreeHugger Robot [Thu, 27 Jul 2017 05:37:49 +0000 (05:37 +0000)]
Merge "Add ambient notifications as inline setting." into oc-dr1-dev

6 years agoMerge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev
Andrew Sapperstein [Thu, 27 Jul 2017 01:21:05 +0000 (01:21 +0000)]
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev
am: 7b445d59ef

Change-Id: Ibe7f73e37c446d908e8b69b2a3789c7b22f34509

6 years agoImport translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours
Bill Yi [Thu, 27 Jul 2017 01:20:25 +0000 (01:20 +0000)]
Import translations. DO NOT MERGE am: 05185952c8  -s ours am: 64ce525c6a  -s ours
am: b0126e3500  -s ours

Change-Id: Id66f31e0cb7118122723aa5f7ac87837d8075e8a

6 years agoMerge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
Matthew Fritze [Thu, 27 Jul 2017 01:20:02 +0000 (01:20 +0000)]
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
am: c2cb0d0b9e

Change-Id: I0c11d28b60492723f985c606253a0a9dc6c07595

6 years agoMerge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev
Andrew Sapperstein [Thu, 27 Jul 2017 01:01:26 +0000 (01:01 +0000)]
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev

6 years agoImport translations. DO NOT MERGE am: 05185952c8 -s ours
Bill Yi [Thu, 27 Jul 2017 00:55:57 +0000 (00:55 +0000)]
Import translations. DO NOT MERGE am: 05185952c8  -s ours
am: 64ce525c6a  -s ours

Change-Id: Idfd7931360bf1ac57a9bc7937ceb36ade0839963

6 years agoAdd ResultPayload for Allow notification dots
jackqdyulei [Tue, 25 Jul 2017 01:34:33 +0000 (18:34 -0700)]
Add ResultPayload for Allow notification dots

Bug: 62022517
Test: robotests
Change-Id: I86caa1c8604ae8eff27574ca45b5e9f3f6830f8f

6 years agoMerge "Fix gestures summary text when there is no sensor for assit." into oc-mr1-dev
TreeHugger Robot [Thu, 27 Jul 2017 00:50:10 +0000 (00:50 +0000)]
Merge "Fix gestures summary text when there is no sensor for assit." into oc-mr1-dev

6 years agoFix more config_headlineFontFamily-induced test breakages
Andrew Sapperstein [Thu, 27 Jul 2017 00:41:48 +0000 (17:41 -0700)]
Fix more config_headlineFontFamily-induced test breakages

Change-Id: Ic8a68a77e7ef8a3fd422e53e39d2fee74324c355
Fixes: 64024743
Test: robotests

6 years agoUpdate text for lock screen notifications
Ajay Nadathur [Wed, 26 Jul 2017 23:47:38 +0000 (16:47 -0700)]
Update text for lock screen notifications

bug: 62844951
Test: Manually tested
Change-Id: Ie6a85c87252f073cb6dec8f3812024cfade49e1e

6 years agoMerge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
TreeHugger Robot [Thu, 27 Jul 2017 00:31:13 +0000 (00:31 +0000)]
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev

6 years agoMerge "Set minLines for battery header text" into oc-dr1-dev
jackqdyulei [Thu, 27 Jul 2017 00:05:53 +0000 (00:05 +0000)]
Merge "Set minLines for battery header text" into oc-dr1-dev
am: 02560caa92

Change-Id: I2a4d3ed816a7bb938b5613154b8a4bc8f3114142

6 years agoMerge "Set minLines for battery header text" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 23:46:42 +0000 (23:46 +0000)]
Merge "Set minLines for battery header text" into oc-dr1-dev

6 years agoMerge "Add ambient notifications as inline setting." into oc-mr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 23:34:22 +0000 (23:34 +0000)]
Merge "Add ambient notifications as inline setting." into oc-mr1-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 23:22:33 +0000 (23:22 +0000)]
Import translations. DO NOT MERGE
am: 05185952c8  -s ours

Change-Id: I2fcf9dbc20ad0600ac924d106e5a87d49752f379

6 years agoDon't update the header when toggle menu
jackqdyulei [Wed, 26 Jul 2017 20:50:43 +0000 (13:50 -0700)]
Don't update the header when toggle menu

If we only toggle the app type in battery settings, don't update
the header. Then it won't have flicker in battery header.

Bug: 64065456
Test: RunSettingsRoboTest
Change-Id: If1cfa745f723f808ad9c5fd921be797acd3199ba

6 years agoMerge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
Ajay Nadathur [Wed, 26 Jul 2017 22:02:33 +0000 (22:02 +0000)]
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
am: f5ebc6f7ed

Change-Id: Ia91197e1d6ee74fd890887330da1eaeb932cd5cb

6 years agoMerge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
Ajay Nadathur [Wed, 26 Jul 2017 21:42:12 +0000 (21:42 +0000)]
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev

6 years agoAdd ambient notifications as inline setting.
Andrew Sapperstein [Wed, 26 Jul 2017 18:55:31 +0000 (11:55 -0700)]
Add ambient notifications as inline setting.

Bug: 62022517
Test: robotest and manual
Change-Id: I7e3faf56a1c8282017a2e84d88e7b0b788a7bfb6
Merged-In: If245f541ec3c8a1627d082b97bba9b325438cfeb

6 years agoAdd ambient notifications as inline setting.
Andrew Sapperstein [Wed, 26 Jul 2017 18:55:31 +0000 (11:55 -0700)]
Add ambient notifications as inline setting.

Bug: 62022517
Test: robotest and manual
Change-Id: If245f541ec3c8a1627d082b97bba9b325438cfeb

6 years agoChange SwipeForNotification Payload default to Off
Matthew Fritze [Wed, 26 Jul 2017 19:59:50 +0000 (12:59 -0700)]
Change SwipeForNotification Payload default to Off

Bug: 62022517
Test: make RunSettingsRoboTests
Change-Id: Icf6b1224e0857841dcb0d9dd14948d9ef39110ee

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 19:39:46 +0000 (19:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

7 years agoFix fingerprint enrollment bug that fails during last leg
Ajay Nadathur [Thu, 29 Jun 2017 23:38:30 +0000 (16:38 -0700)]
Fix fingerprint enrollment bug that fails during last leg

- Upon configuration changes during the last leg of enrollment,
  a check is required to see if maximum progress has been reached.
  If so, the next intent has to be launched.

bug: 36656476
Test: Manually tested and verified.
Change-Id: Ie4ec75cb775f83536ad0127011aabcc87c6c5ae0

7 years agoSet minLines for battery header text
jackqdyulei [Wed, 26 Jul 2017 18:24:54 +0000 (11:24 -0700)]
Set minLines for battery header text

So the header won't grow/shrink when the text changes.

Bug: 64065456
Test: Build
Change-Id: I96bb00e81d677b1efd55afbfe5f23024d6afd71b

7 years agoFix gestures summary text when there is no sensor for assit.
Doris Ling [Wed, 26 Jul 2017 18:07:19 +0000 (11:07 -0700)]
Fix gestures summary text when there is no sensor for assit.

Should exit the summary handling if sensor is not available.

Change-Id: I5918fa5ac614db48fc2c41e1de555d1ba6928bd4
Fix: 64039312
Test: make RunSettingsRoboTests

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 17:27:31 +0000 (10:27 -0700)]
Import translations. DO NOT MERGE

Change-Id: I8f49a9c6acaa689f9269aaca9f22e8b4ab4a5ae0
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Wed, 26 Jul 2017 16:46:51 +0000 (16:46 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 402abcc9df  -s ours

Change-Id: Ib6905c29f41aaea8c779f1771793da0daa2326dd

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 16:31:13 +0000 (16:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

7 years agoMerge "Allow open password dialog for wrong-password wifi access points" into oc...
Antony Sargent [Wed, 26 Jul 2017 16:18:50 +0000 (16:18 +0000)]
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev
am: 9fb7a3b8b4

Change-Id: Ic44e0cf3972085439a603e25374d46447ebe7a8f

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 15:07:49 +0000 (08:07 -0700)]
Import translations. DO NOT MERGE

Change-Id: I0dd55f8bfcdc12a551f396cdd6b84072c78bb88e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 14:32:24 +0000 (07:32 -0700)]
Import translations. DO NOT MERGE

Change-Id: If2e8b93c86f4499c112549d060696e4b272eb5ce
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoMerge "Allow open password dialog for wrong-password wifi access points" into oc...
TreeHugger Robot [Wed, 26 Jul 2017 10:53:30 +0000 (10:53 +0000)]
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev

7 years agoImport translations. DO NOT MERGE am: 8a25fb603a -s ours
Bill Yi [Wed, 26 Jul 2017 08:03:07 +0000 (08:03 +0000)]
Import translations. DO NOT MERGE am: 8a25fb603a  -s ours
am: 9d7971905c  -s ours

Change-Id: I689d34a1c300988ae315959a6d4fbb48158cffbf

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 07:59:05 +0000 (07:59 +0000)]
Import translations. DO NOT MERGE
am: 8a25fb603a  -s ours

Change-Id: If4a3775dac048d13e739174b79415cf025bd4454

7 years agoAllow open password dialog for wrong-password wifi access points
Antony Sargent [Tue, 18 Jul 2017 22:33:18 +0000 (15:33 -0700)]
Allow open password dialog for wrong-password wifi access points

When we're failing to connect to a wifi access point due to an incorrect
password, we want to allow an intent from a notification to open up the
wifi settings page and bring up the dialog for entering a different
password. We already have code in settings to do this for not-yet-saved
access points, so this CL just changes it slightly to also allow it for
saved access points.

Unfortunately WifiSettings can't be tested with Robolectric due to it
not supporting PreferenceScreen, so this adds a test to
WifiSettingsUiTest. There were some existing test failures in that file
which I've fixed while I was in there:

-The TestAccessPointBuilder class wasn't being found at runtime because
 it was getting stripped out at build time due to not being used in
 settings.

-The changingSecurityStateOnApShouldNotCauseMultipleListItems test was
 asserting that we don't end up with multiple entries for the same SSID
 in the access point list when changing the security state for the AP,
 but it was accidentally passing multiple AP's with the same name the
 first time.

Bug: 33245941
Test: runtest --path WifiSettingsUiTest.java
Change-Id: I16c9c8b0d8380a0e26f9b23df6a8d012af6a2476
Merged-In: I929ca6892242059df157c01d6e9ea30e8d1c5e78

7 years agoMerge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev
Jack He [Wed, 26 Jul 2017 06:34:30 +0000 (06:34 +0000)]
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev
am: 0c6f001c09

Change-Id: I2a161d403cf0c8e34a16b1ac9328135c40f7e50a

7 years agoMerge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 06:28:44 +0000 (06:28 +0000)]
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev