Commit Graph

38168 Commits

Author SHA1 Message Date
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
jackqdyulei
edfebbaa4f Add log for anomaly.
This cl adds all the info that need to be logged to Anomaly and add a
dump method for log.

Bug: 63776178
Test: RunSettingsRoboTests
Change-Id: If762bfca725fee07944ffa23998332c81335a37f
2017-07-21 12:39:50 -07: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
Fan Zhang
e09338a208 Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev 2017-07-21 18:18:44 +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
Julia Reynolds
6ad9f3267b Zen settings screen update
am: 56b748d686

Change-Id: Ida9de16ee3a52fd1d06764e560411401c976ac5d
2017-07-21 16:21:25 +00:00
Julia Reynolds
56b748d686 Zen settings screen update
- Remove app attribution
- Change visual disturbances label

Change-Id: Id2f7a16817a3b044db4374bf45a54706b8c42eff
Fixes: 63905920
Fixes: 63906381
Test: manual
2017-07-21 09:11:14 -04:00
Daniel Nishi
bb86b53a06 Merge "Make the support loader activity display UI." into oc-dr1-dev
am: 4ab6f77f98

Change-Id: I17baf254839424d21f1588b1a7925927437b95c6
2017-07-21 01:47:17 +00:00
TreeHugger Robot
4ab6f77f98 Merge "Make the support loader activity display UI." into oc-dr1-dev 2017-07-21 01:43:47 +00: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
6f44ea54ae Add divider line below "see all apps" preference
- and increase the tile limit by 1 to accomodate the divider.

Change-Id: I94cbf47fd987a6ff4c4fabcc3124fae1f0438876
Fix: 63906012
Test: make RunSettingsRoboTests
(cherry picked from commit 6cd558e595)
2017-07-20 17:21:11 -07:00
Salvador Martinez
30b97e89d4 Merge "Add some more logging to settings battery stuff" into oc-dr1-dev
am: e4c9b7162d

Change-Id: Ib105c6a9769db260e781dde61af74563735345a3
2017-07-20 21:53:50 +00:00
TreeHugger Robot
e4c9b7162d Merge "Add some more logging to settings battery stuff" into oc-dr1-dev 2017-07-20 21:46:33 +00:00
Bill Yi
2d50ad831e Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: acd97be0b8  -s ours

Change-Id: I4b9fad43198474d48c7eb5313b52f9c9314ca05f
2017-07-20 21:27:48 +00:00
TreeHugger Robot
acd97be0b8 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-07-20 21:17:34 +00:00
Amit Mahajan
8ace0324ee Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
am: c2b12c5304

Change-Id: I536c3111a917a2d9b1f64235fb54c5face72eb74
2017-07-20 20:58:48 +00:00
Amit Mahajan
c2b12c5304 Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev 2017-07-20 20:47:12 +00: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
Android Build Merger (Role)
8746483a7c Merge "Import translations. DO NOT MERGE am: 6cf2d99816 -s ours am: cc298f9ae6 -s ours" into oc-dr1-dev-plus-aosp 2017-07-20 20:05:12 +00:00
Bill Yi
29978d1ee6 Import translations. DO NOT MERGE am: 6cf2d99816 -s ours
am: bd3bd7d1e1  -s ours

Change-Id: I5654af1da287c0864385a5d6e473cd2800427eb7
2017-07-20 20:04:42 +00:00
Bill Yi
de7f8eb788 Import translations. DO NOT MERGE am: 6cf2d99816 -s ours
am: cc298f9ae6  -s ours

Change-Id: I3e0203a1fdc9f803c0f981d5dca7ad286493b4ce
2017-07-20 20:04:41 +00:00
Bill Yi
bd3bd7d1e1 Import translations. DO NOT MERGE
am: 6cf2d99816  -s ours

Change-Id: Iad277ccc5f81d14255363128d400420ca70cd376
2017-07-20 19:58:46 +00:00
Bill Yi
cc298f9ae6 Import translations. DO NOT MERGE
am: 6cf2d99816  -s ours

Change-Id: Ic6e1c58d91200c599211ccf4a1f781892dc75d55
2017-07-20 19:58:46 +00:00
Bill Yi
6cf2d99816 Import translations. DO NOT MERGE
Change-Id: If5c18c395a4293f6c084f9019fd37a17ddfd24d9
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-20 10:53:14 -07: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
Bill Yi
606f83bd74 Import translations. DO NOT MERGE
Change-Id: I1dad650eb3d6c49c1b1b8b6873a2f8a0ffe89a9c
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-19 23:13:29 -07:00
Salvador Martinez
7961627680 Add some more logging to settings battery stuff
This CL adds logging to areas which are possible suspects for
the slowdown some people have been reporting in the
PowerUsageAdvanced screen. It times the time it takes for various
battery stats methods as well as the time it takes to draw things.

Test: still build (only adds logging)
Bug: 62959645
Bug: 63442960
Change-Id: I7e6c5e83e33a931057c9fdef14d3bef84f514940
2017-07-19 18:16:56 -07:00
Julia Reynolds
92f2cd5055 Merge "Add separator to auto zen rule listing." into oc-dr1-dev
am: afe4ce0927

Change-Id: I91c22aeb773e32d544bb658a61e94c2b740ae5c9
2017-07-19 16:47:56 +00:00
Julia Reynolds
afe4ce0927 Merge "Add separator to auto zen rule listing." into oc-dr1-dev 2017-07-19 16:44:07 +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
Phil Weaver
f471234779 Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92 am: 54e508ca63 am: 4fc6cbfa6a -s ours am: b019e2c469
am: 072d4c282e

Change-Id: If13f37325685c98d796e24334f00e5ae9bc9a3b8
2017-07-19 01:26:38 +00:00
Phil Weaver
6721c9306a Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92 am: 54e508ca63 am: 4fc6cbfa6a -s ours am: b019e2c469
am: ce007d328d

Change-Id: Ic95aaeb03f2cd1d77f4c4e31967bd1d23c81738e
2017-07-19 01:24:33 +00:00
Phil Weaver
072d4c282e Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92 am: 54e508ca63 am: 4fc6cbfa6a -s ours
am: b019e2c469

Change-Id: I936fd8c441ed20e6616f00c603d22c4551923f27
2017-07-19 01:18:04 +00:00
Phil Weaver
ce007d328d Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92 am: 54e508ca63 am: 4fc6cbfa6a -s ours
am: b019e2c469

Change-Id: Iaa681452ab197e1afea21b76c17441939a9fc6c7
2017-07-19 01:17:52 +00:00
Phil Weaver
b019e2c469 Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92 am: 54e508ca63
am: 4fc6cbfa6a  -s ours

Change-Id: Iaa96265da8e054b791e5d4b7852b91f4a4ace7b2
2017-07-19 01:11:09 +00:00
Phil Weaver
c64adcde84 Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df am: 4f8be72b18 -s ours am: 2b8694c33d am: 533c1efbc7 am: f5675a9ab0 am: 00143e1a7a am: d68bd495ec am: 1faf81da83
am: 947133471e

Change-Id: I791142486eb0d844483ea3eb6812f5a6f81501a0
2017-07-19 01:04:40 +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
Phil Weaver
4fc6cbfa6a Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92
am: 54e508ca63

Change-Id: I87608a5fc71634d99adaf2aecd1e1c1be297659f
2017-07-19 01:00:05 +00:00