OSDN Git Service

android-x86/packages-apps-Settings.git
7 years agoMerge "Dashboard search bar polish"
TreeHugger Robot [Tue, 27 Jun 2017 00:11:56 +0000 (00:11 +0000)]
Merge "Dashboard search bar polish"

7 years agoMerge "Remove redundant talkback readout when rebooting device"
TreeHugger Robot [Mon, 26 Jun 2017 22:30:45 +0000 (22:30 +0000)]
Merge "Remove redundant talkback readout when rebooting device"

7 years agoMerge commit 'e414cd231656314442cb503f9cda3677561dc44a' into manual_merge_e414cd2316
Andrew Sapperstein [Mon, 26 Jun 2017 21:21:19 +0000 (14:21 -0700)]
Merge commit 'e414cd231656314442cb503f9cda3677561dc44a' into manual_merge_e414cd2316

Test: none
Change-Id: I5dedcc30c9f15fa61532ecad2e0f68de4fd97c8e

7 years agoMerge "Fix typo in metrics constants"
TreeHugger Robot [Mon, 26 Jun 2017 21:06:45 +0000 (21:06 +0000)]
Merge "Fix typo in metrics constants"

7 years agoMerge "Add a rename dialog for paired Bluetooth devices" into oc-dr1-dev
Antony Sargent [Mon, 26 Jun 2017 19:49:16 +0000 (19:49 +0000)]
Merge "Add a rename dialog for paired Bluetooth devices" into oc-dr1-dev
am: ee55927bd4

Change-Id: Ibc1dbef4dac9d5830aee7cc1a70ccb70333d32cf

7 years agoMerge "Add a rename dialog for paired Bluetooth devices" 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

7 years agoFix typo in metrics constants
Fan Zhang [Mon, 26 Jun 2017 19:13:55 +0000 (12:13 -0700)]
Fix typo in metrics constants

Change-Id: If73ca178c6f3f5544ae2f5a0cc030e307d7df8c5
Fix: 62955794
Test: robotests

7 years agoMake PreferenceController a mixin
Tony Mantler [Tue, 13 Jun 2017 20:09:25 +0000 (13:09 -0700)]
Make PreferenceController a mixin

Bug: 62912136
Test: Existing tests in BaseSearchIndexProviderTest
Change-Id: Ieda359806c09a019840b2005446c7ec8b61fdb00

7 years agoAdd a rename dialog for paired Bluetooth devices
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

7 years agoDashboard search bar polish
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
Change-Id: I82c584e8f8ecc6fc298c5cdbce08516c6a069a39
Fixes: 62267378
Fixes: 62379978
Fixes: 62361213
Test: robotests

7 years agoRemove logic for adding a search icon to action bar. am: a2dd9978d4
Andrew Sapperstein [Sun, 25 Jun 2017 23:14:45 +0000 (23:14 +0000)]
Remove logic for adding a search icon to action bar. am: a2dd9978d4
am: a7dd97a4c9

Change-Id: I4e1f2e9e792642257f538696afe8f9aca396cdbb

7 years agoRemove logic for adding a search icon to action bar.
Andrew Sapperstein [Sun, 25 Jun 2017 23:12:44 +0000 (23:12 +0000)]
Remove logic for adding a search icon to action bar.
am: a2dd9978d4

Change-Id: Ifbc919113e129e997d20a89069e159fc5963ee1c

7 years agoRemove logic for adding a search icon to action bar.
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

7 years agoMerge "Remove PowerUsageFeatureProvider.isAnomalyDetectionEnabled" into oc-dr1-dev...
Andrew Sapperstein [Sat, 24 Jun 2017 05:03:31 +0000 (05:03 +0000)]
Merge "Remove PowerUsageFeatureProvider.isAnomalyDetectionEnabled" into oc-dr1-dev am: 74a350f9c9
am: ee3e1af182

Change-Id: Ib5cc4974d2b7d42f9518fb34bdca815da22d8bd3

7 years agoMerge "Refactored area update info support" into oc-dr1-dev am: 698dc94151
Jack Yu [Sat, 24 Jun 2017 04:55:48 +0000 (04:55 +0000)]
Merge "Refactored area update info support" into oc-dr1-dev am: 698dc94151
am: fa283cfff1

Change-Id: I09637a7737d35354c1c8faebabdf063da78bdc33

7 years agoMerge "Remove PowerUsageFeatureProvider.isAnomalyDetectionEnabled" into oc-dr1-dev
Andrew Sapperstein [Sat, 24 Jun 2017 04:54:51 +0000 (04:54 +0000)]
Merge "Remove PowerUsageFeatureProvider.isAnomalyDetectionEnabled" into oc-dr1-dev
am: 74a350f9c9

Change-Id: I5f90f5dc56765ab16e9bc6879fe84d3fe31ce0df

7 years agoMerge "Refactored area update info support" into oc-dr1-dev
Jack Yu [Sat, 24 Jun 2017 04:47:53 +0000 (04:47 +0000)]
Merge "Refactored area update info support" into oc-dr1-dev
am: 698dc94151

Change-Id: I8df78f80b3bcadcb9c3a409cea5f75f64f76ed38

7 years agoMerge "Remove PowerUsageFeatureProvider.isAnomalyDetectionEnabled" into oc-dr1-dev
TreeHugger Robot [Fri, 23 Jun 2017 23:44:47 +0000 (23:44 +0000)]
Merge "Remove PowerUsageFeatureProvider.isAnomalyDetectionEnabled" into oc-dr1-dev

7 years agoMerge "Refactored area update info support" 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

7 years agoMerge "Disable managed services special access screens..."
TreeHugger Robot [Fri, 23 Jun 2017 22:34:52 +0000 (22:34 +0000)]
Merge "Disable managed services special access screens..."

7 years agoMerge "Change the method to get foreground time." into oc-dr1-dev am: 9463219048
jackqdyulei [Fri, 23 Jun 2017 21:44:35 +0000 (21:44 +0000)]
Merge "Change the method to get foreground time." into oc-dr1-dev am: 9463219048
am: 3829eca2d8

Change-Id: I3b6b2a38534feb99b6c795c660734093cb7bbb2e

7 years agoMerge "Change the method to get foreground time." into oc-dr1-dev
jackqdyulei [Fri, 23 Jun 2017 21:33:02 +0000 (21:33 +0000)]
Merge "Change the method to get foreground time." into oc-dr1-dev
am: 9463219048

Change-Id: Iab042eb8275c05f4a9cb6c222c3bfe3279582669

7 years agoRemove PowerUsageFeatureProvider.isAnomalyDetectionEnabled
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

7 years agoMerge "Change the method to get foreground time." into oc-dr1-dev
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

7 years agoAdd fingerprint backup message am: d793590678
Maurice Lam [Fri, 23 Jun 2017 20:53:41 +0000 (20:53 +0000)]
Add fingerprint backup message am: d793590678
am: d396208233

Change-Id: I857fd458c046fa053000f7b41280310ce73f73f1

7 years agoAdd fingerprint backup message
Maurice Lam [Fri, 23 Jun 2017 20:48:45 +0000 (20:48 +0000)]
Add fingerprint backup message
am: d793590678

Change-Id: I431ad2491085b9bccc1b90a117a30497f4156c9e

7 years agoDisable managed services special access screens...
Julia Reynolds [Wed, 21 Jun 2017 18:19:46 +0000 (14:19 -0400)]
Disable managed services special access screens...

... on low ram devices.

- Remove them from the 'Special app access' screen
- Display an error message if an app intents directly to
them

Bug: 35219985
Test: visual, and runtest --path ManagedAccessSettingsLowRamTest.java,
when the device is in low ram mode and when it's not.
Change-Id: Ied919cb248ae56683a00e3492c4737dfd00449ac

7 years agoAdd fingerprint backup message
Maurice Lam [Thu, 22 Jun 2017 00:09:33 +0000 (17:09 -0700)]
Add fingerprint backup message

Test: Manual
Bug: 62844631
Change-Id: I7ce5fd4033c9f37f7aa170750edc7ffe0b583fcf

7 years agoChange the method to get foreground time.
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

7 years agoMerge "Add a flag to enable/disable new device suggestion" into oc-dr1-dev am: e28599049e
Fan Zhang [Fri, 23 Jun 2017 17:47:36 +0000 (17:47 +0000)]
Merge "Add a flag to enable/disable new device suggestion" into oc-dr1-dev am: e28599049e
am: 88ce094235

Change-Id: Iefc8c7173e6d375d1045a3b148ba5c0f11c426e2

7 years agoMerge "Add a flag to enable/disable new device suggestion" into oc-dr1-dev
Fan Zhang [Fri, 23 Jun 2017 17:34:00 +0000 (17:34 +0000)]
Merge "Add a flag to enable/disable new device suggestion" into oc-dr1-dev
am: e28599049e

Change-Id: I4ee4f15c73d8ef633704553b8147c3c3c3a02a6c

7 years agoMerge "Add a flag to enable/disable new device suggestion" into oc-dr1-dev
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

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

Change-Id: I335191d70ae5fe79fe7d1ea9c334ecd6d82a60e3

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 6300674d27 -s ours
Bill Yi [Fri, 23 Jun 2017 13:30:51 +0000 (13:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 6300674d27  -s ours
am: 995b3898c4  -s ours

Change-Id: I8be17d45e727141f2d6690a2afa02526c9eb50a0

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev am: 6b1ff7073a -s ours am...
Bill Yi [Fri, 23 Jun 2017 13:30:03 +0000 (13:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am: 6b1ff7073a  -s ours am: 5386943cf2  -s ours
am: 16ec3c30e5  -s ours

Change-Id: I03cc46fad1b0c82b4ee4d6460f320c278a7fa250

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

Change-Id: I2125118b568ea7d81b37a7c944d6c16d75742824

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Fri, 23 Jun 2017 13:00:07 +0000 (13:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 6300674d27  -s ours

Change-Id: I242fc96c03e5e4754cbc3fee027ce483301f0b1c

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:39:42 +0000 (12:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 6b1ff7073a  -s ours

Change-Id: Ic62eae25c60977a427a5414e73d7c6f08cf204a9

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

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 agoImport translations. DO NOT MERGE
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

7 years agoMerge "Count cache in storage categories. am: b22b85b593 am: b57a71fe08" into oc...
Daniel Nishi [Fri, 23 Jun 2017 04:44:59 +0000 (04:44 +0000)]
Merge "Count cache in storage categories. am: b22b85b593 am: b57a71fe08" into oc-dr1-dev-plus-aosp
am: d570ab1595

Change-Id: If3eac200a1e775165415382f5e63c50b6c65dc11

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

Change-Id: Iee95e7d07f0642aec5bc478c8929bb4b50d3d3ec

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 am: f964e8c3b2
Fan Zhang [Fri, 23 Jun 2017 01:47:45 +0000 (01:47 +0000)]
Merge "Load regulatory info from /data/misc" into oc-dr1-dev am: f964e8c3b2
am: 9f7227eb59

Change-Id: I2421dba06e793b62ed3abb2dde041b8d0e1f0d29

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...
Marie Janssen [Fri, 23 Jun 2017 00:32:29 +0000 (00:32 +0000)]
Merge "Bluetooth: Make notifications local-only am: 1138397336 am: 493a76e087" into oc-dr1-dev-plus-aosp
am: 297ab4cbf7

Change-Id: Id5ae9b091e48fe1d903276529f37253c89c4179e

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

Change-Id: I859ca92f0f3ba63dfbe5d3beb54264c371542d9a

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 agoFix presubmit test
Fan Zhang [Thu, 22 Jun 2017 22:51:54 +0000 (15:51 -0700)]
Fix presubmit test

Change-Id: I8c1f35fc76ed153080655242943fdfa9c29cf5bb
Fix: 62913954
Test: robotests

7 years agoRemove redundant talkback readout when rebooting device
Fan Zhang [Thu, 22 Jun 2017 22:04:41 +0000 (15:04 -0700)]
Remove redundant talkback readout when rebooting device

Change-Id: I0b3bf7d0d75c4f19c234977be5caa74496c67a94
Fix: 62418304
Test: manual

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

Change-Id: Ia355e3fb4026afae6f8582053cc07e1fb9728a93

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 "Create add more fingerprint suggestion for setup" into oc-dr1-dev am: cf3130338c
Maurice Lam [Thu, 22 Jun 2017 21:36:47 +0000 (21:36 +0000)]
Merge "Create add more fingerprint suggestion for setup" into oc-dr1-dev am: cf3130338c
am: 15bcab49f7

Change-Id: Ib5cbaaa4c7bcfce89ed491e5ab02fd3069549efc

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

Change-Id: I3c2517cab313b9f3bf4411bb02de8455ffdb0e66

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

Change-Id: Ibd4dbb2d883a16d3d0811b15dbda9825178d5833

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 agoAdd a flag to enable/disable new device suggestion
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

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 "Switch Utils.formatElapsedTime to use ICU's MeasureFormat"
TreeHugger Robot [Thu, 22 Jun 2017 19:49:34 +0000 (19:49 +0000)]
Merge "Switch Utils.formatElapsedTime to use ICU's MeasureFormat"

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 "Catch invalid extra when launching help trampoline."
TreeHugger Robot [Thu, 22 Jun 2017 19:23:44 +0000 (19:23 +0000)]
Merge "Catch invalid extra when launching help trampoline."

7 years agoMerge "Move Apps & notifications -> App permissions into Advanced."
TreeHugger Robot [Thu, 22 Jun 2017 19:23:20 +0000 (19:23 +0000)]
Merge "Move Apps & notifications -> App permissions into Advanced."

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

Change-Id: I7f82ff69a26028721b6d510b1350191654c84c05

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 agoCatch invalid extra when launching help trampoline.
Fan Zhang [Thu, 22 Jun 2017 16:40:42 +0000 (09:40 -0700)]
Catch invalid extra when launching help trampoline.

Change-Id: Ifb4b6fefe507cf403065436fca7a46d3a00afda7
Fix: 62821816
Test: robotests

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 agoMerge "Notification settings to match ixd mocks: - added default sound config to...
TreeHugger Robot [Thu, 22 Jun 2017 16:29:18 +0000 (16:29 +0000)]
Merge "Notification settings to match ixd mocks: - added default sound config to general notification settings page - reordered items to match docs"

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 am...
Marie Janssen [Thu, 22 Jun 2017 15:48:58 +0000 (15:48 +0000)]
Merge "Bluetooth: Make notifications local-only" am: 348a7085fa am: 620fe71520 am: 3cc4522cbc
am: 852c930bfd

Change-Id: I410601bd3df4d4cfc2a1d212d972904610a8ea19

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 agoNotification settings to match ixd mocks:
Alison Cichowlas [Wed, 21 Jun 2017 15:41:34 +0000 (11:41 -0400)]
Notification settings to match ixd mocks:
- added default sound config to general notification settings page
- reordered items to match docs

Bug: 37481153
Test: RunSettingsRoboTests; manual

Change-Id: I2404f0a3f97601c8b3a9d15de58e1d53bf801c45

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

Change-Id: I69d48c1c8b70d93edd0d965e01dd4086abf59af9

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 agoSwitch Utils.formatElapsedTime to use ICU's MeasureFormat
Roozbeh Pournader [Tue, 20 Jun 2017 23:46:49 +0000 (16:46 -0700)]
Switch Utils.formatElapsedTime to use ICU's MeasureFormat

Previously, localizable strings were used instead, causing various
difficulties and inconsistencies.

Now we use ICU's MeasureFormat. The results for English are almost
identical to the previous results (see below), and we also get higher
quality and better-vetted results for other locales.

Note: This also makes formatted strings shorter by eliminating zeros.
For example, what was previously shown as "2d 0h 15m" is now shown as
"2d 15m".

Bug: 36994779
Bug: 37701311
Test: make -j RunSettingsRoboTests
Change-Id: I78fd09e4e7f63f41ef88d3d3fc4ba2be15e1d812

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