OSDN Git Service
TreeHugger Robot [Wed, 28 Jun 2017 17:53:30 +0000 (17:53 +0000)]
Merge "Hide the summary for app in PowerUsageAdvanced" into oc-dr1-dev
Lei Yu [Wed, 28 Jun 2017 17:49:36 +0000 (17:49 +0000)]
Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev
TreeHugger Robot [Wed, 28 Jun 2017 17:39:08 +0000 (17:39 +0000)]
Merge "Update string: Gesture setting title" into oc-dr1-dev
TreeHugger Robot [Wed, 28 Jun 2017 17:08:46 +0000 (17:08 +0000)]
Merge "Add quickUpdate method to BatteryHeaderPrefCtrl" into oc-dr1-dev
Fan Zhang [Wed, 28 Jun 2017 15:38:23 +0000 (08:38 -0700)]
Update string: Gesture setting title
Change-Id: Ib73e300cb4b809dcc1da594ac6f84d9d020aeac9
Fix:
36685646
Test: visual
TreeHugger Robot [Wed, 28 Jun 2017 01:41:32 +0000 (01:41 +0000)]
Merge "Fix crash when initializing Settings suggestions." into oc-dr1-dev
TreeHugger Robot [Wed, 28 Jun 2017 00:28:58 +0000 (00:28 +0000)]
Merge "Trim search query when initializing installed app searcher." into oc-dr1-dev
jackqdyulei [Tue, 27 Jun 2017 22:59:35 +0000 (15:59 -0700)]
Fix the getForegroundActivityTotalTimeMs
It should return milliseconds, not microseconds time
Bug:
63073847
Test: RunSettingsRoboTests
Change-Id: Ib7ddb947646062fc50a40d300829389e0ac401ee
Kevin Chyn [Sat, 24 Jun 2017 01:01:06 +0000 (18:01 -0700)]
Assist gesture settings should reflect assistant eligibility/preferences
Fixes:
37707753
Fixes:
62843146
Test: manual testing of settings && make -j RunSettingsRoboTests
Change-Id: I5e606686a03960e5cfe1df2f77c48d6ece9c363a
Doris Ling [Tue, 27 Jun 2017 20:56:32 +0000 (13:56 -0700)]
Fix crash when initializing Settings suggestions.
The dashboard spacer has been removed, but the remaining indexing is not
modified correspondingly, which results in mismatched dashboard types.
Set the dashboard header position back to 0.
Change-Id: I732c4ada556d5d4325e357b8325f66ded5cbe952
Fix:
63052534
Test: make RunSettingsRoboTests
jackqdyulei [Tue, 27 Jun 2017 20:49:17 +0000 (13:49 -0700)]
Hide the summary for app in PowerUsageAdvanced
Bug:
62032053
Test: RunSettingsRoboTests
Change-Id: I83fdd20ef040d102b5d5210a10a810c119f5cf44
jackqdyulei [Tue, 27 Jun 2017 00:54:09 +0000 (17:54 -0700)]
Add quickUpdate method to BatteryHeaderPrefCtrl
This cl adds a method called quickUpdateHeaderPreference, which will
update the following items immediately without waiting for the
BatteryInfo:
1. Battery level
2. Battery charging status(whether to show lighting bolt)
3. Clear the charging summary
Note: this cl doesn't optimize the BatteryInfo loading time.
This cl also rename "TimeText" to "BatteryPercentText" because in
new UI that textview is used to display battery percentage.
Bug:
63029231
Test: RunSettingsRoboTests
Change-Id: I8cc886b35e937d73b46e47e303ff0994ccdcb61c
Bill Yi [Tue, 27 Jun 2017 20:06:52 +0000 (20:06 +0000)]
Import translations. DO NOT MERGE
am:
8e132ce53c -s ours
Change-Id: I1546d616bc8d0344d9538cdb0c5fb80b3454105a
TreeHugger Robot [Tue, 27 Jun 2017 19:52:22 +0000 (19:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Fan Zhang [Tue, 27 Jun 2017 19:47:06 +0000 (12:47 -0700)]
Trim search query when initializing installed app searcher.
Change-Id: I502185d4b497b2edac32e4a8368be76d13b68259
Fix:
62885439
Test: make RunSettingsRoboTests
Sean Stout [Tue, 27 Jun 2017 18:04:28 +0000 (18:04 +0000)]
Merge "Add Night Light to Settings widget" into oc-dr1-dev
TreeHugger Robot [Tue, 27 Jun 2017 16:53:52 +0000 (16:53 +0000)]
Merge "Search results page polish" into oc-dr1-dev
Bill Yi [Tue, 27 Jun 2017 07:26:26 +0000 (00:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I19a85ce3981e7aac6708b6aa2d78fd51c9d03141
Auto-generated-cl: translation import
Bill Yi [Tue, 27 Jun 2017 07:20:56 +0000 (00:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I032ef2ee9e18202c2b114497577e8fd770ec6775
Auto-generated-cl: translation import
TreeHugger Robot [Tue, 27 Jun 2017 03:28:41 +0000 (03:28 +0000)]
Merge "Fix assist gesture settings summary" into oc-dr1-dev
TreeHugger Robot [Tue, 27 Jun 2017 02:28:24 +0000 (02:28 +0000)]
Merge "Dashboard search bar polish" into oc-dr1-dev
Maurice Lam [Tue, 27 Jun 2017 01:10:48 +0000 (01:10 +0000)]
Merge "Rename buttons in lock screen setup" into oc-dr1-dev
Maurice Lam [Tue, 27 Jun 2017 01:10:36 +0000 (01:10 +0000)]
Merge "Update skip button label to "Do it later"" into oc-dr1-dev
Maurice Lam [Tue, 27 Jun 2017 01:10:22 +0000 (01:10 +0000)]
Merge "Add skip button to fingerprint enrolling screen" into oc-dr1-dev
Maurice Lam [Tue, 27 Jun 2017 01:10:09 +0000 (01:10 +0000)]
Merge "Update buttons in FP find sensor" into oc-dr1-dev
Andrew Sapperstein [Mon, 26 Jun 2017 01:55:57 +0000 (18:55 -0700)]
Search results page polish
Changes made:
- up button added and in correct place
- text color correct when entering query
- query text aligned with results
- grey background around searchbar
Fixes:
37477506
Test: robotests
Change-Id: Ieb135f81f684032f3d5e4102304e617088c88117
TreeHugger Robot [Mon, 26 Jun 2017 22:08:32 +0000 (22:08 +0000)]
Merge "Update icon for language settings" into oc-dr1-dev
TreeHugger Robot [Mon, 26 Jun 2017 20:23:09 +0000 (20:23 +0000)]
Merge "Remove unnecessary functions from AssistGestureFeatureProvider" into oc-dr1-dev
TreeHugger Robot [Mon, 26 Jun 2017 20:22:25 +0000 (20:22 +0000)]
Merge "Update the chargeLabel when battery level is full" into oc-dr1-dev
TreeHugger Robot [Mon, 26 Jun 2017 19:52:53 +0000 (19:52 +0000)]
Merge "Hide misc in battery settings" into oc-dr1-dev
TreeHugger Robot [Mon, 26 Jun 2017 19:35:04 +0000 (19:35 +0000)]
Merge "Add a rename dialog for paired Bluetooth devices" into oc-dr1-dev
Fan Zhang [Mon, 26 Jun 2017 18:37:12 +0000 (11:37 -0700)]
Update icon for language settings
Change-Id: I74691be4d2e8377640b931a3b05021129ce246d5
Fix:
37929875
Test: visual
jackqdyulei [Mon, 26 Jun 2017 17:36:05 +0000 (10:36 -0700)]
Hide misc in battery settings
Hide it in any condition:
1. both in app usage list and device usage list
2. in all targets(i.e. user, userdebug..)
Bug:
62422405
Test: RunSettingsRoboTests
Change-Id: I36bd043942ce7e2353163868bf6d86f422f8e7ee
Andrew Sapperstein [Sun, 25 Jun 2017 22:18:46 +0000 (15:18 -0700)]
Dashboard search bar polish
Various tweaks to match redlines:
- background is now grey all the time
- the search icon is aligned with the other icons
- the title text is primary colored instead of accent colored
- the background of search bar doesn't scroll anymore
Deletes a bunch of logic to add an initial view that would be
colored based on the first view. It never quite worked right.
Now it's consistent and never moves.
Bug:
37477506
Fixes:
62267378
Fixes:
62379978
Fixes:
62361213
Test: robotests
Change-Id: Iddfd45a64a0a8d0365397a207889d7225d1ebb70
Merged-In: I82c584e8f8ecc6fc298c5cdbce08516c6a069a39
Antony Sargent [Fri, 16 Jun 2017 20:17:39 +0000 (13:17 -0700)]
Add a rename dialog for paired Bluetooth devices
This adds an icon to the paired device details page which users can
click on to bring up a dialog for changing the display name for that
device.
We already had a dialog for changing the advertised name of the local
Bluetooth adapter that's used on the main Bluetooth settings page, so
I've made that abstract and created two new subclasses to encapsulate
the slight differences for this use case.
Bug:
62535241
Test: make RunSettingsRoboTests
Change-Id: I1c407f276e12aedf066a336e24b4ccd16d67c4df
Andrew Sapperstein [Sun, 25 Jun 2017 20:51:08 +0000 (13:51 -0700)]
Remove logic for adding a search icon to action bar.
No longer used given that we don't show the search icon on any page.
The main settings page now has the search bar.
Change-Id: I9535028298739467e7fa9c75d1a2fb2b2fa3251b
Fixes:
62230804
Bug:
37477506
Test: robotests
Kevin Chyn [Sat, 24 Jun 2017 21:16:47 +0000 (14:16 -0700)]
Remove unnecessary functions from AssistGestureFeatureProvider
Fixes:
62945918
Test: make -j RunSettingsRoboTests && manual
Change-Id: I13438e6741a3398d06917b45f098c13df7dff97e
Kevin Chyn [Wed, 21 Jun 2017 01:33:40 +0000 (18:33 -0700)]
Fix assist gesture settings summary
Fixes:
62841640
Test: make -j RunSettingsRoboTests && manual testing of settings
Merged-In: I75ffce4ff1054dad6b2733a7d4f6bc7e526a8034
Change-Id: I75ffce4ff1054dad6b2733a7d4f6bc7e526a8034
Maurice Lam [Sat, 24 Jun 2017 02:15:06 +0000 (19:15 -0700)]
Rename buttons in lock screen setup
- "Continue" in choose lock flows are renamed to "Next"
- "Done" in fingerprint enroll finish screen is renamed to "Next"
during setup flow.
Test: Manual
Bug:
62839648
Change-Id: I3ea77b759b654d7c1da1f7b545781c9dfd74caa3
Maurice Lam [Sat, 24 Jun 2017 01:55:50 +0000 (18:55 -0700)]
Update skip button label to "Do it later"
Test: Manual
Bug:
62839648
Change-Id: I3616fb8095eb1ca77798d45730a1ffcda8f542a4
Maurice Lam [Sat, 24 Jun 2017 01:48:13 +0000 (18:48 -0700)]
Add skip button to fingerprint enrolling screen
Test: Manual
Bug:
62839648
Change-Id: I3f05c64eb5b88cd91c8c98b02845a99df2d27203
Maurice Lam [Sat, 24 Jun 2017 00:47:23 +0000 (17:47 -0700)]
Update buttons in FP find sensor
Remove the next button (so the user has to touch the sensor to
proceed), and add a skip button.
Test: cd tests/robotests && mma
Bug:
62839648
Change-Id: I555948ac2f3235e08b91f0957aa8e0ce24535c08
TreeHugger Robot [Fri, 23 Jun 2017 23:44:47 +0000 (23:44 +0000)]
Merge "Remove PowerUsageFeatureProvider.isAnomalyDetectionEnabled" into oc-dr1-dev
Jack Yu [Fri, 23 Jun 2017 23:13:50 +0000 (23:13 +0000)]
Merge "Refactored area update info support" into oc-dr1-dev
Andrew Sapperstein [Fri, 23 Jun 2017 21:32:22 +0000 (14:32 -0700)]
Remove PowerUsageFeatureProvider.isAnomalyDetectionEnabled
Instead, this decision is being handled via AnomalyDetectionPolicy.
Change-Id: I5b1831c78e31e3be984dda07bcea9f0b0a25d52f
Fixes:
62871629
Test: robotests
TreeHugger Robot [Fri, 23 Jun 2017 21:28:32 +0000 (21:28 +0000)]
Merge "Change the method to get foreground time." into oc-dr1-dev
jackqdyulei [Fri, 23 Jun 2017 20:52:36 +0000 (13:52 -0700)]
Update the chargeLabel when battery level is full
Before this cl, it will show "100% - charging", which doesn't make
sense. This cl removes "- charging", and only show "100%" in this
case
Bug:
62559153
Test: RunSettingsRoboTests
Change-Id: Id124fe4098e21b4a69c4a7d3d522fa227faab65d
Maurice Lam [Thu, 22 Jun 2017 00:09:33 +0000 (17:09 -0700)]
Add fingerprint backup message
Test: Manual
Bug:
62844631
Change-Id: I7ce5fd4033c9f37f7aa170750edc7ffe0b583fcf
jackqdyulei [Thu, 22 Jun 2017 17:24:27 +0000 (10:24 -0700)]
Change the method to get foreground time.
This cl changes it to:
foregroundTime = MIN(topTime, foregroundActivityTime);
Bug:
62884954
Test: RunSettingsRoboTests
Change-Id: I236c18b19c4f06c5a6d018bc06ffb9862af51de2
TreeHugger Robot [Fri, 23 Jun 2017 17:27:57 +0000 (17:27 +0000)]
Merge "Add a flag to enable/disable new device suggestion" into oc-dr1-dev
Bill Yi [Fri, 23 Jun 2017 12:39:42 +0000 (12:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
6b1ff7073a -s ours
Change-Id: Ic62eae25c60977a427a5414e73d7c6f08cf204a9
TreeHugger Robot [Fri, 23 Jun 2017 12:32:31 +0000 (12:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Fri, 23 Jun 2017 12:23:14 +0000 (12:23 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
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
Bill Yi [Fri, 23 Jun 2017 08:33:27 +0000 (01:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I277e41f97963c4f676aef802c9f0ce2c47838515
Auto-generated-cl: translation import
Daniel Nishi [Fri, 23 Jun 2017 04:19:19 +0000 (04:19 +0000)]
Count cache in storage categories.
am:
b22b85b593
Change-Id: I85b6ce492c34f67215dcb8539e7b88b02a9ef2fa
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
TreeHugger Robot [Fri, 23 Jun 2017 01:37:45 +0000 (01:37 +0000)]
Merge "Load regulatory info from /data/misc" into oc-dr1-dev
Marie Janssen [Fri, 23 Jun 2017 00:22:24 +0000 (00:22 +0000)]
Bluetooth: Make notifications local-only
am:
1138397336
Change-Id: I26d09208b0425e5cdfb8317c7aa782ad0ef1fe5d
TreeHugger Robot [Thu, 22 Jun 2017 21:33:39 +0000 (21:33 +0000)]
Merge "Tint suggestion icons" into oc-dr1-dev
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
Fan Zhang [Thu, 22 Jun 2017 19:44:31 +0000 (12:44 -0700)]
Add a flag to enable/disable new device suggestion
Change-Id: Iebf982731a01b3d6c1d3ad60e9d1f858f4e9151e
Fix:
62907886
Test: make RunSettingsRoboTests
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
Maurice Lam [Thu, 22 Jun 2017 19:48:10 +0000 (19:48 +0000)]
Merge "Update CHAR LIMIT for fingerprint dialog" 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
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
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
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
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)
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
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
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
Jack Yu [Thu, 22 Jun 2017 00:43:43 +0000 (17:43 -0700)]
Refactored area update info support
1. Refactored area update information support so it
is not limited to channel 50 and Brazil.
2. Added channel 60 for India.
Test: Manual
bug:
37746109
Change-Id: I470cc470f880aadd4f63815e21cdd4a71436a89d
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
TreeHugger Robot [Wed, 21 Jun 2017 23:59:38 +0000 (23:59 +0000)]
Merge "Add summary text for account sync." into oc-dr1-dev
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
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
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
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
TreeHugger Robot [Wed, 21 Jun 2017 19:55:50 +0000 (19:55 +0000)]
Merge "Increase char limit for "Disconnect"" 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
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
jackqdyulei [Wed, 21 Jun 2017 17:28:35 +0000 (10:28 -0700)]
Increase char limit for "Disconnect"
Bug:
62374362
Test: Build
Change-Id: I3cd8c2d48c5a686c006ab76686a2f017ac9c0ddf
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
TreeHugger Robot [Wed, 21 Jun 2017 17:26:08 +0000 (17:26 +0000)]
Merge "Block inline-results from Settings search" 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
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
Sean Stout [Wed, 21 Jun 2017 01:07:22 +0000 (18:07 -0700)]
Add Night Light to Settings widget
Night Light now appears as an option when placing the Settings widget
Bug:
62823114
Test: manual - Place Settings widget on launcher
Change-Id: I521980ec63b2e9034f44d2de7796dcb64f870b06
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
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
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
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
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
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
Lei Yu [Wed, 21 Jun 2017 01:03:41 +0000 (01:03 +0000)]
Merge "Update anomaly High usage" 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
Lei Yu [Wed, 21 Jun 2017 00:51:30 +0000 (00:51 +0000)]
Merge "Only update anomaly icon in AnomalyLoader" into oc-dr1-dev
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
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
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