Kevin Chyn
4efa54e342
Merge "Remove unnecessary functions from AssistGestureFeatureProvider" into oc-dr1-dev
...
am: 0e393d4163
2017-06-26 20:30:56 +00:00
jackqdyulei
e9d1f6f1ae
Merge "Update the chargeLabel when battery level is full" into oc-dr1-dev
...
am: 1eb2f15339
2017-06-26 20:30:26 +00:00
TreeHugger Robot
0e393d4163
Merge "Remove unnecessary functions from AssistGestureFeatureProvider" into oc-dr1-dev
2017-06-26 20:23:11 +00:00
TreeHugger Robot
1eb2f15339
Merge "Update the chargeLabel when battery level is full" into oc-dr1-dev
2017-06-26 20:22:27 +00:00
jackqdyulei
758b2d4ae6
Merge "Hide misc in battery settings" into oc-dr1-dev
...
am: da45ba8c9e
2017-06-26 20:01:22 +00:00
TreeHugger Robot
da45ba8c9e
Merge "Hide misc in battery settings" into oc-dr1-dev
2017-06-26 19:52:55 +00:00
Antony Sargent
e414cd2316
Merge "Add a rename dialog for paired Bluetooth devices" into oc-dr1-dev
...
am: ee55927bd4
2017-06-26 19:49:16 +00:00
TreeHugger Robot
ee55927bd4
Merge "Add a rename dialog for paired Bluetooth devices" into oc-dr1-dev
2017-06-26 19:35:06 +00:00
jackqdyulei
d856294bf1
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
2017-06-26 10:36:05 -07:00
Antony Sargent
843c3ead6d
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
2017-06-26 10:20:38 -07:00
Andrew Sapperstein
a7dd97a4c9
Remove logic for adding a search icon to action bar.
...
am: a2dd9978d4
2017-06-25 23:12:44 +00:00
Andrew Sapperstein
a2dd9978d4
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
2017-06-25 13:51:08 -07:00
Kevin Chyn
cd236f7e60
Remove unnecessary functions from AssistGestureFeatureProvider
...
Fixes: 62945918
Test: make -j RunSettingsRoboTests && manual
Change-Id: I13438e6741a3398d06917b45f098c13df7dff97e
2017-06-24 14:16:47 -07:00
Andrew Sapperstein
ee3e1af182
Merge "Remove PowerUsageFeatureProvider.isAnomalyDetectionEnabled" into oc-dr1-dev
...
am: 74a350f9c9
2017-06-24 04:54:51 +00:00
Jack Yu
fa283cfff1
Merge "Refactored area update info support" into oc-dr1-dev
...
am: 698dc94151
2017-06-24 04:47:53 +00:00
TreeHugger Robot
74a350f9c9
Merge "Remove PowerUsageFeatureProvider.isAnomalyDetectionEnabled" into oc-dr1-dev
2017-06-23 23:44:49 +00:00
Jack Yu
698dc94151
Merge "Refactored area update info support" into oc-dr1-dev
2017-06-23 23:13:52 +00:00
jackqdyulei
3829eca2d8
Merge "Change the method to get foreground time." into oc-dr1-dev
...
am: 9463219048
2017-06-23 21:33:02 +00:00
Andrew Sapperstein
466a3f6faa
Remove PowerUsageFeatureProvider.isAnomalyDetectionEnabled
...
Instead, this decision is being handled via AnomalyDetectionPolicy.
Change-Id: I5b1831c78e31e3be984dda07bcea9f0b0a25d52f
Fixes: 62871629
Test: robotests
2017-06-23 14:32:22 -07:00
TreeHugger Robot
9463219048
Merge "Change the method to get foreground time." into oc-dr1-dev
2017-06-23 21:28:34 +00:00
jackqdyulei
543c1f2cf5
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
2017-06-23 14:04:45 -07:00
Maurice Lam
d396208233
Add fingerprint backup message
...
am: d793590678
2017-06-23 20:48:45 +00:00
Maurice Lam
d793590678
Add fingerprint backup message
...
Test: Manual
Bug: 62844631
Change-Id: I7ce5fd4033c9f37f7aa170750edc7ffe0b583fcf
2017-06-23 11:33:41 -07:00
jackqdyulei
3d93fc16f4
Change the method to get foreground time.
...
This cl changes it to:
foregroundTime = MIN(topTime, foregroundActivityTime);
Bug: 62884954
Test: RunSettingsRoboTests
Change-Id: I236c18b19c4f06c5a6d018bc06ffb9862af51de2
2017-06-23 11:02:54 -07:00
Fan Zhang
88ce094235
Merge "Add a flag to enable/disable new device suggestion" into oc-dr1-dev
...
am: e28599049e
2017-06-23 17:34:00 +00:00
TreeHugger Robot
e28599049e
Merge "Add a flag to enable/disable new device suggestion" into oc-dr1-dev
2017-06-23 17:27:59 +00:00
Bill Yi
a043cf04df
Merge "Import translations. DO NOT MERGE" into oc-dev am: 6b1ff7073a -s ours
...
am: bbeaae705d
2017-06-23 13:00:52 +00:00
Bill Yi
995b3898c4
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 6300674d27
2017-06-23 13:00:07 +00:00
Bill Yi
16ec3c30e5
Merge "Import translations. DO NOT MERGE" into oc-dev am: 6b1ff7073a -s ours
...
am: 5386943cf2
2017-06-23 12:48:51 +00:00
Bill Yi
bbeaae705d
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 6b1ff7073a
2017-06-23 12:39:42 +00:00
TreeHugger Robot
6300674d27
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-06-23 12:32:32 +00:00
Bill Yi
5386943cf2
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 6b1ff7073a
2017-06-23 12:29:05 +00:00
TreeHugger Robot
6b1ff7073a
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-06-23 12:23:16 +00:00
Bill Yi
8ec66e1f56
Import translations. DO NOT MERGE
...
Change-Id: I86e7dbea32adfb191ec6bb40cb2a4714bd583c24
Auto-generated-cl: translation import
2017-06-23 01:39:20 -07:00
Bill Yi
0695fc5d2b
Import translations. DO NOT MERGE
...
Change-Id: I277e41f97963c4f676aef802c9f0ce2c47838515
Auto-generated-cl: translation import
2017-06-23 01:33:27 -07:00
Android Build Merger (Role)
d570ab1595
Merge "Count cache in storage categories. am: b22b85b593 am: b57a71fe08" into oc-dr1-dev-plus-aosp
2017-06-23 04:30:21 +00:00
Daniel Nishi
41400d022c
Count cache in storage categories. am: b22b85b593
...
am: 5837a9b98b
2017-06-23 04:28:49 +00:00
Daniel Nishi
1b1d779ed4
Count cache in storage categories. am: b22b85b593
...
am: b57a71fe08
2017-06-23 04:28:43 +00:00
Daniel Nishi
5837a9b98b
Count cache in storage categories.
...
am: b22b85b593
2017-06-23 04:19:19 +00:00
Daniel Nishi
b57a71fe08
Count cache in storage categories.
...
am: b22b85b593
2017-06-23 04:19:16 +00:00
Daniel Nishi
b22b85b593
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
2017-06-22 19:08:48 -07:00
Fan Zhang
9f7227eb59
Merge "Load regulatory info from /data/misc" into oc-dr1-dev
...
am: f964e8c3b2
2017-06-23 01:43:15 +00:00
TreeHugger Robot
f964e8c3b2
Merge "Load regulatory info from /data/misc" into oc-dr1-dev
2017-06-23 01:37:47 +00:00
Android Build Merger (Role)
297ab4cbf7
Merge "Bluetooth: Make notifications local-only am: 1138397336 am: 493a76e087" into oc-dr1-dev-plus-aosp
2017-06-23 00:27:29 +00:00
Marie Janssen
c514cd9483
Bluetooth: Make notifications local-only am: 1138397336
...
am: 493a76e087
2017-06-23 00:26:59 +00:00
Marie Janssen
56adef485a
Bluetooth: Make notifications local-only am: 1138397336
...
am: 0efa2b3427
2017-06-23 00:26:53 +00:00
Marie Janssen
493a76e087
Bluetooth: Make notifications local-only
...
am: 1138397336
2017-06-23 00:22:24 +00:00
Marie Janssen
0efa2b3427
Bluetooth: Make notifications local-only
...
am: 1138397336
2017-06-23 00:22:23 +00:00
Maurice Lam
a1130d5d12
Merge "Tint suggestion icons" into oc-dr1-dev
...
am: c1ab582fae
2017-06-22 21:44:22 +00:00
TreeHugger Robot
c1ab582fae
Merge "Tint suggestion icons" into oc-dr1-dev
2017-06-22 21:33:42 +00:00
