OSDN Git Service
Charles He [Wed, 6 Sep 2017 16:06:32 +0000 (16:06 +0000)]
Merge "Enforce wifi config lockdown on details page." into oc-mr1-dev
am:
10adff1163
Change-Id: I8aed4d127bc84c457a672cc5e524aa7ac477b15d
Charles He [Wed, 6 Sep 2017 15:59:16 +0000 (15:59 +0000)]
Merge "Enforce wifi config lockdown on details page." into oc-mr1-dev
Charles He [Sat, 2 Sep 2017 17:45:18 +0000 (18:45 +0100)]
Enforce wifi config lockdown on details page.
Fixes the bug that, on the new WifiDetailPreference page, the "Forget"
button is not disabled properly for wifi configs created and protected
by DevicePolicyManger.
Robolectric test to follow in a separate CL.
Test: manual, by locking down wifi config with TestDPC
Test: make RunSettingsRoboTests
Bug:
64971700
Bug:
65396674
Change-Id: I27740eabd5eb94415e4258c9c80f91df2d9ab476
edgar.huang [Wed, 6 Sep 2017 00:44:05 +0000 (00:44 +0000)]
Merge "Settings is crashed high probability when doing follow steps" am:
2584202cb7 am:
8f42d1a4ab
am:
e096a55f03
Change-Id: Id5ace14f946ac9cab23bcafb053e5087ae6a38a1
edgar.huang [Wed, 6 Sep 2017 00:30:44 +0000 (00:30 +0000)]
Merge "Settings is crashed high probability when doing follow steps" am:
2584202cb7
am:
8f42d1a4ab
Change-Id: Ie44be5ec6a14bc137b08d6c233704af03f4a27ad
edgar.huang [Wed, 6 Sep 2017 00:21:17 +0000 (00:21 +0000)]
Merge "Settings is crashed high probability when doing follow steps"
am:
2584202cb7
Change-Id: I6292acd5c7766c1cf13d2de4757fe4499a076f46
Treehugger Robot [Wed, 6 Sep 2017 00:12:44 +0000 (00:12 +0000)]
Merge "Settings is crashed high probability when doing follow steps"
Adrian Roos [Tue, 5 Sep 2017 18:55:47 +0000 (18:55 +0000)]
Merge "FRP: Use SUW theme for factory reset protection flow" into oc-mr1-dev
am:
d57edb708f
Change-Id: I385acf93d60bfbc98f39aa0178018e3976a39974
TreeHugger Robot [Tue, 5 Sep 2017 18:43:30 +0000 (18:43 +0000)]
Merge "FRP: Use SUW theme for factory reset protection flow" into oc-mr1-dev
Adrian Roos [Tue, 5 Sep 2017 10:37:38 +0000 (12:37 +0200)]
FRP: Use SUW theme for factory reset protection flow
Bug:
37224506
Test: adb shell settings put global device_provisioned 0 && adb shell am start -a android.app.action.CONFIRM_FRP_CREDENTIAL com.android.settings; verify it uses correct theme
Change-Id: I237d8d84840398ebfdc97bf99dce07447042b349
edgar.huang [Thu, 31 Aug 2017 03:22:25 +0000 (11:22 +0800)]
Settings is crashed high probability when doing follow steps
Enter into the fingerprint list screen and delete and identification of operation at the same time, when the item of the fingerprint verification was deleted, highlighting the item to be deleted, just so NullPointerException occurred.
Test: manual - enrolling a fingerprint and do above steps.
Daniel Nishi [Sat, 2 Sep 2017 03:39:51 +0000 (03:39 +0000)]
Merge "Make photos/videos storage preference normal." into oc-mr1-dev
am:
3d1f6abd6f
Change-Id: Ic944357091b2cd16115fd4b0f3ff0459090a3e27
TreeHugger Robot [Sat, 2 Sep 2017 03:29:52 +0000 (03:29 +0000)]
Merge "Make photos/videos storage preference normal." into oc-mr1-dev
Daniel Nishi [Wed, 23 Aug 2017 17:28:36 +0000 (10:28 -0700)]
Make photos/videos storage preference normal.
We had special behavior for it in the past, but this defines new
behavior that is much closer to what the other storage preferences do.
A photo app filter is used and a photos/video files preference exists on
it which intents over to the gallery app.
Fixes:
64147318
Test: Settings robotests
Change-Id: I47284515fe2dfcc924ae61a44bc47051e9f5fda6
Doris Ling [Sat, 2 Sep 2017 00:41:28 +0000 (00:41 +0000)]
Merge "Set drawable for the entity header app preference button." into oc-mr1-dev
am:
5fe8e76b36
Change-Id: I02625057fd4636f8ce61d5772f7ce4083fb7f81f
TreeHugger Robot [Sat, 2 Sep 2017 00:17:08 +0000 (00:17 +0000)]
Merge "Set drawable for the entity header app preference button." into oc-mr1-dev
Daniel Nishi [Fri, 1 Sep 2017 23:17:06 +0000 (23:17 +0000)]
Merge "Show work profile apps only on app list." into oc-mr1-dev
am:
8618b8649f
Change-Id: I8757ff64193dc0754b01aa769e55a355464e2d01
Amit Mahajan [Fri, 1 Sep 2017 23:15:59 +0000 (23:15 +0000)]
Merge "Change to disable mvno data field in ApnEditor if needed." into oc-mr1-dev
am:
cf11e21d47
Change-Id: Ica848195898e8d88e3882091c2a06ff4e79e55ca
Daniel Nishi [Fri, 1 Sep 2017 22:49:21 +0000 (22:49 +0000)]
Merge "Show work profile apps only on app list." into oc-mr1-dev
Amit Mahajan [Fri, 1 Sep 2017 22:42:09 +0000 (22:42 +0000)]
Merge "Change to disable mvno data field in ApnEditor if needed." into oc-mr1-dev
Doris Ling [Thu, 24 Aug 2017 22:24:33 +0000 (15:24 -0700)]
Set drawable for the entity header app preference button.
In the entity header layout, the action buttons resource is set to null by
default. When we bind the button with the app preference action, we
should also set the drawable to the settings icon as well.
Change-Id: Ic259b4c538f529671ca5a9c67664ef32fbbb25ae
Fixes:
64826061
Test: make RunSettingsRoboTests
Daniel Nishi [Fri, 11 Aug 2017 01:32:25 +0000 (18:32 -0700)]
Show work profile apps only on app list.
For the work profile drilldown, we used to show all apps when the user
drilled down into the categories. This makes it so that the drill down
only shows the work apps when that deep.
Change-Id: I492cd3e9b9b923b87b68645a871dcfb2b91b4f95
Fixes:
62963093
Test: Settings robotest
Doris Ling [Fri, 1 Sep 2017 00:47:41 +0000 (00:47 +0000)]
Update accessibility preference icon.
am:
f664c77f31
Change-Id: I53d15d3a850f5f0bdae9add3003a00b6e7c80009
Colin Cross [Thu, 31 Aug 2017 22:35:19 +0000 (22:35 +0000)]
Merge "Fix errorprone build" am:
0bed3cacd7 -s ours am:
a1bcb02184 -s ours
am:
450f423a21 -s ours
Change-Id: I4a0aff24c589b0a1eefa97b9f1c9dd144e395303
Colin Cross [Thu, 31 Aug 2017 22:27:59 +0000 (22:27 +0000)]
Merge "Fix errorprone build" am:
0bed3cacd7 -s ours
am:
a1bcb02184 -s ours
Change-Id: Ic3b3ce30a29b967189fae95ec53f52569350fa82
Colin Cross [Thu, 31 Aug 2017 22:24:00 +0000 (22:24 +0000)]
Merge "Fix errorprone build"
am:
0bed3cacd7 -s ours
Change-Id: I3c6b80920db044b842946e373dbc1efddd260de8
Treehugger Robot [Thu, 31 Aug 2017 22:16:52 +0000 (22:16 +0000)]
Merge "Fix errorprone build"
Doris Ling [Thu, 31 Aug 2017 21:58:15 +0000 (14:58 -0700)]
Update accessibility preference icon.
Change-Id: I84fb84e0a8bb422b9e453bd9b94e99bfb8a73be3
Fixes:
65256821
Test: visual
Amit Mahajan [Thu, 31 Aug 2017 20:59:20 +0000 (13:59 -0700)]
Change to disable mvno data field in ApnEditor if needed.
Test: manual
Bug:
65243262
Change-Id: I4b3dec6d9dc7fecf0b0a8131dccc349c7daffe48
Alison Cichowlas [Thu, 31 Aug 2017 20:10:19 +0000 (20:10 +0000)]
Merge "Legacy channels say "allow sound" instead of "let the app decide". We had this string already translated from use in previous ux revs." into oc-mr1-dev
am:
49d25a0506
Change-Id: I3cd8b74fd35dbbdb73512a15f368a527119a9c20
TreeHugger Robot [Thu, 31 Aug 2017 19:51:50 +0000 (19:51 +0000)]
Merge "Legacy channels say "allow sound" instead of "let the app decide". We had this string already translated from use in previous ux revs." into oc-mr1-dev
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
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
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
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
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
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
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
Daniel Nishi [Thu, 31 Aug 2017 17:20:14 +0000 (17:20 +0000)]
Merge "Tint the work icon." 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
Zhijun He [Thu, 31 Aug 2017 04:20:59 +0000 (04:20 +0000)]
Merge "Settings: Enable HAL HDR+ by default" into oc-mr1-dev
Fan Zhang [Thu, 31 Aug 2017 03:24:36 +0000 (03:24 +0000)]
Misc icon updates
am:
24dc1ab39e
Change-Id: I3db014aa9b51b12226d9f616de73f757cd6f9dd4
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
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
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
Maurice Lam [Thu, 31 Aug 2017 02:04:01 +0000 (02:04 +0000)]
Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page"
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
Fan Zhang [Wed, 30 Aug 2017 22:18:27 +0000 (15:18 -0700)]
Misc icon updates
Fixes:
65204006
Test: visual
Change-Id: I4414438abdfe1726458d454b331ec0e2ce77fcb7
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
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
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
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
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
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
Daniel Nishi [Mon, 21 Aug 2017 22:39:54 +0000 (15:39 -0700)]
Tint the work icon.
Bug:
64475406
Test: Manual
Change-Id: Ibe817a9c099439db91aca1a858e5cf5562fa6a4a
Colin Cross [Tue, 29 Aug 2017 19:14:54 +0000 (12:14 -0700)]
Fix errorprone build
Fixes:
packages/apps/Settings/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java:95: error: [MockitoCast] A bug in Mockito will cause this test to fail at runtime with a ClassCastException
when(mContext.getSystemService(AutofillManager.class)).thenReturn(mAutofillManager);
^
(see http://errorprone.info/bugpattern/MockitoCast)
Did you mean 'when((Object) mContext.getSystemService(AutofillManager.class)).thenReturn(mAutofillManager);'?
packages/apps/Settings/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java:195: error: [JUnit4TestNotRun] Test method will not be run; please add @Test annotation
public void testBindViewElements_appSearchResult() {
^
(see http://errorprone.info/bugpattern/JUnit4TestNotRun)
Did you mean '@Test'?
Bug:
64489631
Test: m -j RUN_ERROR_PRONE=true javac-check
Merged-In: I79477f331ae447d2505a1519da09886bf07ba1a2
Merged-in: I333372699b263d02cc4083289dc746c7aacd414d
Change-Id: I8fd30fc741927de3f6527aca6d98d8851ef23794
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
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
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
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
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)
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
Sundeep Ghuman [Tue, 29 Aug 2017 04:49:28 +0000 (04:49 +0000)]
Separate multiple DNS addresses with newlines.
am:
2716e841be
Change-Id: I676b5de60477f7c905b08b8bb361104e5f1e05b9
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
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
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
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
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
TreeHugger Robot [Mon, 28 Aug 2017 19:55:39 +0000 (19:55 +0000)]
Merge "Remove subtitle for Recent location apps" into oc-mr1-dev
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
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
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
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
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
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
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
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
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
TreeHugger Robot [Fri, 25 Aug 2017 18:25:03 +0000 (18:25 +0000)]
Merge "Add battery indicator to bluetooth icon" 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
Daniel Nishi [Fri, 25 Aug 2017 16:51:45 +0000 (16:51 +0000)]
Merge "Re-init storage size on resume." 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
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
TreeHugger Robot [Fri, 25 Aug 2017 03:35:46 +0000 (03:35 +0000)]
Merge "Add wakelock action in testing app" 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
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
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
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
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
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
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
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
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
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
TreeHugger Robot [Thu, 24 Aug 2017 19:27:23 +0000 (19:27 +0000)]
Merge "Move the Robolectric shadow config up." into oc-mr1-dev
Alison Cichowlas [Thu, 24 Aug 2017 18:57:28 +0000 (14:57 -0400)]
Legacy channels say "allow sound" instead of "let the app decide".
We had this string already translated from use in previous ux revs.
Change-Id: I91a9ce001a0d875c0ae12643e6b386328e9cd8de
Fixes:
62873496
Test: String change, manually verified
Lei Yu [Thu, 24 Aug 2017 17:42:09 +0000 (17:42 +0000)]
Merge "Add UI components for bluetooth anomaly" into oc-mr1-dev
am:
3949ed53a9
Change-Id: I2cfae5ecff424ff042e0a0b29a610908563b8348
Lei Yu [Thu, 24 Aug 2017 17:41:25 +0000 (17:41 +0000)]
Merge "Set up anomaly test app in settings" into oc-mr1-dev
am:
8cac6b07bc
Change-Id: I5be8aab32f4918814ab2273f608b38d4403b24d0
Lei Yu [Thu, 24 Aug 2017 17:35:15 +0000 (17:35 +0000)]
Merge "Add UI components for bluetooth anomaly" into oc-mr1-dev
Lei Yu [Thu, 24 Aug 2017 17:34:56 +0000 (17:34 +0000)]
Merge "Set up anomaly test app in settings" into oc-mr1-dev