Commit Graph

37633 Commits

Author SHA1 Message Date
Maurice Lam
d342ad4878 Update skip button label to "Do it later"
Test: Manual
Bug: 62839648
Change-Id: I3616fb8095eb1ca77798d45730a1ffcda8f542a4
2017-06-23 18:55:50 -07: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
Bill Yi
a043cf04df Merge "Import translations. DO NOT MERGE" into oc-dev am: 6b1ff7073a -s ours
am: bbeaae705d  -s ours

Change-Id: I2125118b568ea7d81b37a7c944d6c16d75742824
2017-06-23 13:00:52 +00:00
Bill Yi
995b3898c4 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 6300674d27  -s ours

Change-Id: I242fc96c03e5e4754cbc3fee027ce483301f0b1c
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  -s ours

Change-Id: Ib26efa4af930a2e9aa369e3afc1ec7cc57c065ab
2017-06-23 12:48:51 +00:00
Bill Yi
bbeaae705d Merge "Import translations. DO NOT MERGE" into oc-dev
am: 6b1ff7073a  -s ours

Change-Id: Ic62eae25c60977a427a5414e73d7c6f08cf204a9
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  -s ours

Change-Id: Ic3856a964218fae0861218de0ca46f3d50820e5f
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
daqi
b279330c0a Fix PremiumSmsAccess memory leak
[Cause of Defect]
PremiumSmsAccess forget to invoke Session and AppStateSmsPremBridge
release method in the onDestroy callback.
And that would lead to the leak of activity context.

Test: 1. Settings - Apps - Advanced - Special access - Premium SMS access
      2. adb shell dumpsys meminfo com.android.settings
      3. observe activity object number
      4. back to the last page
      5. use AS trigger Settings gc several times
      6. adb shell dumpsys meminfo com.android.settings
      7. observe activity object number to check if the activity number decrease

Change-Id: I359900c16fa866fba94d187a61cf6bebbdd1ed0b
Signed-off-by: daqi <daqi@xiaomi.com>
2017-06-23 14:17:49 +08: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

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

Change-Id: Id280446eddddafbd7445a11ad42d1f66320b9128
2017-06-23 04:28:43 +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
b57a71fe08 Count cache in storage categories.
am: b22b85b593

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

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
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

Change-Id: Ife7f54253c73bdff35a8ee988d51be8bd4c7ebe1
2017-06-23 00:26:59 +00:00
Marie Janssen
56adef485a Bluetooth: Make notifications local-only am: 1138397336
am: 0efa2b3427

Change-Id: I2b308d2646693280cb6e0f69106e94b481c526e3
2017-06-23 00:26:53 +00:00
Marie Janssen
493a76e087 Bluetooth: Make notifications local-only
am: 1138397336

Change-Id: I26d09208b0425e5cdfb8317c7aa782ad0ef1fe5d
2017-06-23 00:22:24 +00:00
Marie Janssen
0efa2b3427 Bluetooth: Make notifications local-only
am: 1138397336

Change-Id: Id287a1ba31898da57385a8e72cacbe03d7b78946
2017-06-23 00:22:23 +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
Maurice Lam
6d33cabb0f Merge "Update CHAR LIMIT for fingerprint dialog" into oc-dr1-dev
am: e1eae4f05f

Change-Id: I4ef2d7373d80c95c1df60ee8af9dcae2e3ac61b6
2017-06-22 19:58:02 +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
Maurice Lam
e1eae4f05f Merge "Update CHAR LIMIT for fingerprint dialog" into oc-dr1-dev 2017-06-22 19:48:12 +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