Commit Graph

17774 Commits

Author SHA1 Message Date
Maurice Lam
a3eb263479 Merge "Add skip button to fingerprint enrolling screen" into oc-dr1-dev
am: 624212f43c

Change-Id: I90b4d7d57a7dc3bca86f46b34b0f9af2b78ea574
2017-06-27 01:16:46 +00:00
Maurice Lam
2cc641940d Merge "Update buttons in FP find sensor" into oc-dr1-dev
am: a102714c19

Change-Id: I7ac04a8bf769be782c79bd0e672c38db1bd6187b
2017-06-27 01:16:16 +00:00
Maurice Lam
624212f43c Merge "Add skip button to fingerprint enrolling screen" into oc-dr1-dev 2017-06-27 01:10:23 +00:00
Maurice Lam
a102714c19 Merge "Update buttons in FP find sensor" into oc-dr1-dev 2017-06-27 01:10:10 +00:00
Kevin Chyn
4efa54e342 Merge "Remove unnecessary functions from AssistGestureFeatureProvider" into oc-dr1-dev
am: 0e393d4163

Change-Id: I3bc791c4d31d78de761eda608c26450d9940f11d
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

Change-Id: I9a1e1f78b34e989a1e56a0e43bf2f40df10a35eb
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

Change-Id: Idb9d205dec2db148c4832266716da565eaf3cf73
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

Change-Id: Ibc1dbef4dac9d5830aee7cc1a70ccb70333d32cf
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

Change-Id: Ifbc919113e129e997d20a89069e159fc5963ee1c
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

Change-Id: I5f90f5dc56765ab16e9bc6879fe84d3fe31ce0df
2017-06-24 04:54:51 +00:00
Jack Yu
fa283cfff1 Merge "Refactored area update info support" into oc-dr1-dev
am: 698dc94151

Change-Id: I8df78f80b3bcadcb9c3a409cea5f75f64f76ed38
2017-06-24 04:47:53 +00:00
Maurice Lam
870b69b067 Add skip button to fingerprint enrolling screen
Test: Manual
Bug: 62839648
Change-Id: I3f05c64eb5b88cd91c8c98b02845a99df2d27203
2017-06-23 18:48:13 -07:00
Maurice Lam
70a031fe06 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
2017-06-23 18:05:20 -07: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

Change-Id: Iab042eb8275c05f4a9cb6c222c3bfe3279582669
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

Change-Id: I431ad2491085b9bccc1b90a117a30497f4156c9e
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

Change-Id: I4ee4f15c73d8ef633704553b8147c3c3c3a02a6c
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
Daniel Nishi
41400d022c Count cache in storage categories. am: b22b85b593
am: 5837a9b98b

Change-Id: If5107df5ea57dc782e76cd6444f38c9feaff037f
2017-06-23 04:28:49 +00:00
Daniel Nishi
5837a9b98b Count cache in storage categories.
am: b22b85b593

Change-Id: I85b6ce492c34f67215dcb8539e7b88b02a9ef2fa
2017-06-23 04:19:19 +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

Change-Id: I39d82c1332362c2e4f90c793a9c5ef44d297353a
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
Marie Janssen
493a76e087 Bluetooth: Make notifications local-only
am: 1138397336

Change-Id: I26d09208b0425e5cdfb8317c7aa782ad0ef1fe5d
2017-06-23 00:22:24 +00:00
Maurice Lam
a1130d5d12 Merge "Tint suggestion icons" into oc-dr1-dev
am: c1ab582fae

Change-Id: I8ad6d1c3ccd3c759981472cb7119dbb50dc90e99
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
Fan Zhang
1bc7ac3bfa Load regulatory info from /data/misc
Bug: 62837579
Test: settings test
Change-Id: I84ef037174a1839993d02e8cd46d159398be1ddc
2017-06-22 20:13:21 +00:00
Fan Zhang
86542ec1f6 Add a flag to enable/disable new device suggestion
Change-Id: Iebf982731a01b3d6c1d3ad60e9d1f858f4e9151e
Fix: 62907886
Test: make RunSettingsRoboTests
2017-06-22 20:03:09 +00:00
Maurice Lam
15bcab49f7 Merge "Create add more fingerprint suggestion for setup" into oc-dr1-dev
am: cf3130338c

Change-Id: I5ee371963f73c8f645618a12949f545c2f88ca82
2017-06-22 20:02:48 +00:00
TreeHugger Robot
cf3130338c Merge "Create add more fingerprint suggestion for setup" into oc-dr1-dev 2017-06-22 19:58:51 +00:00
Doris Ling
dc361053a0 Merge "Update summary for Recent Apps." into oc-dr1-dev
am: d7fc071f48

Change-Id: I076f239380ffd7883e1907d1f409d47127483cdc
2017-06-22 19:57:20 +00:00
TreeHugger Robot
d7fc071f48 Merge "Update summary for Recent Apps." into oc-dr1-dev 2017-06-22 19:39:10 +00:00
Salvador Martinez
23888a246b Merge "Fix BatteryInfo using enhanced estimate for charge time" into oc-dr1-dev
am: ed66c5fcdf

Change-Id: I54f1e94106a2ac984a7f736706e4c70b5db9b584
2017-06-22 18:47:11 +00:00
TreeHugger Robot
ed66c5fcdf Merge "Fix BatteryInfo using enhanced estimate for charge time" into oc-dr1-dev 2017-06-22 18:42:16 +00:00
Maurice Lam
992fa86d52 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
2017-06-22 11:40:34 -07:00
Salvador Martinez
cb9c53dd7c 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
2017-06-22 09:42:36 -07:00