Commit Graph

2396 Commits

Author SHA1 Message Date
Fan Zhang
ef0e290e65 Merge "Tweak bluetooth name preference" into oc-dr1-dev
am: 03c595ce24

Change-Id: I25e7a3c66fddb8b594e06ced3435fa02273dc68e
2017-07-21 21:47:13 +00:00
Fan Zhang
03c595ce24 Merge "Tweak bluetooth name preference" into oc-dr1-dev 2017-07-21 21:41:29 +00:00
Lei Yu
454131cdb0 Merge "Make anomaly item refresh in battery" into oc-dr1-dev
am: 0ec3e4e626

Change-Id: Idcd210c8643f4e60375ab957bcc83136e5ffb0f3
2017-07-21 20:30:18 +00:00
Lei Yu
0ec3e4e626 Merge "Make anomaly item refresh in battery" into oc-dr1-dev 2017-07-21 20:28:01 +00:00
Antony Sargent
62b7527da5 Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev
am: a6ac4890ed

Change-Id: I55b589590c90eb232bf70ec8b0256ee4da6013fe
2017-07-21 20:11:53 +00:00
TreeHugger Robot
a6ac4890ed Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev 2017-07-21 20:03:41 +00:00
Christine Franks
c350386476 Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev
am: cb9a7075f8

Change-Id: I0b059d3c240169ff4b0cc24fd22597bd31659fe7
2017-07-21 19:05:42 +00:00
Christine Franks
cb9a7075f8 Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev 2017-07-21 18:52:56 +00:00
Fan Zhang
9218e3b7df Tweak bluetooth name preference
- remove accent color from device name
- remove useless ripple when tap

Change-Id: I7800523eb27bafa24f3a4549b1acf02c869ac8c8
Fix: 62891178
Test: robotests
2017-07-21 11:38:09 -07:00
Fan Zhang
8df2cef10d Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev
am: e09338a208

Change-Id: I5db6cec4b7976e338d9e49689f1530cbbb6a1259
2017-07-21 18:23:56 +00:00
jackqdyulei
88b27fdeac Make anomaly item refresh in battery
Bug: 63908155
Test: RunSettingsRoboTest
Change-Id: I3e220001ca989020447403641360fade4d09e969
2017-07-21 10:37:14 -07:00
Fan Zhang
ee8d574c26 Add shadow to searchbar when user scrolls vertically
Bug: 63528057
Test: robotests

Change-Id: Ib85676d78b43be38aab1eacd0820d0755a601f60
(cherry picked from commit e651ddf9e6)
2017-07-21 01:34:46 +00:00
Christine Franks
a09eb383d9 Move logic for FR in demo mode out of Settings
Bug: 62712426
Test: make \
ROBOTEST_FILTER="(MasterClearTest|FactoryResetPreferenceControllerTest
|UtilsTest)" \
RunSettingsRoboTests -j100
Change-Id: I5e287c3d4a6a7050bda78187c52aec19e90b50bc
2017-07-20 17:44:18 -07:00
Doris Ling
11cfc26d0a Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev
am: 390bb3216d

Change-Id: Icfaf4162e4f43e6f91bc886e3750c2a713765e5c
2017-07-20 20:43:32 +00:00
Evan Laird
bc562b1888 Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev
am: a9e2d97004

Change-Id: I891ad549056df8632fd10570769c2695f6ad4384
2017-07-20 20:42:46 +00:00
TreeHugger Robot
390bb3216d Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev 2017-07-20 20:34:55 +00:00
TreeHugger Robot
a9e2d97004 Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev 2017-07-20 20:23:53 +00:00
Doris Ling
c496421aef Ensure that brightness level is within 0-100%.
Check whether the retrieved brightnesss value is out of range, and
adjust it if necessary.

Change-Id: Ieb1ccc03dcb9fa3e1ed192fcc3d217b84d4d316c
Fix: 63872023
Test: make RunSettingsRoboTests
(cherry picked from commit c7d2d270ab)
2017-07-20 17:39:58 +00:00
Antony Sargent
64fab6f4cd Switch to using gray icon for Bluetooth imaging devices
All the other Bluetooth icons were switched to gray at some point in the
past, but we must have missed this one.

Bug: 63858978
Test: make RunSettingsRoboTests
Change-Id: I2ebefa42f3ecff8ae6d58f4bdb22dce39ae4dbd4
2017-07-20 09:54:29 -07:00
Julia Reynolds
2ab6e2ef9e Merge "Zen priority settings update" into oc-dr1-dev
am: 9dec71f7d7

Change-Id: I1170215a15609f1ca5b4da0eeff0ecc112d9fbf3
2017-07-20 14:24:03 +00:00
Julia Reynolds
9dec71f7d7 Merge "Zen priority settings update" into oc-dr1-dev 2017-07-20 14:19:33 +00:00
Evan Laird
22315adb60 Fix Settings manifest pointing to old class namespace
The string declaring the right fragment was never updated to the new
namespace.

Change-Id: I35809f2f35dbf290deeb69d1bc672b86f8d5a752
Fixes: 63677809
Test: make SettingsUnitTests && \
adb install -r out/target/product/<device>/data/app/SettingsUnitTests/SettingsUnitTests.apk && \
adb shell am instrument -w -e class \
com.android.settings.dream.DreamSettingsLaunchTest\
com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
2017-07-19 10:29:16 -04:00
Alex Kulesza
07bd51e98d Merge "Make time remaining estimate debug mode more reliable." into oc-dr1-dev
am: f21bc100a6

Change-Id: I145fa85f2a0ba2b6ff3d7fc6a586b823c959a768
2017-07-19 03:17:43 +00:00
TreeHugger Robot
f21bc100a6 Merge "Make time remaining estimate debug mode more reliable." into oc-dr1-dev 2017-07-19 03:15:29 +00:00
Alex Kulesza
2f0e60ccda Make time remaining estimate debug mode more reliable.
Previously, the long click handler was unregistered on first use and
never re-registered. This meant that, e.g., on plugging and unplugging
the phone, debug mode stopped working. This change moves long click
activation into restartBatteryInfoLoader().

Bug: 63133793
Test: make RunSettingsRoboTests
Merged-In: I4c25a1f05ab3718bf06faf455cf670b5460a7306
Change-Id: I4c25a1f05ab3718bf06faf455cf670b5460a7306
2017-07-19 01:04:08 +00:00
Lei Yu
c150df6f8e Merge "Never store battery stats for cache" into oc-dr1-dev
am: 8f8797f768

Change-Id: I7b0408d12da25e4a89091110e78a9cdb60993d75
2017-07-18 21:04:29 +00:00
Lei Yu
8f8797f768 Merge "Never store battery stats for cache" into oc-dr1-dev 2017-07-18 20:55:58 +00:00
Julia Reynolds
78f612b823 Zen priority settings update
Reordering & adding summary

Change-Id: Icc3388410bdea9960c1e2c8609b7c3a979dc99d7
Fixes: 63712680
Test: RunSettingsRoboTests
2017-07-18 10:50:14 -04:00
jackqdyulei
a62c67be0e Merge "Build extra data in wakeup anomaly" into oc-dr1-dev
am: b327a6bccd

Change-Id: I8f75429e4934244d6a2801bea6f4d5d45b098423
2017-07-18 02:58:09 +00:00
TreeHugger Robot
b327a6bccd Merge "Build extra data in wakeup anomaly" into oc-dr1-dev 2017-07-18 02:52:42 +00:00
Fan Zhang
c1d04860d5 Fix a bug where bt name is updated to wrong preference.
am: f6e6ae2441

Change-Id: Ida538c867c7f68f7327e7f5a402023aa69ba41ed
2017-07-18 00:57:59 +00:00
jackqdyulei
30f903da34 Build extra data in wakeup anomaly
Wakeup Anomaly need this data to decide which action to take. The
previous cl adds it to wakelock anomaly, not wakeup anomaly.

Bug: 63777620
Test: RunSettingsRoboTests
Change-Id: I07c7252398add1573ea7de82953cbeabdbfe947d
2017-07-17 17:44:56 -07:00
Fan Zhang
f6e6ae2441 Fix a bug where bt name is updated to wrong preference.
Change-Id: Ica0ef6763e8868fc33773f2db917aba29193b632
Fix: 63772093
Test: robotests
2017-07-17 23:06:07 +00:00
Doris Ling
e8d37d9d75 Merge "Add background color to suggestion/condition view." into oc-dr1-dev
am: edad87c4b0

Change-Id: I612dbb1e3347e2052eec5df9b10b43d679b8585b
2017-07-17 22:24:53 +00:00
TreeHugger Robot
edad87c4b0 Merge "Add background color to suggestion/condition view." into oc-dr1-dev 2017-07-17 22:18:31 +00:00
Matthew Fritze
c44f8c8256 Add gestures as inline actions for Phone Buddy
am: 469e4ea228

Change-Id: I1effb7de88e56bb95b19ab6b6d008ee736046d7b
2017-07-17 17:46:32 +00:00
Matthew Fritze
469e4ea228 Add gestures as inline actions for Phone Buddy
Add the following gestures as inline:
- Assist gesture
- Double tap power
- Double tap screen
- Pickup
- Swipe for notification

Bug:62022517
Test: make RunSettingsRoboTests
Change-Id: Ib246b97a0b924bf18f464d3548b7e4c393fc1931
2017-07-17 08:48:42 -07:00
jackqdyulei
114cf2a1a7 Never store battery stats for cache
In PowerUsageBase, it will store battery stats if it has a configuration
change, which will make BatteryStatsLoaderHelper never get the correct
battery stats because it uses Bundle.EMPTY as the bundle message.

This cl:
1. Remove the store action even though it is configuration change.
2. Always use null to get battery stats
3. Always start a battery status check in register()

Bug: 63658232
Test: RunSettingsRoboTests
Change-Id: Ifbf970c63378ed66dddcdae4d952b7d1fd84216a
2017-07-14 15:36:40 -07:00
Doris Ling
1b6685f4a4 Add background color to suggestion/condition view.
- also remove "new_ui" from the condition tile and suggestion tile
layout file name.

Change-Id: I2a1fe4ea2ed69768f6e7c464608039c9c962c9f1
Fix: 63674319
Test: visual
2017-07-14 15:34:42 -07:00
Doris Ling
5436dacf2c Merge "Fix crash on expanding settings conditions." into oc-dr1-dev
am: 77a34f69c6

Change-Id: Ibfd77b5c2ab16dbc55f0874350bd6025fee463f7
2017-07-14 22:23:36 +00:00
TreeHugger Robot
77a34f69c6 Merge "Fix crash on expanding settings conditions." into oc-dr1-dev 2017-07-14 22:18:26 +00:00
Salvador Martinez
1cd965b519 Merge "Fix enhanced estimate discharge text showing while charging" into oc-dr1-dev
am: 4d3b534325

Change-Id: Ief931efc6ecad6e878015b22dea113f0ca0c99fe
2017-07-14 21:56:53 +00:00
TreeHugger Robot
4d3b534325 Merge "Fix enhanced estimate discharge text showing while charging" into oc-dr1-dev 2017-07-14 21:47:50 +00:00
Doris Ling
01fe5b45b4 Fix crash on expanding settings conditions.
Check for non-empty suggestions instead of non-null suggestions when
trying to determine whether to show conditions or suggestions list.

Change-Id: Icdb8ad485af436f5d84ce0a746081fc59bd613db
Merged-In: Icdb8ad485af436f5d84ce0a746081fc59bd613db
Fix: 63674269
Test: make RunSettingsRoboTests
2017-07-14 13:04:30 -07:00
Salvador Martinez
8ccb5a4698 Fix enhanced estimate discharge text showing while charging
In the PowerUsageAdvanced screen the text showing whether your time
remaining information is enhanced or not should not show when the
device is plugged in. This CL fixes a bug in that logic that would
show the text when it wasn't supposed to.

Test: robotests still pass, manual verification
Bug: 63176050
Change-Id: I33fb31671cd9c29aed20483301e51ae1ded1f1b6
2017-07-14 10:30:29 -07:00
Jeff Davidson
1b1e9928ab Merge "Don't show "Wipe eSIMs" checkbox for developers." into oc-dr1-dev
am: 98f83d6129

Change-Id: I2387b8d7cd32b9a7550e6a72c3189c6792bfd1ca
2017-07-14 01:09:09 +00:00
TreeHugger Robot
98f83d6129 Merge "Don't show "Wipe eSIMs" checkbox for developers." into oc-dr1-dev 2017-07-14 01:02:07 +00:00
Doris Ling
be7044845d Merge "Fix mokey crash on swiping settings condition." into oc-dr1-dev
am: a7f5953a02

Change-Id: Ie6a5feec8bb8404ba2a2102c4311950dadf78a7d
2017-07-13 21:23:54 +00:00
TreeHugger Robot
a7f5953a02 Merge "Fix mokey crash on swiping settings condition." into oc-dr1-dev 2017-07-13 21:14:45 +00:00
Fan Zhang
303c330068 Merge "UI refresh on bluetooth list page" into oc-dr1-dev
am: c0ca084622

Change-Id: I92846eec6bcbb67862b8ad1cf6447623a2dc3ab0
2017-07-13 20:17:28 +00:00