OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agoFix ClassScanner and re-enable CodeInspectionTest tests
Antony Sargent [Thu, 31 Aug 2017 20:34:06 +0000 (13:34 -0700)]
Fix ClassScanner and re-enable CodeInspectionTest tests

This fixes the code in ClassScanner for finding all classes in a given
package to not depend on directory entries in the .jar files generated
by the build system. This dependency caused our tests in
CodeInspepectionTest.java to fail when this CL:

https://android-review.googlesource.com/#/c/platform/build/+/456418/

stopped adding directory entries in the .jar files generated by the
build process. Instead of depending on directories being present in the
list of resources provided by the classloader, this CL switches to using
Guava's ClassPath class to enumerate all loadable classes and filter
them to the ones in the package of interest.

Change-Id: I583919096450b61d4816256be280e2f5f1ce2316
Fixes: 64840107
Test: make RunSettingsRoboTests

6 years agoMerge "Bluetooth: do not dimiss fragment when Activity.finish() is called" into oc...
Jack He [Thu, 31 Aug 2017 19:54:20 +0000 (19:54 +0000)]
Merge "Bluetooth: do not dimiss fragment when Activity.finish() is called" into oc-mr1-dev am: bf66bf30b1
am: 4dddaf18e1

Change-Id: I249a0a3fc1a8c030041cfca8b3dbd49bc2badf07

6 years agoMerge "Bluetooth: do not dimiss fragment when Activity.finish() is called" into oc...
Jack He [Thu, 31 Aug 2017 19:25:33 +0000 (19:25 +0000)]
Merge "Bluetooth: do not dimiss fragment when Activity.finish() is called" into oc-mr1-dev
am: bf66bf30b1

Change-Id: Id5f413c21eb39e540d2417f9c19b7553f57d6b6a

6 years agoMerge "Bluetooth: do not dimiss fragment when Activity.finish() is called" into oc...
TreeHugger Robot [Thu, 31 Aug 2017 19:16:50 +0000 (19:16 +0000)]
Merge "Bluetooth: do not dimiss fragment when Activity.finish() is called" into oc-mr1-dev

6 years agoresolve merge conflicts of 94c5202965 to oc-dr1-dev am: f65e790ba0 -s ours am: 8d9e3...
Phil Weaver [Thu, 31 Aug 2017 19:08:18 +0000 (19:08 +0000)]
resolve merge conflicts of 94c5202965 to oc-dr1-dev am: f65e790ba0  -s ours am: 8d9e305d84  -s ours
am: 60a0a021d1  -s ours

Change-Id: Ic5166d81882bcb5b03cdd6ee072dc7855b40e3aa

6 years agoMerge "Tint the work icon." into oc-mr1-dev am: 260ec8b9ea
Daniel Nishi [Thu, 31 Aug 2017 18:19:33 +0000 (18:19 +0000)]
Merge "Tint the work icon." into oc-mr1-dev am: 260ec8b9ea
am: 270f217c9f

Change-Id: I918a29fb927ddb578933f64cc989b321e81376e0

6 years agoresolve merge conflicts of 94c5202965 to oc-dr1-dev am: f65e790ba0 am: f8a7b8aff0...
Phil Weaver [Thu, 31 Aug 2017 18:18:44 +0000 (18:18 +0000)]
resolve merge conflicts of 94c5202965 to oc-dr1-dev am: f65e790ba0 am: f8a7b8aff0  -s ours
am: d88b7364d8  -s ours

Change-Id: I81d6961428e04f5751a479525756fae14fe5a503

6 years agoresolve merge conflicts of 94c5202965 to oc-dr1-dev am: f65e790ba0 -s ours
Phil Weaver [Thu, 31 Aug 2017 18:06:49 +0000 (18:06 +0000)]
resolve merge conflicts of 94c5202965 to oc-dr1-dev am: f65e790ba0  -s ours
am: 8d9e305d84  -s ours

Change-Id: I97f195764e77daba922c7b855d50e41f29e512c9

6 years agoMerge "Tint the work icon." into oc-mr1-dev
Daniel Nishi [Thu, 31 Aug 2017 17:46:01 +0000 (17:46 +0000)]
Merge "Tint the work icon." into oc-mr1-dev
am: 260ec8b9ea

Change-Id: I4315981fab4efde7197e1026f2a2ba140647252b

6 years agoresolve merge conflicts of 94c5202965 to oc-dr1-dev am: f65e790ba0
Phil Weaver [Thu, 31 Aug 2017 17:37:09 +0000 (17:37 +0000)]
resolve merge conflicts of 94c5202965 to oc-dr1-dev am: f65e790ba0
am: f8a7b8aff0  -s ours

Change-Id: I2430a1e15414366ba054c5d67a31c01e0b3b9725

6 years agoresolve merge conflicts of 94c5202965 to oc-dr1-dev
Phil Weaver [Thu, 31 Aug 2017 17:34:40 +0000 (17:34 +0000)]
resolve merge conflicts of 94c5202965 to oc-dr1-dev
am: f65e790ba0

Change-Id: Id77101229f9c4ceca346f7c2d281d9602f3dd204

6 years agoresolve merge conflicts of 94c5202965 to oc-dr1-dev
Phil Weaver [Thu, 31 Aug 2017 17:34:39 +0000 (17:34 +0000)]
resolve merge conflicts of 94c5202965 to oc-dr1-dev
am: f65e790ba0  -s ours

Change-Id: Ie761a3c3472ba8ae2c54acc32c1368378bc54fb5

6 years agoMerge "Tint the work icon." into oc-mr1-dev
Daniel Nishi [Thu, 31 Aug 2017 17:20:14 +0000 (17:20 +0000)]
Merge "Tint the work icon." into oc-mr1-dev

6 years agoMerge "Settings: Enable HAL HDR+ by default" into oc-mr1-dev am: 13991ff9f3
Zhijun He [Thu, 31 Aug 2017 05:10:20 +0000 (05:10 +0000)]
Merge "Settings: Enable HAL HDR+ by default" into oc-mr1-dev am: 13991ff9f3
am: 7b63402f83

Change-Id: Ia7850a88a3582d9383493a58d5e4b617536b81c0

6 years agoMisc icon updates am: 24dc1ab39e
Fan Zhang [Thu, 31 Aug 2017 04:44:02 +0000 (04:44 +0000)]
Misc icon updates am: 24dc1ab39e
am: cfe72f13dc

Change-Id: I5d311d247199e5cb05b2e9460f47a42cd34aec62

6 years agoMerge "Settings: Enable HAL HDR+ by default" into oc-mr1-dev
Zhijun He [Thu, 31 Aug 2017 04:25:28 +0000 (04:25 +0000)]
Merge "Settings: Enable HAL HDR+ by default" into oc-mr1-dev
am: 13991ff9f3

Change-Id: I47e318a843dcec3192999c2ba168ba646541e3af

6 years agoMerge "Settings: Enable HAL HDR+ by default" into oc-mr1-dev
Zhijun He [Thu, 31 Aug 2017 04:20:59 +0000 (04:20 +0000)]
Merge "Settings: Enable HAL HDR+ by default" into oc-mr1-dev

6 years agoMisc icon updates
Fan Zhang [Thu, 31 Aug 2017 03:24:36 +0000 (03:24 +0000)]
Misc icon updates
am: 24dc1ab39e

Change-Id: I3db014aa9b51b12226d9f616de73f757cd6f9dd4

6 years agoMerge "Fix Settings crashes after tapping "Learn more" in fingerprint page" am: 10861...
Maurice Lam [Thu, 31 Aug 2017 02:46:39 +0000 (02:46 +0000)]
Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page" am: 108611ff34 am: 61c8796a5e am: 46a04ecca1
am: fe38bfd742

Change-Id: I127d7959ee57d8ada7aaa2ab322cd464dba0a8ea

6 years agoMerge "Fix Settings crashes after tapping "Learn more" in fingerprint page" am: 10861...
Maurice Lam [Thu, 31 Aug 2017 02:39:41 +0000 (02:39 +0000)]
Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page" am: 108611ff34 am: 61c8796a5e
am: 46a04ecca1

Change-Id: I865f8da9a0bbf7be9e6ec74b27b55300c604bde0

6 years agoMerge "Fix Settings crashes after tapping "Learn more" in fingerprint page" am: 10861...
Maurice Lam [Thu, 31 Aug 2017 02:33:02 +0000 (02:33 +0000)]
Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page" am: 108611ff34
am: 61c8796a5e

Change-Id: Ib9c5f652ebafe278ac444a0b3bf9d32aa6b37ac3

6 years agoMerge "Fix Settings crashes after tapping "Learn more" in fingerprint page"
Maurice Lam [Thu, 31 Aug 2017 02:10:37 +0000 (02:10 +0000)]
Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page"
am: 108611ff34

Change-Id: Ica93d3824f2ebf2ae8207967f1415ebeb8094d2b

6 years agoMerge "Fix Settings crashes after tapping "Learn more" in fingerprint page"
Maurice Lam [Thu, 31 Aug 2017 02:04:01 +0000 (02:04 +0000)]
Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page"

6 years agoBluetooth: do not dimiss fragment when Activity.finish() is called
Jack He [Wed, 30 Aug 2017 23:12:45 +0000 (16:12 -0700)]
Bluetooth: do not dimiss fragment when Activity.finish() is called

* When Activity.finish() is called, it's associtated fragments are all
  dismissed automatically
* Cached used fragments are dimissed in onCreate() before new ones are
  created

Bug: 62230203
Test: Pair with Bluetooth device, Settings unit tests
Change-Id: Ieca88ba0660c5407f0d88d572d06a722c642ac39

6 years agoMisc icon updates
Fan Zhang [Wed, 30 Aug 2017 22:18:27 +0000 (15:18 -0700)]
Misc icon updates

Fixes: 65204006
Test: visual
Change-Id: I4414438abdfe1726458d454b331ec0e2ce77fcb7

6 years agoresolve merge conflicts of 94c5202965 to oc-dr1-dev
Phil Weaver [Tue, 29 Aug 2017 20:36:21 +0000 (13:36 -0700)]
resolve merge conflicts of 94c5202965 to oc-dr1-dev

Bug: 62196835
Test: I solemnly swear I tested this conflict resolution.

Merged-In: I7c8d8b4143a5dd1cb684c31c4503608c8d5be0e3
Change-Id: I1bd77f165d1206ea139961bc0c42ad74c1d4bfaf

6 years agoMerge "Add device/profile app check in background check" into oc-mr1-dev am: f5d7db2cfa
Lei Yu [Wed, 30 Aug 2017 17:21:30 +0000 (17:21 +0000)]
Merge "Add device/profile app check in background check" into oc-mr1-dev am: f5d7db2cfa
am: ec8007b426

Change-Id: I118fee2b974a0815d21d422358250281da9804f0

6 years agoMerge "Add device/profile app check in background check" into oc-mr1-dev
Lei Yu [Wed, 30 Aug 2017 17:15:02 +0000 (17:15 +0000)]
Merge "Add device/profile app check in background check" into oc-mr1-dev
am: f5d7db2cfa

Change-Id: I7ffb1cd690b638f4266b5e37913510f545b780b9

6 years agoMerge "Add device/profile app check in background check" into oc-mr1-dev
Lei Yu [Wed, 30 Aug 2017 17:02:21 +0000 (17:02 +0000)]
Merge "Add device/profile app check in background check" into oc-mr1-dev

6 years agoImport translations. DO NOT MERGE am: ef5d680cc4 -s ours
Bill Yi [Wed, 30 Aug 2017 02:55:24 +0000 (02:55 +0000)]
Import translations. DO NOT MERGE am: ef5d680cc4  -s ours
am: 148fc939ec  -s ours

Change-Id: Ia39834c2fca1f9f21c435131e386acf1fcae7621

6 years agoMerge "Move tests from tests/app/ to tests/unit/"
TreeHugger Robot [Wed, 30 Aug 2017 01:58:35 +0000 (01:58 +0000)]
Merge "Move tests from tests/app/ to tests/unit/"

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 30 Aug 2017 00:47:17 +0000 (00:47 +0000)]
Import translations. DO NOT MERGE
am: ef5d680cc4  -s ours

Change-Id: Ifd5d14c131d2df9f80201145b4cbc244d40b768b

6 years agoAdd device/profile app check in background check
jackqdyulei [Tue, 22 Aug 2017 18:25:30 +0000 (11:25 -0700)]
Add device/profile app check in background check

If app is device or profile app, we disable the background check
toggle. This cl also create an util method for this check and
remove duplicate code

Bug: 64665807
Test: RunSettingsRoboTests
Change-Id: Id8336eadaac8832327bc3653aaa7dfbacde352ac

6 years agoMerge "Fix power usage detail page is launched in wrong user"
TreeHugger Robot [Tue, 29 Aug 2017 22:42:47 +0000 (22:42 +0000)]
Merge "Fix power usage detail page is launched in wrong user"

6 years agoMove tests from tests/app/ to tests/unit/
Doris Ling [Mon, 28 Aug 2017 23:05:39 +0000 (16:05 -0700)]
Move tests from tests/app/ to tests/unit/

- second round, move all remaining items
- removed SoundSettingsIntegrationTest and DashboardAdapterTest as they
are obsolete.

Fixes: 62103184
Test: make SettingsUnitTests
Change-Id: Idc2eeb285acd209ef2d00c5451fff697002e1734

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 29 Aug 2017 21:36:06 +0000 (14:36 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I334be8406b13c2b00047753ed84f62cf6ae71fbd

6 years agoTint the work icon.
Daniel Nishi [Mon, 21 Aug 2017 22:39:54 +0000 (15:39 -0700)]
Tint the work icon.

Bug: 64475406
Test: Manual
Change-Id: Ibe817a9c099439db91aca1a858e5cf5562fa6a4a

6 years agoMerge "Fix to show correct value for data limit setting" into oc-mr1-dev am: 99d524e52b
Steven Timotius [Tue, 29 Aug 2017 19:49:14 +0000 (19:49 +0000)]
Merge "Fix to show correct value for data limit setting" into oc-mr1-dev am: 99d524e52b
am: 83018be30d

Change-Id: I920b3a94ac65a94d165fad18dbdc3bec8b63a59c

6 years agoMerge "Fix to show correct value for data limit setting" into oc-mr1-dev
Steven Timotius [Tue, 29 Aug 2017 19:36:42 +0000 (19:36 +0000)]
Merge "Fix to show correct value for data limit setting" into oc-mr1-dev
am: 99d524e52b

Change-Id: I5f8c8ef2fa9f1fe8cb2329c7f8603441b26d36a7

6 years agoMerge "Fix to show correct value for data limit setting" into oc-mr1-dev
TreeHugger Robot [Tue, 29 Aug 2017 19:28:31 +0000 (19:28 +0000)]
Merge "Fix to show correct value for data limit setting" into oc-mr1-dev

6 years agoMerge "Prevent race condition between SavedQuery and Query Loader" into oc-mr1-dev...
Matthew Fritze [Tue, 29 Aug 2017 19:03:11 +0000 (19:03 +0000)]
Merge "Prevent race condition between SavedQuery and Query Loader" into oc-mr1-dev am: 3042af11f0
am: 2980aecd96

Change-Id: I092b68b491669505dc2e46029d19c1fcc4061836

6 years agoMerge "Prevent race condition between SavedQuery and Query Loader" into oc-mr1-dev
Matthew Fritze [Tue, 29 Aug 2017 18:51:41 +0000 (18:51 +0000)]
Merge "Prevent race condition between SavedQuery and Query Loader" into oc-mr1-dev
am: 3042af11f0

Change-Id: I95fc4f482d864f6bf8283b10236b74bd8cddf9e1

6 years agoMerge "Prevent race condition between SavedQuery and Query Loader" into oc-mr1-dev
TreeHugger Robot [Tue, 29 Aug 2017 18:42:25 +0000 (18:42 +0000)]
Merge "Prevent race condition between SavedQuery and Query Loader" into oc-mr1-dev

6 years agoMerge "Modify notification string."
TreeHugger Robot [Tue, 29 Aug 2017 17:59:32 +0000 (17:59 +0000)]
Merge "Modify notification string."

6 years agoFix to show correct value for data limit setting
Steven Timotius [Wed, 23 Aug 2017 00:47:12 +0000 (17:47 -0700)]
Fix to show correct value for data limit setting

Bug: 64901297
Test: Manually set a value for data limit in Settings, verify text is correct
Change-Id: Ieec3ce39b55754b54caefd2be923afe9883682b1
(cherry picked from commit 72ebf8fe356bfbca3eeaf7c9b3dfa807c5b458bc)

6 years agoPrevent race condition between SavedQuery and Query Loader
Matthew Fritze [Wed, 16 Aug 2017 22:45:52 +0000 (15:45 -0700)]
Prevent race condition between SavedQuery and Query Loader

SearchFragment and SavedQueryLoader share a loader manager
and had been using the same loader id for different
loaders.

Occaisionally (in monkey tests) two loaders with the same
IDs would be started and crash when they finished.

The loaders now have different IDs.

Change-Id: I11e9b7365605fbcef44cf7d2323183415422f5c8
Fixes: 64756515
Test: robotests

6 years agoModify notification string.
yuemingw [Thu, 24 Aug 2017 14:09:26 +0000 (15:09 +0100)]
Modify notification string.

Bug: 30432840
Test: Reproduced the problem by clicking 'Install from SD card' and the
new notification string appears instead of the old one.

Change-Id: I38a6fc6212aa283f8a899c28db81d8dae4245396

6 years agoFix power usage detail page is launched in wrong user
Tony Mak [Mon, 14 Aug 2017 13:36:52 +0000 (14:36 +0100)]
Fix power usage detail page is launched in wrong user

Two issues:
1. UID of settings app == system UID. But isSystemUid failed to recognize
Settings in secondary user is also a system uid.
2. For USER drain type, we should launch the detail page in current
   user.

Fix: 64506728
Test: make ROBOTEST_FILTER=AdvancedPowerUsageDetailTest -j40 RunSettingsRoboTests
Test: Switch to seconday user. Go to Settings->Battery, tap owner user
      battery entry, observe that detail page is shown.
Test: Stay long enough in Settings app, make sure no
      either Settings nor Android Framework battery entry.

Change-Id: I8d66ad55f18fcb3d9567b3bf753f737f5b98c609

6 years agoSeparate multiple DNS addresses with newlines. am: 2716e841be
Sundeep Ghuman [Tue, 29 Aug 2017 04:57:47 +0000 (04:57 +0000)]
Separate multiple DNS addresses with newlines. am: 2716e841be
am: cf37a26795

Change-Id: I61bcfc20d43133c12fb8fe78d7bd968af1ee59eb

6 years agoSeparate multiple DNS addresses with newlines.
Sundeep Ghuman [Tue, 29 Aug 2017 04:49:28 +0000 (04:49 +0000)]
Separate multiple DNS addresses with newlines.
am: 2716e841be

Change-Id: I676b5de60477f7c905b08b8bb361104e5f1e05b9

6 years agoSeparate multiple DNS addresses with newlines.
Sundeep Ghuman [Tue, 29 Aug 2017 00:20:02 +0000 (17:20 -0700)]
Separate multiple DNS addresses with newlines.

Bug: b/65037256
Test: make -j40 RunSettingsRoboTests
Change-Id: I4b0709648f8e236177ea73338cfb0d42a5971c06

6 years agoBackport overlay security fix
Phil Weaver [Sat, 19 Aug 2017 01:08:12 +0000 (18:08 -0700)]
Backport overlay security fix

Replacing app opps fix with the flag that is used
elsewhere.

Bug: 37442941
Test: Verified that toast and system overlay still goes
away on permission and a11y service capability screens.

Merged-In: I7c8d8b4143a5dd1cb684c31c4503608c8d5be0e3

Change-Id: I858f3585b2e7d334cddcf38bd0ac6481e778b6b6

6 years agoMerge "Fix crash in developer settings when backup is not available" into oc-mr1...
Alex Vakulenko [Tue, 29 Aug 2017 00:19:21 +0000 (00:19 +0000)]
Merge "Fix crash in developer settings when backup is not available" into oc-mr1-dev am: 6f72b57428
am: f76056c576

Change-Id: Ibd4c1b1ddcd83e77a9c2a14d7aa6c92f5088e6c4

6 years agoMerge "Fix crash in developer settings when backup is not available" into oc-mr1-dev
Alex Vakulenko [Mon, 28 Aug 2017 23:45:19 +0000 (23:45 +0000)]
Merge "Fix crash in developer settings when backup is not available" into oc-mr1-dev
am: 6f72b57428

Change-Id: I96f26ec23db34ff642a11cbcdef888fa9e5072bf

6 years agoMerge "Fix crash in developer settings when backup is not available" into oc-mr1-dev
TreeHugger Robot [Mon, 28 Aug 2017 23:15:26 +0000 (23:15 +0000)]
Merge "Fix crash in developer settings when backup is not available" into oc-mr1-dev

6 years agoMerge "Remove subtitle for Recent location apps" into oc-mr1-dev am: ccbb613fa9
jackqdyulei [Mon, 28 Aug 2017 20:48:57 +0000 (20:48 +0000)]
Merge "Remove subtitle for Recent location apps" into oc-mr1-dev am: ccbb613fa9
am: f54f8e3d5a

Change-Id: I3f98fe4eb71d456b188d8bfa48c64f6bc3bb2f26

6 years agoMerge "Remove subtitle for Recent location apps" into oc-mr1-dev
jackqdyulei [Mon, 28 Aug 2017 20:16:04 +0000 (20:16 +0000)]
Merge "Remove subtitle for Recent location apps" into oc-mr1-dev
am: ccbb613fa9

Change-Id: I7307cbd56949ea995906cc47f67afa660f50d0a0

6 years agoMerge "Remove subtitle for Recent location apps" into oc-mr1-dev
TreeHugger Robot [Mon, 28 Aug 2017 19:55:39 +0000 (19:55 +0000)]
Merge "Remove subtitle for Recent location apps" into oc-mr1-dev

6 years agoMerge changes from topics "anomaly_test_app_step_6", "anomaly_test_app_step_5" into...
Lei Yu [Mon, 28 Aug 2017 17:50:33 +0000 (17:50 +0000)]
Merge changes from topics "anomaly_test_app_step_6", "anomaly_test_app_step_5" into oc-mr1-dev am: 088393596e
am: 3f1dfc21ec

Change-Id: Ica312c451476d5e0180e94f8b7f04d5848b19db3

6 years agoMerge changes from topics "anomaly_test_app_step_6", "anomaly_test_app_step_5" into...
Lei Yu [Mon, 28 Aug 2017 17:45:38 +0000 (17:45 +0000)]
Merge changes from topics "anomaly_test_app_step_6", "anomaly_test_app_step_5" into oc-mr1-dev
am: 088393596e

Change-Id: I93f50785f54b1287167f1f87c91167365b295a64

6 years agoMerge changes from topics "anomaly_test_app_step_6", "anomaly_test_app_step_5" into...
Lei Yu [Mon, 28 Aug 2017 17:35:59 +0000 (17:35 +0000)]
Merge changes from topics "anomaly_test_app_step_6", "anomaly_test_app_step_5" into oc-mr1-dev

* changes:
  Add functional test for wakelock anomaly detector
  Add functional test for bt anomaly detector

6 years agoBluetooth: Only show devices when their names are resolved am: 19ba320263
Jack He [Sat, 26 Aug 2017 03:03:03 +0000 (03:03 +0000)]
Bluetooth: Only show devices when their names are resolved am: 19ba320263
am: 7a6aadce4b

Change-Id: I93ab225467dfbb51c77ea9dfde0e3082a845624c

6 years agoBluetooth: Only show devices when their names are resolved
Jack He [Sat, 26 Aug 2017 02:51:48 +0000 (02:51 +0000)]
Bluetooth: Only show devices when their names are resolved
am: 19ba320263

Change-Id: I23300ac9541f88b3aeb978be0771e93b85fe834f

6 years agoFix crash in developer settings when backup is not available
Alex Vakulenko [Sat, 26 Aug 2017 00:44:36 +0000 (17:44 -0700)]
Fix crash in developer settings when backup is not available

When backup feature is disabled, Developer Settings dialog does
not come up due to a crash.

Disable Backup Password option in the preference screen.

Bug: 64725174
Test: Developer settings dialog comes up and Backup password is
      disabled on Polaris

Change-Id: I4f4546c4e97d2e5128ec65c0532691d9799b4c8f

6 years agoBluetooth: Only show devices when their names are resolved
Jack He [Thu, 1 Jun 2017 01:37:28 +0000 (18:37 -0700)]
Bluetooth: Only show devices when their names are resolved

* Add a developer menu option to allow name-less devices to be shown
  when a Bluetooth developer needs it, but hide it for non-developer
  users.
* Set BluetoothDevicePreference to invisible when CachedBluetoothDevice
  does not have a name besides MAC address and the above developer option
  is false.
* This affects BluetoothPairingDetail and DevicePickerFragment, but does
  not affect BluetoothSettings. BluetoothSettings will show all paired
  devices regardless whether an user friendly name exists.

Bug: 34685932
Test: pair Bluetooth device, send file over Bluetooth, unit tests
Change-Id: Idd7ad4b1671dfdcf3204efb50eddb6dae1065aa5

6 years agoRemove subtitle for Recent location apps
jackqdyulei [Fri, 25 Aug 2017 21:37:39 +0000 (14:37 -0700)]
Remove subtitle for Recent location apps

Bug: 65011654
Test: Screenshot
Change-Id: I840e6ee8f755b4bbb5392a80224dc5b4b19a8054

6 years agoAdd functional test for wakelock anomaly detector
jackqdyulei [Thu, 17 Aug 2017 22:06:06 +0000 (15:06 -0700)]
Add functional test for wakelock anomaly detector

Bug: 63815938
Test: runtest -x WakelockAnomalyTest
Change-Id: I4d10d5be8b38264f29c67c2c945fdbbd1090430d

6 years agoAdd functional test for bt anomaly detector
jackqdyulei [Thu, 17 Aug 2017 21:26:01 +0000 (14:26 -0700)]
Add functional test for bt anomaly detector

This cl:
Set up the environment for functional test
1. Update Android.mk by adding instrumentation and libs
2. Update AndroidManifest.xml by adding runner

Add functional test for bt anomaly, with the following workflow
1. reset battery stats
2. pretend unplug and screen off
3. Start AnomalyTester app, set values and click start button
4. Wait its running
5. Check anomaly preference in battery main page
6. reset all parameters

Bug: 63815938
Test: runtest -x BluetoothAnomalyTest
Change-Id: Ief02a314d21f6c32d70729047a1d4bdce9ad9920

6 years agoMerge "Add battery indicator to bluetooth icon" into oc-mr1-dev am: 77bd8c3a73
jackqdyulei [Fri, 25 Aug 2017 18:50:54 +0000 (18:50 +0000)]
Merge "Add battery indicator to bluetooth icon" into oc-mr1-dev am: 77bd8c3a73
am: c26876ade7  -s ours

Change-Id: I770e50ee18b8aa387fd3bcede93a10ba7922ae6b

6 years agoMerge "Add battery indicator to bluetooth icon" into oc-mr1-dev
jackqdyulei [Fri, 25 Aug 2017 18:37:53 +0000 (18:37 +0000)]
Merge "Add battery indicator to bluetooth icon" into oc-mr1-dev
am: 77bd8c3a73

Change-Id: I36f5729dd042c88c9f8d6a2d4abf720a05748246

6 years agoMerge "Add battery indicator to bluetooth icon" into oc-mr1-dev
TreeHugger Robot [Fri, 25 Aug 2017 18:25:03 +0000 (18:25 +0000)]
Merge "Add battery indicator to bluetooth icon" into oc-mr1-dev

6 years agoMerge "Re-init storage size on resume." into oc-mr1-dev am: 2b53a8467c
Daniel Nishi [Fri, 25 Aug 2017 17:19:00 +0000 (17:19 +0000)]
Merge "Re-init storage size on resume." into oc-mr1-dev am: 2b53a8467c
am: f2094821e8

Change-Id: I5204fbf3771778cb0597e8ad6d493b0a0645511c

6 years agoMerge "Re-init storage size on resume." into oc-mr1-dev
Daniel Nishi [Fri, 25 Aug 2017 17:09:52 +0000 (17:09 +0000)]
Merge "Re-init storage size on resume." into oc-mr1-dev
am: 2b53a8467c

Change-Id: I698897d5c21decadfaf437880a81e754939df850

6 years agoMerge "Re-init storage size on resume." into oc-mr1-dev
Daniel Nishi [Fri, 25 Aug 2017 16:51:45 +0000 (16:51 +0000)]
Merge "Re-init storage size on resume." into oc-mr1-dev

6 years agoMerge "Add wakelock action in testing app" into oc-mr1-dev am: 08fecc4143
jackqdyulei [Fri, 25 Aug 2017 03:48:50 +0000 (03:48 +0000)]
Merge "Add wakelock action in testing app" into oc-mr1-dev am: 08fecc4143
am: 6896e1ef05

Change-Id: I55f427850f7d1accda9594ca2b20cf97d4937be0

6 years agoMerge "Fix jank in showing conditions and suggestions in cold start." into oc-mr1...
Doris Ling [Fri, 25 Aug 2017 03:48:07 +0000 (03:48 +0000)]
Merge "Fix jank in showing conditions and suggestions in cold start." into oc-mr1-dev am: 51c83353fe
am: e80bb0d5ce

Change-Id: Id3de7150516804bc7a08c665943769c27173fc9a

6 years agoMerge "Add wakelock action in testing app" into oc-mr1-dev
jackqdyulei [Fri, 25 Aug 2017 03:44:25 +0000 (03:44 +0000)]
Merge "Add wakelock action in testing app" into oc-mr1-dev
am: 08fecc4143

Change-Id: Id3125640f4d62da1161b9e894577c6285fe7c83a

6 years agoMerge "Fix jank in showing conditions and suggestions in cold start." into oc-mr1-dev
Doris Ling [Fri, 25 Aug 2017 03:43:37 +0000 (03:43 +0000)]
Merge "Fix jank in showing conditions and suggestions in cold start." into oc-mr1-dev
am: 51c83353fe

Change-Id: I869238f4c9198dbd167ab02d18e41e0e67001c38

6 years agoMerge "Add wakelock action in testing app" into oc-mr1-dev
TreeHugger Robot [Fri, 25 Aug 2017 03:35:46 +0000 (03:35 +0000)]
Merge "Add wakelock action in testing app" into oc-mr1-dev

6 years agoMerge "Fix jank in showing conditions and suggestions in cold start." into oc-mr1-dev
TreeHugger Robot [Fri, 25 Aug 2017 03:34:34 +0000 (03:34 +0000)]
Merge "Fix jank in showing conditions and suggestions in cold start." into oc-mr1-dev

6 years agoMerge "Add bt anomaly action in testing app" into oc-mr1-dev am: 4aaacaf7e3
jackqdyulei [Fri, 25 Aug 2017 01:53:28 +0000 (01:53 +0000)]
Merge "Add bt anomaly action in testing app" into oc-mr1-dev am: 4aaacaf7e3
am: d52c9708b5

Change-Id: I5122c905e3227b5fb26286a87bbf879a0fce9fb1

6 years agoMerge "Add bt anomaly action in testing app" into oc-mr1-dev
jackqdyulei [Fri, 25 Aug 2017 01:49:28 +0000 (01:49 +0000)]
Merge "Add bt anomaly action in testing app" into oc-mr1-dev
am: 4aaacaf7e3

Change-Id: Icc5588c0fde97908d371452c622980fddae054df

6 years agoMerge "Add bt anomaly action in testing app" into oc-mr1-dev
TreeHugger Robot [Fri, 25 Aug 2017 01:38:53 +0000 (01:38 +0000)]
Merge "Add bt anomaly action in testing app" into oc-mr1-dev

6 years agoMerge "Scroll to top when user connects to a network." into oc-mr1-dev am: a253e1d416
Sundeep Ghuman [Fri, 25 Aug 2017 00:57:11 +0000 (00:57 +0000)]
Merge "Scroll to top when user connects to a network." into oc-mr1-dev am: a253e1d416
am: 501975914c

Change-Id: Ic3489f58b427ee0be5b3ad39a801af02ec15835b

6 years agoMerge "Scroll to top when user connects to a network." into oc-mr1-dev
Sundeep Ghuman [Fri, 25 Aug 2017 00:38:58 +0000 (00:38 +0000)]
Merge "Scroll to top when user connects to a network." into oc-mr1-dev
am: a253e1d416

Change-Id: I4309bdd864d7da5a0b33e744d28feafe9966012b

6 years agoMerge "Fix typo in fingerprint string"
Maurice Lam [Fri, 25 Aug 2017 00:31:02 +0000 (00:31 +0000)]
Merge "Fix typo in fingerprint string"

6 years agoMerge "Scroll to top when user connects to a network." into oc-mr1-dev
TreeHugger Robot [Fri, 25 Aug 2017 00:12:51 +0000 (00:12 +0000)]
Merge "Scroll to top when user connects to a network." into oc-mr1-dev

6 years agoAdd battery indicator to bluetooth icon
jackqdyulei [Wed, 9 Aug 2017 16:57:27 +0000 (09:57 -0700)]
Add battery indicator to bluetooth icon

This cl change util method in bluetooth package to return
drawable instead of resId.

If the bt device has battery level, then method return customized
layerDrawable, otherwise return a simple drawable created from
resId.

Bug: 63393322
Test: RunSettingsRoboTests

Change-Id: Ib21822eafda0e8570212ce5cb070478e4f4876a2
Merged-In: Ib21822eafda0e8570212ce5cb070478e4f4876a2

6 years agoMerge "Add battery indicator to bluetooth icon"
Lei Yu [Thu, 24 Aug 2017 23:39:35 +0000 (23:39 +0000)]
Merge "Add battery indicator to bluetooth icon"

6 years agoAdd wakelock action in testing app
jackqdyulei [Wed, 16 Aug 2017 00:02:58 +0000 (17:02 -0700)]
Add wakelock action in testing app

This cl adds action to hold the wakelock for specific time. With
this action we could test whether wakelock detector is effective.

Bug: 2731722
Test: make -j40 AnomalyTester
Change-Id: I1d44c12363f126ea9b8fc44f4c135e46b898186c

6 years agoAdd bt anomaly action in testing app
jackqdyulei [Tue, 15 Aug 2017 17:12:14 +0000 (10:12 -0700)]
Add bt anomaly action in testing app

This cl adds the action to start bluttooth unoptimized scanning.
With this action we could test whether bt anomaly detector is
effective.

Bug: 62602318
Test: make -j40 AnomalyTester
Change-Id: I7f41dbb07384fbf3c5a81e460a3629306bc33f59

6 years agoMerge "Move the Robolectric shadow config up." into oc-mr1-dev am: efcc8be05c
Daniel Nishi [Thu, 24 Aug 2017 22:15:39 +0000 (22:15 +0000)]
Merge "Move the Robolectric shadow config up." into oc-mr1-dev am: efcc8be05c
am: 5f97c05f1c

Change-Id: I46c4a921a25ef17197e90038ff71a982a192aae7

6 years agoMerge "Move the Robolectric shadow config up." into oc-mr1-dev
Daniel Nishi [Thu, 24 Aug 2017 21:24:31 +0000 (21:24 +0000)]
Merge "Move the Robolectric shadow config up." into oc-mr1-dev
am: efcc8be05c

Change-Id: Ie816d276fe196452f38c88ca1f944dd040f19321

6 years agoFix jank in showing conditions and suggestions in cold start.
Doris Ling [Thu, 24 Aug 2017 20:09:57 +0000 (13:09 -0700)]
Fix jank in showing conditions and suggestions in cold start.

When we first initialize the dashboard view, and register the condition
listener, it will trigger the condition changed callback immediately.
This results in unnecessary refresh of the dashboard header. Add check
to not do the refresh when we first initialize the view.

Change-Id: If7c69637463734c150b7f5eb7f3c042cf73837fa
Fixes: 64811475
Test: make RunSettingsRoboTests

6 years agoAdd battery indicator to bluetooth icon
jackqdyulei [Wed, 9 Aug 2017 16:57:27 +0000 (09:57 -0700)]
Add battery indicator to bluetooth icon

This cl change util method in bluetooth package to return
drawable instead of resId.

If the bt device has battery level, then method return customized
layerDrawable, otherwise return a simple drawable created from
resId.

Bug: 63393322
Test: RunSettingsRoboTests

Change-Id: Ib21822eafda0e8570212ce5cb070478e4f4876a2

6 years agoFix typo in fingerprint string
Maurice Lam [Thu, 24 Aug 2017 19:39:38 +0000 (12:39 -0700)]
Fix typo in fingerprint string

Test: Manual
Bug: 65017285
Change-Id: I3664cc4b888c4c573b439f06f1ef9983d0470674

6 years agoMerge "Move the Robolectric shadow config up." into oc-mr1-dev
TreeHugger Robot [Thu, 24 Aug 2017 19:27:23 +0000 (19:27 +0000)]
Merge "Move the Robolectric shadow config up." into oc-mr1-dev

6 years agoMerge "Use fallback linespacing in ChartSweepView and ChartGridView"
Roozbeh Pournader [Thu, 24 Aug 2017 19:24:01 +0000 (19:24 +0000)]
Merge "Use fallback linespacing in ChartSweepView and ChartGridView"

6 years agoMerge "Add UI components for bluetooth anomaly" into oc-mr1-dev am: 3949ed53a9
Lei Yu [Thu, 24 Aug 2017 17:46:29 +0000 (17:46 +0000)]
Merge "Add UI components for bluetooth anomaly" into oc-mr1-dev am: 3949ed53a9
am: a9eb0eb4bc

Change-Id: Ia427fdbec8afce9aa0133e182bde39757345e132

6 years agoMerge "Set up anomaly test app in settings" into oc-mr1-dev am: 8cac6b07bc
Lei Yu [Thu, 24 Aug 2017 17:45:52 +0000 (17:45 +0000)]
Merge "Set up anomaly test app in settings" into oc-mr1-dev am: 8cac6b07bc
am: c564686ec8

Change-Id: Id6c2f70cd547fad814e2bbf344f9e8d64fc8f64d