Phil Weaver
85aa9ccc69
Back-port ag/2491664 am: 1d21738bd6
am: 4150739791
-s ours am: 9d889600a9
am: f6b1267780
am: 5d3967338d
am: 57aa22c671
am: 91f4a42dac
...
am: ba26fabe3e
Change-Id: I78f285821bc170c9a32b6e911e38826123c81820
2017-07-18 20:54:26 +00:00
Phil Weaver
55b3b1f349
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c
am: cbbdc18c7b
am: c84dc8feb3
am: 4b029f8b0d
am: 4c70016a94
...
am: 46592e90a9
Change-Id: If666cdb52e2565e889fd026917eaea20502ca59e
2017-07-18 20:54:21 +00:00
Phil Weaver
ba26fabe3e
Back-port ag/2491664 am: 1d21738bd6
am: 4150739791
-s ours am: 9d889600a9
am: f6b1267780
am: 5d3967338d
am: 57aa22c671
...
am: 91f4a42dac
Change-Id: Iaf412cbcc4b9a3513ba27672ae2e1cfc04e57da5
2017-07-18 20:52:25 +00:00
Phil Weaver
91f4a42dac
Back-port ag/2491664 am: 1d21738bd6
am: 4150739791
-s ours am: 9d889600a9
am: f6b1267780
am: 5d3967338d
...
am: 57aa22c671
Change-Id: Ia487b2e3c0ee6c4eace1502704fda873e3690300
2017-07-18 20:49:55 +00:00
Phil Weaver
57aa22c671
Back-port ag/2491664 am: 1d21738bd6
am: 4150739791
-s ours am: 9d889600a9
am: f6b1267780
...
am: 5d3967338d
Change-Id: Idcd6c6ab5a7cf0a594236a41a949031ed3e9855c
2017-07-18 20:47:53 +00:00
Phil Weaver
46592e90a9
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c
am: cbbdc18c7b
am: c84dc8feb3
am: 4b029f8b0d
...
am: 4c70016a94
Change-Id: I0b78bc04741d8b0d2d7af292484a025d0c62fd6a
2017-07-18 20:47:09 +00:00
Phil Weaver
5d3967338d
Back-port ag/2491664 am: 1d21738bd6
am: 4150739791
-s ours am: 9d889600a9
...
am: f6b1267780
Change-Id: I2e61b6da4262cf05ca30e2c2d505eb9cae017a9a
2017-07-18 20:46:34 +00:00
Pengfei Zhao
7c52e51a9b
Merge "Fix Settings crash when setting only decimal point to data usage warning" am: 3a2e327741
am: dfe237f2cf
am: d1dbc81145
...
am: 76b1817685
Change-Id: If62e23d750b55a292852b2bda8ab46299a7e8aea
2017-07-18 20:42:02 +00:00
Phil Weaver
4c70016a94
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c
am: cbbdc18c7b
am: c84dc8feb3
...
am: 4b029f8b0d
Change-Id: Ibedf70b6b6b14d51ba482f28f2db9c04c10457d6
2017-07-18 20:38:01 +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
Phil Weaver
f6b1267780
Back-port ag/2491664 am: 1d21738bd6
am: 4150739791
-s ours
...
am: 9d889600a9
Change-Id: Ia718620b0ec683d6b24cca6e56e9378a68d0ae3f
2017-07-18 20:35:06 +00:00
Pengfei Zhao
d1dbc81145
Merge "Fix Settings crash when setting only decimal point to data usage warning" am: 3a2e327741
...
am: dfe237f2cf
Change-Id: Ic88ad971e2bf0784e9062d5dabe3e4c9def1eb51
2017-07-18 20:34:42 +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
Phil Weaver
4b029f8b0d
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c
am: cbbdc18c7b
...
am: c84dc8feb3
Change-Id: Ia81f4d5e0e9d433e33e19a70a9f63a6cc2afb79a
2017-07-18 20:28:31 +00:00
Phil Weaver
9d889600a9
Back-port ag/2491664 am: 1d21738bd6
...
am: 4150739791
-s ours
Change-Id: I580b7232fcbe2c2025d2fd35e7f04ddf1255fd6b
2017-07-18 20:25:56 +00:00
Treehugger Robot
3a2e327741
Merge "Fix Settings crash when setting only decimal point to data usage warning"
2017-07-18 20:24:35 +00:00
TreeHugger Robot
5002b97d37
Merge "Check the tintable metadata before tinting tile icon."
2017-07-18 19:52:30 +00:00
Alex Kulesza
120e7a71c6
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
Change-Id: I4c25a1f05ab3718bf06faf455cf670b5460a7306
2017-07-18 14:58:51 -04:00
Charles He
c22e4d68c8
Merge "Disable always-on VPN options if an app has opted out."
2017-07-18 18:47:34 +00:00
Phil Weaver
c84dc8feb3
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c
...
am: cbbdc18c7b
Change-Id: I3cb41508ce487f1d4a21517c86ef57f9cc041705
2017-07-18 18:36:26 +00:00
Phil Weaver
cbbdc18c7b
Merge "Back-port ag/2491664" into lmp-dev
...
am: 41492a1e2c
Change-Id: I4e099fb9a737936f12357670635232a7913e3cfd
2017-07-18 18:26:18 +00:00
Phil Weaver
4150739791
Back-port ag/2491664
...
am: 1d21738bd6
Change-Id: I30088c2cb1b8c343d21e0b095700df472127c612
2017-07-18 18:26:16 +00:00
Phil Weaver
41492a1e2c
Merge "Back-port ag/2491664" into lmp-dev
2017-07-18 18:19:39 +00:00
Doris Ling
7087fd92a1
Check the tintable metadata before tinting tile icon.
...
When determining whether to tint the tile icon, first check whether the
tintable metadata set for the tile. If no metadata set, will then follow
the default logic that tint the tile icon if it is not coming from the
Settings package.
Change-Id: Idf0863e0c6ab063aeaa6d013fa620508ced31fdb
Fix: 62473193
Test: make RunSettingsRoboTests
2017-07-18 10:39:47 -07:00
Daniel Nishi
4b351b4ca1
Merge "Align the version number text view." into oc-dr1-dev am: aead86058d
...
am: fcb660acbf
Change-Id: I6a0e985e0ed8c61bdb807547a062da581d4d8c38
2017-07-18 17:27:59 +00:00
Daniel Nishi
fcb660acbf
Merge "Align the version number text view." into oc-dr1-dev
...
am: aead86058d
Change-Id: Ibe17bfc8b0e24d1094f8c43ffe98a3319abee074
2017-07-18 17:22:30 +00:00
Daniel Nishi
aead86058d
Merge "Align the version number text view." into oc-dr1-dev
2017-07-18 17:14:48 +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
Phil Weaver
b1685ab057
Back-port ag/2491664
...
Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.
Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
2017-07-18 09:23:14 -07: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
Michael Wachenschwanz
6c19701a9b
Merge "Add an overload of startBatteryDetail for BatteryUtils mock"
2017-07-18 03:12:49 +00:00
jackqdyulei
89410c8d6d
Merge "Build extra data in wakeup anomaly" into oc-dr1-dev am: b327a6bccd
...
am: a62c67be0e
Change-Id: Ie7b1fbc669d0d740cf7fec7180ba64894ee73761
2017-07-18 03:01:08 +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
Rajeev Kumar
140e6491af
Merge "Hide automatic storage manager preference."
2017-07-18 02:32:16 +00:00
Fan Zhang
0e13d6c8a7
Fix a bug where bt name is updated to wrong preference. am: f6e6ae2441
...
am: c1d04860d5
Change-Id: I42525051bd0471dece01807c87adb0f2a38af1d1
2017-07-18 01:00:29 +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
Rajeev Kumar
2156b26b2e
Hide automatic storage manager preference.
...
This preference should not be displayed to lower RAM device. Files
Go app will would provide this feature for low RAM devices.
Bug: 63333197
Test: visual
Change-Id: I48464884cf20acc632748e66f8183c276996828c
2017-07-17 17:46:54 -07: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
Rajeev Kumar
a2425603d9
Merge "Stop showing Picture in Picture for Android Go."
2017-07-17 23:41:58 +00:00
Phil Weaver
cc395469bc
Back-port ag/2491664
...
Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.
Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
2017-07-17 16:38:07 -07:00
Kevin Chyn
8a2e755e3c
Merge "Add setShouldBlink method to get SeekBarPreference" into oc-dr1-dev am: 69eeb6c3d9
...
am: f07c2e8b98
Change-Id: If027a21fb316fe40157acf7c7bb8259bb3e82a9e
2017-07-17 23:17:11 +00: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
Michael Wachenschwanz
1d820308b6
Merge "Update FakeUid to implement getForegroundServiceTimer"
2017-07-17 22:59:41 +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
00de10c32b
Merge "Add background color to suggestion/condition view." into oc-dr1-dev am: edad87c4b0
...
am: e8d37d9d75
Change-Id: I546eabf134f90c0002a010590edfbefa68c34216
2017-07-17 22:26:49 +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