Phil Weaver
3adf585961
Merge "Back-port ag/2491664" into nyc-dev
2017-07-18 21:23:17 +00:00
Phil Weaver
2e690de9cf
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9 am: 55b3b1f349 am: af26bae8b3
...
am: a1426f209c
2017-07-18 21:13:41 +00:00
Phil Weaver
a1426f209c
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9 am: 55b3b1f349
...
am: af26bae8b3
2017-07-18 21:09:55 +00:00
Phil Weaver
3ca763f1b0
Merge "Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e am: 85aa9ccc69 am: 2e2e6fcc04 am: 625d4bffc7 am: 066f79adc3 am: f7d3537fcd" into oc-dr1-dev-plus-aosp
...
am: aa0772ff7e
2017-07-18 21:09:28 +00:00
Phil Weaver
84c5bd8a5a
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e am: 85aa9ccc69 am: 2e2e6fcc04 am: 625d4bffc7 am: 066f79adc3 am: e8f916bf97
...
am: 702d130b13
2017-07-18 21:08:56 +00:00
Android Build Merger (Role)
aa0772ff7e
Merge "Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e am: 85aa9ccc69 am: 2e2e6fcc04 am: 625d4bffc7 am: 066f79adc3 am: f7d3537fcd" into oc-dr1-dev-plus-aosp
2017-07-18 21:06:44 +00:00
Phil Weaver
702d130b13
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e am: 85aa9ccc69 am: 2e2e6fcc04 am: 625d4bffc7 am: 066f79adc3
...
am: e8f916bf97
2017-07-18 21:06:27 +00:00
Phil Weaver
254f21b655
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e am: 85aa9ccc69 am: 2e2e6fcc04 am: 625d4bffc7 am: 066f79adc3
...
am: f7d3537fcd
2017-07-18 21:06:27 +00:00
Lei Yu
0038e448e1
Merge "Never store battery stats for cache" into oc-dr1-dev am: 8f8797f768
...
am: c150df6f8e
2017-07-18 21:06:25 +00:00
Lei Yu
c150df6f8e
Merge "Never store battery stats for cache" into oc-dr1-dev
...
am: 8f8797f768
2017-07-18 21:04:29 +00:00
Phil Weaver
f7d3537fcd
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e am: 85aa9ccc69 am: 2e2e6fcc04 am: 625d4bffc7
...
am: 066f79adc3
2017-07-18 21:04:27 +00:00
Phil Weaver
e8f916bf97
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e am: 85aa9ccc69 am: 2e2e6fcc04 am: 625d4bffc7
...
am: 066f79adc3
2017-07-18 21:04:27 +00:00
Phil Weaver
066f79adc3
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e am: 85aa9ccc69 am: 2e2e6fcc04
...
am: 625d4bffc7
2017-07-18 21:02:30 +00:00
Phil Weaver
af26bae8b3
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9
...
am: 55b3b1f349
2017-07-18 20:59:48 +00:00
Phil Weaver
625d4bffc7
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e am: 85aa9ccc69
...
am: 2e2e6fcc04
2017-07-18 20:58:54 +00:00
Phil Weaver
2e2e6fcc04
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e
...
am: 85aa9ccc69
2017-07-18 20:57:24 +00:00
Lei Yu
8f8797f768
Merge "Never store battery stats for cache" into oc-dr1-dev
2017-07-18 20:55:58 +00:00
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
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
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
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
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
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
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
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
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
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
2017-07-18 20:36:56 +00:00
Phil Weaver
f6b1267780
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours
...
am: 9d889600a9
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
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
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
2017-07-18 20:28:31 +00:00
Phil Weaver
9d889600a9
Back-port ag/2491664 am: 1d21738bd6
...
am: 4150739791
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
2017-07-18 18:36:26 +00:00
Phil Weaver
cbbdc18c7b
Merge "Back-port ag/2491664" into lmp-dev
...
am: 41492a1e2c
2017-07-18 18:26:18 +00:00
Phil Weaver
4150739791
Back-port ag/2491664
...
am: 1d21738bd6
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
2017-07-18 17:27:59 +00:00
Daniel Nishi
fcb660acbf
Merge "Align the version number text view." into oc-dr1-dev
...
am: aead86058d
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
