OSDN Git Service

android-x86/packages-apps-Settings.git
7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev am: 6b1ff7073a -s ours
Bill Yi [Fri, 23 Jun 2017 12:48:51 +0000 (12:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am: 6b1ff7073a  -s ours
am: 5386943cf2  -s ours

Change-Id: Ib26efa4af930a2e9aa369e3afc1ec7cc57c065ab

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Fri, 23 Jun 2017 12:29:05 +0000 (12:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 6b1ff7073a  -s ours

Change-Id: Ic3856a964218fae0861218de0ca46f3d50820e5f

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Fri, 23 Jun 2017 12:23:14 +0000 (12:23 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 23 Jun 2017 08:39:20 +0000 (01:39 -0700)]
Import translations. DO NOT MERGE

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

7 years agoMerge "Count cache in storage categories. am: b22b85b593 am: b57a71fe08" into oc...
Android Build Merger (Role) [Fri, 23 Jun 2017 04:30:14 +0000 (04:30 +0000)]
Merge "Count cache in storage categories. am: b22b85b593 am: b57a71fe08" into oc-dr1-dev-plus-aosp

7 years agoCount cache in storage categories. am: b22b85b593
Daniel Nishi [Fri, 23 Jun 2017 04:28:49 +0000 (04:28 +0000)]
Count cache in storage categories. am: b22b85b593
am: 5837a9b98b

Change-Id: If5107df5ea57dc782e76cd6444f38c9feaff037f

7 years agoCount cache in storage categories. am: b22b85b593
Daniel Nishi [Fri, 23 Jun 2017 04:28:43 +0000 (04:28 +0000)]
Count cache in storage categories. am: b22b85b593
am: b57a71fe08

Change-Id: Id280446eddddafbd7445a11ad42d1f66320b9128

7 years agoCount cache in storage categories.
Daniel Nishi [Fri, 23 Jun 2017 04:19:19 +0000 (04:19 +0000)]
Count cache in storage categories.
am: b22b85b593

Change-Id: I85b6ce492c34f67215dcb8539e7b88b02a9ef2fa

7 years agoCount cache in storage categories.
Daniel Nishi [Fri, 23 Jun 2017 04:19:16 +0000 (04:19 +0000)]
Count cache in storage categories.
am: b22b85b593

Change-Id: Idf44c0cd337cbd9aefc12dce8adecf97b4dc2d99

7 years agoCount cache in storage categories.
Daniel Nishi [Fri, 23 Jun 2017 00:09:59 +0000 (17:09 -0700)]
Count cache in storage categories.

This makes the System size more consistent because cache is not
attributed to the system (when the cache is under quota).

Change-Id: I680e70daf5e98b9a205023a218dfd1dcc8ee8334
Fixes: 62623731
Test: Settings Unit Test

7 years agoMerge "Load regulatory info from /data/misc" into oc-dr1-dev
Fan Zhang [Fri, 23 Jun 2017 01:43:15 +0000 (01:43 +0000)]
Merge "Load regulatory info from /data/misc" into oc-dr1-dev
am: f964e8c3b2

Change-Id: I39d82c1332362c2e4f90c793a9c5ef44d297353a

7 years agoMerge "Load regulatory info from /data/misc" into oc-dr1-dev
TreeHugger Robot [Fri, 23 Jun 2017 01:37:45 +0000 (01:37 +0000)]
Merge "Load regulatory info from /data/misc" into oc-dr1-dev

7 years agoMerge "Bluetooth: Make notifications local-only am: 1138397336 am: 493a76e087" into...
Android Build Merger (Role) [Fri, 23 Jun 2017 00:27:26 +0000 (00:27 +0000)]
Merge "Bluetooth: Make notifications local-only am: 1138397336 am: 493a76e087" into oc-dr1-dev-plus-aosp

7 years agoBluetooth: Make notifications local-only am: 1138397336
Marie Janssen [Fri, 23 Jun 2017 00:26:59 +0000 (00:26 +0000)]
Bluetooth: Make notifications local-only am: 1138397336
am: 493a76e087

Change-Id: Ife7f54253c73bdff35a8ee988d51be8bd4c7ebe1

7 years agoBluetooth: Make notifications local-only am: 1138397336
Marie Janssen [Fri, 23 Jun 2017 00:26:53 +0000 (00:26 +0000)]
Bluetooth: Make notifications local-only am: 1138397336
am: 0efa2b3427

Change-Id: I2b308d2646693280cb6e0f69106e94b481c526e3

7 years agoBluetooth: Make notifications local-only
Marie Janssen [Fri, 23 Jun 2017 00:22:24 +0000 (00:22 +0000)]
Bluetooth: Make notifications local-only
am: 1138397336

Change-Id: I26d09208b0425e5cdfb8317c7aa782ad0ef1fe5d

7 years agoBluetooth: Make notifications local-only
Marie Janssen [Fri, 23 Jun 2017 00:22:23 +0000 (00:22 +0000)]
Bluetooth: Make notifications local-only
am: 1138397336

Change-Id: Id287a1ba31898da57385a8e72cacbe03d7b78946

7 years agoMerge "Tint suggestion icons" into oc-dr1-dev
Maurice Lam [Thu, 22 Jun 2017 21:44:22 +0000 (21:44 +0000)]
Merge "Tint suggestion icons" into oc-dr1-dev
am: c1ab582fae

Change-Id: I8ad6d1c3ccd3c759981472cb7119dbb50dc90e99

7 years agoMerge "Tint suggestion icons" into oc-dr1-dev
TreeHugger Robot [Thu, 22 Jun 2017 21:33:39 +0000 (21:33 +0000)]
Merge "Tint suggestion icons" into oc-dr1-dev

7 years agoLoad regulatory info from /data/misc
Fan Zhang [Tue, 20 Jun 2017 21:53:49 +0000 (14:53 -0700)]
Load regulatory info from /data/misc

Bug: 62837579
Test: settings test
Change-Id: I84ef037174a1839993d02e8cd46d159398be1ddc

7 years agoMerge "Create add more fingerprint suggestion for setup" into oc-dr1-dev
Maurice Lam [Thu, 22 Jun 2017 20:02:48 +0000 (20:02 +0000)]
Merge "Create add more fingerprint suggestion for setup" into oc-dr1-dev
am: cf3130338c

Change-Id: I5ee371963f73c8f645618a12949f545c2f88ca82

7 years agoMerge "Create add more fingerprint suggestion for setup" into oc-dr1-dev
TreeHugger Robot [Thu, 22 Jun 2017 19:58:49 +0000 (19:58 +0000)]
Merge "Create add more fingerprint suggestion for setup" into oc-dr1-dev

7 years agoMerge "Update CHAR LIMIT for fingerprint dialog" into oc-dr1-dev
Maurice Lam [Thu, 22 Jun 2017 19:58:02 +0000 (19:58 +0000)]
Merge "Update CHAR LIMIT for fingerprint dialog" into oc-dr1-dev
am: e1eae4f05f

Change-Id: I4ef2d7373d80c95c1df60ee8af9dcae2e3ac61b6

7 years agoMerge "Update summary for Recent Apps." into oc-dr1-dev
Doris Ling [Thu, 22 Jun 2017 19:57:20 +0000 (19:57 +0000)]
Merge "Update summary for Recent Apps." into oc-dr1-dev
am: d7fc071f48

Change-Id: I076f239380ffd7883e1907d1f409d47127483cdc

7 years agoMerge "Update CHAR LIMIT for fingerprint dialog" into oc-dr1-dev
Maurice Lam [Thu, 22 Jun 2017 19:48:10 +0000 (19:48 +0000)]
Merge "Update CHAR LIMIT for fingerprint dialog" into oc-dr1-dev

7 years agoMerge "Update summary for Recent Apps." into oc-dr1-dev
TreeHugger Robot [Thu, 22 Jun 2017 19:39:08 +0000 (19:39 +0000)]
Merge "Update summary for Recent Apps." into oc-dr1-dev

7 years agoMerge "Fix BatteryInfo using enhanced estimate for charge time" into oc-dr1-dev
Salvador Martinez [Thu, 22 Jun 2017 18:47:11 +0000 (18:47 +0000)]
Merge "Fix BatteryInfo using enhanced estimate for charge time" into oc-dr1-dev
am: ed66c5fcdf

Change-Id: I54f1e94106a2ac984a7f736706e4c70b5db9b584

7 years agoMerge "Fix BatteryInfo using enhanced estimate for charge time" into oc-dr1-dev
TreeHugger Robot [Thu, 22 Jun 2017 18:42:14 +0000 (18:42 +0000)]
Merge "Fix BatteryInfo using enhanced estimate for charge time" into oc-dr1-dev

7 years agoTint suggestion icons
Maurice Lam [Fri, 9 Jun 2017 23:14:36 +0000 (16:14 -0700)]
Tint suggestion icons

If the suggestion is marked as isIconTintable, tint the icon with
colorControlNormal.

Test: cd tests/robotests && mma
Bug: 62258845
Change-Id: I2a76181d9b8b4d9fbf496a8fc605cb762bba87c0

7 years agoFix BatteryInfo using enhanced estimate for charge time
Salvador Martinez [Mon, 19 Jun 2017 23:04:17 +0000 (16:04 -0700)]
Fix BatteryInfo using enhanced estimate for charge time

Due to a typo in BatteryEstimates the enhanced estimate we use
for discharging would also be used for charging. This CL corrects
the typo and adds a simple test to catch a similar mistake in the
future. We were also always loading the enhanced estimate even when
we were not using it. As a ~*bonus*~ it should also help improve
the speed of the charging use case for this screen and fixes an
issue with the battery not switching to the charging icon in the
main battery page.

Test: robotest
Bug: 62738028
Bug: 62873396
Bug: 62784575
Bug: 62736144
Change-Id: Ib2cbdeea22afb7da590b701b84f526bdac243410

7 years agoBluetooth: Make notifications local-only
Marie Janssen [Fri, 16 Jun 2017 00:19:36 +0000 (17:19 -0700)]
Bluetooth: Make notifications local-only

This will prevent them from showing up on external devices where they
would be less than useful.

Test: connect to watch and pair a device
Bug: 34612389
Change-Id: I8b02c20200ce78a73967b8121cf7d5653b68f356
(cherry picked from commit 426903d155a0e9089666736e784d498e6a016845)

7 years agoMerge "Bluetooth: Make notifications local-only" am: 348a7085fa am: 620fe71520
Marie Janssen [Thu, 22 Jun 2017 15:46:01 +0000 (15:46 +0000)]
Merge "Bluetooth: Make notifications local-only" am: 348a7085fa am: 620fe71520
am: 3cc4522cbc

Change-Id: I74688eb24e40c7c1a370a9b36dec09b876047011

7 years agoMerge "Bluetooth: Make notifications local-only" am: 348a7085fa
Marie Janssen [Thu, 22 Jun 2017 15:41:55 +0000 (15:41 +0000)]
Merge "Bluetooth: Make notifications local-only" am: 348a7085fa
am: 620fe71520

Change-Id: I3df0a009c7fc6184ea1176f6953748c5031d76cd

7 years agoMerge "Bluetooth: Make notifications local-only"
Marie Janssen [Thu, 22 Jun 2017 15:37:28 +0000 (15:37 +0000)]
Merge "Bluetooth: Make notifications local-only"
am: 348a7085fa

Change-Id: I7de9c9c01f1f704399c1b594beafca5bc14ef8df

7 years agoMerge "Bluetooth: Make notifications local-only"
Treehugger Robot [Thu, 22 Jun 2017 15:31:37 +0000 (15:31 +0000)]
Merge "Bluetooth: Make notifications local-only"

7 years agoMerge "Use SettingsLib's versions of Custom* classes." into oc-dr1-dev
Juan Lang [Thu, 22 Jun 2017 14:17:37 +0000 (14:17 +0000)]
Merge "Use SettingsLib's versions of Custom* classes." into oc-dr1-dev
am: d392a9bfbb

Change-Id: I5696ba7e3fceb0ef81ea8609b573581b047bb3b7

7 years agoMerge "Use SettingsLib's versions of Custom* classes." into oc-dr1-dev
Juan Lang [Thu, 22 Jun 2017 14:05:53 +0000 (14:05 +0000)]
Merge "Use SettingsLib's versions of Custom* classes." into oc-dr1-dev

7 years agoUpdate CHAR LIMIT for fingerprint dialog
Maurice Lam [Thu, 22 Jun 2017 03:17:41 +0000 (20:17 -0700)]
Update CHAR LIMIT for fingerprint dialog

Test: Existing tests pass
Bug: 62401478
Change-Id: I6baf88007c3f61b88603f4d5c1ee52e66e9d54dc

7 years agoMerge "Refresh the dashboard UI when swiping away the only suggestion." into oc-dr1-dev
Doris Ling [Thu, 22 Jun 2017 01:40:58 +0000 (01:40 +0000)]
Merge "Refresh the dashboard UI when swiping away the only suggestion." into oc-dr1-dev
am: ee947e9a31

Change-Id: Iee52408640206b365546614e5e8e6642a0a0d96d

7 years agoMerge "Refresh the dashboard UI when swiping away the only suggestion." into oc-dr1-dev
TreeHugger Robot [Thu, 22 Jun 2017 01:33:22 +0000 (01:33 +0000)]
Merge "Refresh the dashboard UI when swiping away the only suggestion." into oc-dr1-dev

7 years agoCreate add more fingerprint suggestion for setup
Maurice Lam [Wed, 21 Jun 2017 03:00:54 +0000 (20:00 -0700)]
Create add more fingerprint suggestion for setup

Create FingerprintSuggestionActivity which is a suggestion shown in
setup to allow the user to add more fingerprints for unlocking the
device.

Test: cd tests/robotests && mma
Bug: 62638180
Change-Id: Icfab9bd2523fdeadc4cc6f0ad4f45606260c4755

7 years agoMerge "Add summary text for account sync." into oc-dr1-dev
Doris Ling [Thu, 22 Jun 2017 00:13:57 +0000 (00:13 +0000)]
Merge "Add summary text for account sync." into oc-dr1-dev
am: 053e3dcf9f

Change-Id: I833262facb7c027e26fd0507f9bd4f471a11e280

7 years agoMerge "Add summary text for account sync." into oc-dr1-dev
TreeHugger Robot [Wed, 21 Jun 2017 23:59:38 +0000 (23:59 +0000)]
Merge "Add summary text for account sync." into oc-dr1-dev

7 years agoRefresh the dashboard UI when swiping away the only suggestion.
Doris Ling [Wed, 21 Jun 2017 18:40:37 +0000 (11:40 -0700)]
Refresh the dashboard UI when swiping away the only suggestion.

In the new suggestion UI, the suggestions are listed inside the
suggestion container instead of individual dashboard items. When there
is only a single suggestion shown, and that is being swiped away, the
actual list for the suggestions will handle the swipe and remove that
list item from the list. However, the top level container will remain
until next time the dashboard list is being refreshed. Explicitly set
the suggestions to null to force refreshing of the dashboard UI.

Change-Id: I37f8c8f5a813a5c56f4f2f46103fdbb66ce97fcd
Fix: 62639824
Test: make RunSettingsRoboTests

7 years agoUse SettingsLib's versions of Custom* classes.
Juan Lang [Thu, 11 May 2017 00:26:02 +0000 (17:26 -0700)]
Use SettingsLib's versions of Custom* classes.

Bug: 30046624
Merged-In: I2584e820b72bb4672c53fd1a9f63c7f1662e0809
Test: make RunSettingsRoboTests
Change-Id: Icd4390c46532bedb3824511867208337c74c00a3

7 years agoImport translations. DO NOT MERGE am: ae5a31e55c -s ours
Bill Yi [Wed, 21 Jun 2017 20:29:57 +0000 (20:29 +0000)]
Import translations. DO NOT MERGE am: ae5a31e55c  -s ours
am: f6e125b46d  -s ours

Change-Id: I4329c03e80a2f9234e8b23a926ecb39e1a3c56bf

7 years agoImport translations. DO NOT MERGE am: ae5a31e55c -s ours
Bill Yi [Wed, 21 Jun 2017 20:26:57 +0000 (20:26 +0000)]
Import translations. DO NOT MERGE am: ae5a31e55c  -s ours
am: a3821d019a  -s ours

Change-Id: I2fdc4eb1a34ad7a16a3325cbee96d61434da5f6f

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 21 Jun 2017 20:23:16 +0000 (20:23 +0000)]
Import translations. DO NOT MERGE
am: ae5a31e55c  -s ours

Change-Id: Ibd2297385f91e2bf12e90f4933c785104aa6e153

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 21 Jun 2017 20:21:34 +0000 (20:21 +0000)]
Import translations. DO NOT MERGE
am: ae5a31e55c  -s ours

Change-Id: Ic37588db9f8b69ef7fa7d69c27e717ac4f241383

7 years agoMerge "Increase char limit for "Disconnect"" into oc-dr1-dev
jackqdyulei [Wed, 21 Jun 2017 20:12:53 +0000 (20:12 +0000)]
Merge "Increase char limit for "Disconnect"" into oc-dr1-dev
am: 88163b7215

Change-Id: I79b61d5b028dbcf22d8369cef7b92463fd90b498

7 years agoAdd summary text for account sync.
Doris Ling [Wed, 21 Jun 2017 20:12:41 +0000 (13:12 -0700)]
Add summary text for account sync.

Bug: 62862167
Test: builds
Change-Id: I7e3c7e76791d9f79430b2b549d4d89a18a4e2bba

7 years agoMerge "Increase char limit for "Disconnect"" into oc-dr1-dev
TreeHugger Robot [Wed, 21 Jun 2017 19:55:50 +0000 (19:55 +0000)]
Merge "Increase char limit for "Disconnect"" into oc-dr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Wed, 21 Jun 2017 19:44:58 +0000 (19:44 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: ce043d0f98  -s ours

Change-Id: Ic700813442af82b979b645e465b2d5ac28ac4a74

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Wed, 21 Jun 2017 19:42:36 +0000 (19:42 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

7 years agoMerge "Don't accordion the progress bar out." into oc-dr1-dev
Daniel Nishi [Wed, 21 Jun 2017 18:26:22 +0000 (18:26 +0000)]
Merge "Don't accordion the progress bar out." into oc-dr1-dev
am: 648e31c283

Change-Id: If1c7ba281f0a959a9efc1e8c04b1cad8260b7020

7 years agoMerge "Don't accordion the progress bar out." into oc-dr1-dev
Daniel Nishi [Wed, 21 Jun 2017 18:21:19 +0000 (18:21 +0000)]
Merge "Don't accordion the progress bar out." into oc-dr1-dev

7 years agoIncrease char limit for "Disconnect"
jackqdyulei [Wed, 21 Jun 2017 17:28:35 +0000 (10:28 -0700)]
Increase char limit for "Disconnect"

Bug: 62374362
Test: Build
Change-Id: I3cd8c2d48c5a686c006ab76686a2f017ac9c0ddf

7 years agoMerge "Make icon in Anomaly detail page have badge." into oc-dr1-dev
Lei Yu [Wed, 21 Jun 2017 17:49:50 +0000 (17:49 +0000)]
Merge "Make icon in Anomaly detail page have badge." into oc-dr1-dev
am: 2e34b94817

Change-Id: I986039cb676054b31b41ce54ab3c9c034297721f

7 years agoMerge "Make icon in Anomaly detail page have badge." into oc-dr1-dev
Lei Yu [Wed, 21 Jun 2017 17:44:42 +0000 (17:44 +0000)]
Merge "Make icon in Anomaly detail page have badge." into oc-dr1-dev

7 years agoMerge "Block inline-results from Settings search" into oc-dr1-dev
Matthew Fritze [Wed, 21 Jun 2017 17:42:48 +0000 (17:42 +0000)]
Merge "Block inline-results from Settings search" into oc-dr1-dev
am: bea9a5d739

Change-Id: Ie9ba24744922dccedfec07a034c2374695f77214

7 years agoMerge "Block inline-results from Settings search" into oc-dr1-dev
TreeHugger Robot [Wed, 21 Jun 2017 17:26:08 +0000 (17:26 +0000)]
Merge "Block inline-results from Settings search" into oc-dr1-dev

7 years agoMerge "Add info string to advanced battery usage page" into oc-dr1-dev
Salvador Martinez [Wed, 21 Jun 2017 17:06:35 +0000 (17:06 +0000)]
Merge "Add info string to advanced battery usage page" into oc-dr1-dev
am: 94d0a9c554

Change-Id: If9b2ac97f41d55cf93dc33bbf129d56dfd9de225

7 years agoMerge "Add info string to advanced battery usage page" into oc-dr1-dev
Salvador Martinez [Wed, 21 Jun 2017 17:02:31 +0000 (17:02 +0000)]
Merge "Add info string to advanced battery usage page" into oc-dr1-dev

7 years agoMerge "Add missing 'pin' screen lock option" into oc-dr1-dev
Ajay Kumar Nadathur Sreenivasan [Wed, 21 Jun 2017 16:44:14 +0000 (16:44 +0000)]
Merge "Add missing 'pin' screen lock option" into oc-dr1-dev
am: f5b77d65b4

Change-Id: Ife35a27b745d0ea08b2580c3e41c6fdc38f3d1c4

7 years agoMerge "Add missing 'pin' screen lock option" into oc-dr1-dev
Ajay Kumar Nadathur Sreenivasan [Wed, 21 Jun 2017 16:39:49 +0000 (16:39 +0000)]
Merge "Add missing 'pin' screen lock option" into oc-dr1-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 21 Jun 2017 04:36:56 +0000 (21:36 -0700)]
Import translations. DO NOT MERGE

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

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 21 Jun 2017 04:20:19 +0000 (21:20 -0700)]
Import translations. DO NOT MERGE

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

7 years agoMerge "Use BLUETOOTH_PAIRING metric in pairing page" into oc-dr1-dev
jackqdyulei [Wed, 21 Jun 2017 03:25:43 +0000 (03:25 +0000)]
Merge "Use BLUETOOTH_PAIRING metric in pairing page" into oc-dr1-dev
am: b010eed05d

Change-Id: I10ef631d4a870ce52c4730645e2f0da10cdfd8a1

7 years agoMerge "Delay showing the loading progress spinner in Managed App." into oc-dr1-dev
Doris Ling [Wed, 21 Jun 2017 03:23:34 +0000 (03:23 +0000)]
Merge "Delay showing the loading progress spinner in Managed App." into oc-dr1-dev
am: 153e2b89b9

Change-Id: I3eaa11054beabf83765bf548a5dca6337817a546

7 years agoMerge "Use BLUETOOTH_PAIRING metric in pairing page" into oc-dr1-dev
TreeHugger Robot [Wed, 21 Jun 2017 03:16:31 +0000 (03:16 +0000)]
Merge "Use BLUETOOTH_PAIRING metric in pairing page" into oc-dr1-dev

7 years agoMerge "Delay showing the loading progress spinner in Managed App." into oc-dr1-dev
TreeHugger Robot [Wed, 21 Jun 2017 03:14:27 +0000 (03:14 +0000)]
Merge "Delay showing the loading progress spinner in Managed App." into oc-dr1-dev

7 years agoMerge "Enable Assist Gesture Settings to launch from action intent" into oc-dr1-dev
Kevin Chyn [Wed, 21 Jun 2017 03:02:36 +0000 (03:02 +0000)]
Merge "Enable Assist Gesture Settings to launch from action intent" into oc-dr1-dev
am: 58f668ef6b

Change-Id: Ie1f930d8ebf08b6b3c92da4925144c1b3a70b50e

7 years agoMerge "Enable Assist Gesture Settings to launch from action intent" into oc-dr1-dev
TreeHugger Robot [Wed, 21 Jun 2017 02:52:00 +0000 (02:52 +0000)]
Merge "Enable Assist Gesture Settings to launch from action intent" into oc-dr1-dev

7 years agoAdd info string to advanced battery usage page
Salvador Martinez [Mon, 19 Jun 2017 17:33:41 +0000 (10:33 -0700)]
Add info string to advanced battery usage page

This CL adds an FYI string under the battery graph to let users
know that their current estimate is coming from the enhanced
estimate provider when it is enabled.

Test: Robotests
Bug: 38399654
Change-Id: If5cd622ef0251a5a483cef870fc2261369e14845

7 years agoMerge "Update anomaly High usage" into oc-dr1-dev
Lei Yu [Wed, 21 Jun 2017 01:06:55 +0000 (01:06 +0000)]
Merge "Update anomaly High usage" into oc-dr1-dev
am: 50062193c4

Change-Id: I5de568b3397dc18ee800aa866b883fe33dcb3d95

7 years agoMerge "Update anomaly High usage" into oc-dr1-dev
Lei Yu [Wed, 21 Jun 2017 01:03:41 +0000 (01:03 +0000)]
Merge "Update anomaly High usage" into oc-dr1-dev

7 years agoMerge "Update footer string in battery settings" into oc-dr1-dev
Lei Yu [Wed, 21 Jun 2017 01:03:15 +0000 (01:03 +0000)]
Merge "Update footer string in battery settings" into oc-dr1-dev
am: eca713c1c2

Change-Id: Iaaa78a3742a91f7d2d4e0a2edd361589fb340a39

7 years agoMerge "Only update anomaly icon in AnomalyLoader" into oc-dr1-dev
Lei Yu [Wed, 21 Jun 2017 01:02:56 +0000 (01:02 +0000)]
Merge "Only update anomaly icon in AnomalyLoader" into oc-dr1-dev
am: 65afc6f86b

Change-Id: Ie4169d421e4c31e0e4eb780a9b1c8b3921db3fd4

7 years agoMerge "Update footer string in battery settings" into oc-dr1-dev
Lei Yu [Wed, 21 Jun 2017 00:52:06 +0000 (00:52 +0000)]
Merge "Update footer string in battery settings" into oc-dr1-dev

7 years agoMerge "Only update anomaly icon in AnomalyLoader" into oc-dr1-dev
Lei Yu [Wed, 21 Jun 2017 00:51:30 +0000 (00:51 +0000)]
Merge "Only update anomaly icon in AnomalyLoader" into oc-dr1-dev

7 years agoMerge "FingerprintSettings should handle FINGERPRINT_ERROR_LOCKOUT_PERMANENT" into...
Kevin Chyn [Tue, 20 Jun 2017 23:38:12 +0000 (23:38 +0000)]
Merge "FingerprintSettings should handle FINGERPRINT_ERROR_LOCKOUT_PERMANENT" into oc-dr1-dev
am: b4bbc52e27

Change-Id: I7d9ba9fb5b1bd75a3565963bc13b82606761970b

7 years agoMerge "FingerprintSettings should handle FINGERPRINT_ERROR_LOCKOUT_PERMANENT" into...
TreeHugger Robot [Tue, 20 Jun 2017 23:36:25 +0000 (23:36 +0000)]
Merge "FingerprintSettings should handle FINGERPRINT_ERROR_LOCKOUT_PERMANENT" into oc-dr1-dev

7 years agoMerge "Add logging when entity header buttons are clicked" into oc-dr1-dev
Fan Zhang [Tue, 20 Jun 2017 23:34:24 +0000 (23:34 +0000)]
Merge "Add logging when entity header buttons are clicked" into oc-dr1-dev
am: 58d27eef9a

Change-Id: I352415bd83dccd9f86cf9017816d5858b0afbedb

7 years agoMerge "Add logging when entity header buttons are clicked" into oc-dr1-dev
TreeHugger Robot [Tue, 20 Jun 2017 23:23:38 +0000 (23:23 +0000)]
Merge "Add logging when entity header buttons are clicked" into oc-dr1-dev

7 years agoMerge "Hide wifi and bt in battery settings" into oc-dev am: 05777a7918
jackqdyulei [Tue, 20 Jun 2017 23:11:47 +0000 (23:11 +0000)]
Merge "Hide wifi and bt in battery settings" into oc-dev am: 05777a7918
am: 7de9af3b8f

Change-Id: I7230df797ff3cc6435d9145527bc962a0df9deb3

7 years agoMerge "Hide wifi and bt in battery settings" into oc-dev am: 05777a7918
jackqdyulei [Tue, 20 Jun 2017 23:05:34 +0000 (23:05 +0000)]
Merge "Hide wifi and bt in battery settings" into oc-dev am: 05777a7918
am: 9d0d6e4fcc

Change-Id: If6960f114f3d42e95061a8e832f9b99695c2bd7f

7 years agoMerge "Hide wifi and bt in battery settings" into oc-dev
jackqdyulei [Tue, 20 Jun 2017 23:03:00 +0000 (23:03 +0000)]
Merge "Hide wifi and bt in battery settings" into oc-dev
am: 05777a7918

Change-Id: I2c12178379cfed44d6007533f420c7611038bfed

7 years agoMake icon in Anomaly detail page have badge.
jackqdyulei [Tue, 20 Jun 2017 20:17:05 +0000 (13:17 -0700)]
Make icon in Anomaly detail page have badge.

Anomaly detail page is using the correct API but wrong parameters.
This cl fix it by specifying the correct userId.

Bug: 38306392
Test: RunSettingsRoboTests

Change-Id: If593bf8a7881a9eecbaa62858492878235d88397

7 years agoMerge "Hide wifi and bt in battery settings" into oc-dev
jackqdyulei [Tue, 20 Jun 2017 22:55:47 +0000 (22:55 +0000)]
Merge "Hide wifi and bt in battery settings" into oc-dev
am: 05777a7918

Change-Id: If676ec0119bebed800727f618225fd355e9da74f

7 years agoMerge "Refine Anomaly detail page" into oc-dr1-dev
jackqdyulei [Tue, 20 Jun 2017 22:36:50 +0000 (22:36 +0000)]
Merge "Refine Anomaly detail page" into oc-dr1-dev
am: aad82fa4ee

Change-Id: I0537ea1cd0c318d7c03a3a40865dcda7ea126c6b

7 years agoMerge "Hide wifi and bt in battery settings" into oc-dev
TreeHugger Robot [Tue, 20 Jun 2017 22:35:57 +0000 (22:35 +0000)]
Merge "Hide wifi and bt in battery settings" into oc-dev

7 years agoMerge "Refine Anomaly detail page" into oc-dr1-dev
TreeHugger Robot [Tue, 20 Jun 2017 22:14:53 +0000 (22:14 +0000)]
Merge "Refine Anomaly detail page" into oc-dr1-dev

7 years agoFingerprintSettings should handle FINGERPRINT_ERROR_LOCKOUT_PERMANENT
Kevin Chyn [Tue, 20 Jun 2017 21:24:43 +0000 (14:24 -0700)]
FingerprintSettings should handle FINGERPRINT_ERROR_LOCKOUT_PERMANENT

Fixes: 62681560

Test: open fingerprint settings, use an unenrolled fingerprint to
authenticate 20 times in a row. Look at logs and it shouldn't be flooded
with fingerprint logs

Change-Id: I59051e8d3a9e040bcd894e956abcbf0497838988

7 years agoMerge "Update battery footer text" into oc-dr1-dev
Lei Yu [Tue, 20 Jun 2017 21:10:07 +0000 (21:10 +0000)]
Merge "Update battery footer text" into oc-dr1-dev
am: 2c986d9b94

Change-Id: I7f5ed8710ba55def643a6f17240d5b0adc25d9ca

7 years agoUpdate footer string in battery settings
jackqdyulei [Tue, 20 Jun 2017 21:08:29 +0000 (14:08 -0700)]
Update footer string in battery settings

Bug: 62422269
Test: Screenshot
Change-Id: I4b2e7c40c09878562c4fe2e8a3e8117be7ffc6fd

7 years agoMerge "Update battery footer text" into oc-dr1-dev
Lei Yu [Tue, 20 Jun 2017 20:58:29 +0000 (20:58 +0000)]
Merge "Update battery footer text" into oc-dr1-dev

7 years agoDon't accordion the progress bar out.
Daniel Nishi [Tue, 20 Jun 2017 20:56:04 +0000 (13:56 -0700)]
Don't accordion the progress bar out.

This stops an animation from triggering on the storage settings screen
when entering it. Because we don't load the screen until data has
loaded, we run no risk of showing an uninitialized progress bar. Thus,
we can just always show the progress bar.

Change-Id: I31814a12b9c39a33fa0fbbc4826eb4138cf09a74
Fixes: 62549522
Test: Manual

7 years agoOnly update anomaly icon in AnomalyLoader
jackqdyulei [Tue, 20 Jun 2017 00:01:47 +0000 (17:01 -0700)]
Only update anomaly icon in AnomalyLoader

Before this cl, it will re-calculate battery percentage once we get
anomaly data, which will add screen usage data twice. This cl make it
only update anomaly icon after the anomaly detection is done.

Bug: 62803379
Test: RunSettingsRoboTests
Change-Id: I2089646679e299fa948b1f3ed21f4a13a1317aa3

7 years agoHide wifi and bt in battery settings
jackqdyulei [Tue, 20 Jun 2017 20:34:51 +0000 (13:34 -0700)]
Hide wifi and bt in battery settings

Hide them in app usage list but don't smear them

Bug: 62787787
Test: RunSettingsRoboTests
Change-Id: I43c15ea8a2b32f293eb859f3fead8666e45674ef

7 years agoMerge "Read setup wizard theme from system properties" into oc-dr1-dev
Maurice Lam [Tue, 20 Jun 2017 20:07:30 +0000 (20:07 +0000)]
Merge "Read setup wizard theme from system properties" into oc-dr1-dev
am: 1fe5766e30

Change-Id: I0e8335e937342bbb1639c24cb44b25639e005b32