Commit Graph

18080 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
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
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
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
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
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
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
Pengfei Zhao
76b1817685 Merge "Fix Settings crash when setting only decimal point to data usage warning" am: 3a2e327741 am: dfe237f2cf
am: d1dbc81145

Change-Id: Ia9ac501c7d67bec0465f6019a1ba52ad863b6da0
2017-07-18 20:36:56 +00:00
Pengfei Zhao
dfe237f2cf Merge "Fix Settings crash when setting only decimal point to data usage warning"
am: 3a2e327741

Change-Id: Ic25c64da40b1accb9dce63a63462acd01664e054
2017-07-18 20:31:57 +00:00
Amit Mahajan
313c940080 Add new column user_editable to Carriers table in telephony db.
Test: Verified manually that an APN with user_editable=false cannot be
modified via UI
Bug: 62852457
Change-Id: I1dbf2622b7fada8a201c990a06d07a9cdc258840
2017-07-18 16:58:59 +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
Julia Reynolds
fdd294ef4c Add separator to auto zen rule listing.
Test: manual
Change-Id: I9c3549832693d483ec5f0cf72a50909c18483fbb
Fixes: 63681398
2017-07-18 10:49:21 -04:00
Pengfei Zhao
c05a3a0227 Fix Settings crash when setting only decimal point to data usage warning
Settings app crashes when only decimal point (".") is set to
data usage warning because it is not a valid number.
To fix this issue, the decimal point should be converted to 0.

Fixes: 63787824
Test: manual - go to Settings > Data usage > Mobile data usage and then
               set only decimal point to data usage warning.

Change-Id: Iefb6a035ba6f17b8e0c89f79dbd397e2356fb19c
2017-07-18 06:50:18 +00: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
Kevin Chyn
f07c2e8b98 Merge "Add setShouldBlink method to get SeekBarPreference" into oc-dr1-dev
am: 69eeb6c3d9

Change-Id: Ia491e4215100221e475a139afcebd91521bcfaa4
2017-07-17 22:55:27 +00:00
TreeHugger Robot
69eeb6c3d9 Merge "Add setShouldBlink method to get SeekBarPreference" into oc-dr1-dev 2017-07-17 22:49:09 +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