Phil Weaver
a801d5e8ec
Merge "Back-port ag/2491664" into mnc-dev
...
am: 7b3ca9886e
2017-07-18 23:29:03 +00:00
Phil Weaver
7b3ca9886e
Merge "Back-port ag/2491664" into mnc-dev
2017-07-18 23:21:17 +00:00
Phil Weaver
e76e053595
Back-port ag/2491664
...
Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.
Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
2017-07-18 15:51:28 -07:00
Phil Weaver
8ff3fd420c
Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours am: 6fee9a5e91 am: ade8640d4d am: 57f1af6a0b am: ae07650724
...
am: 3ae8ac0911
2017-07-18 22:18:18 +00:00
Phil Weaver
3ae8ac0911
Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours am: 6fee9a5e91 am: ade8640d4d am: 57f1af6a0b
...
am: ae07650724
2017-07-18 22:15:30 +00:00
Phil Weaver
ae07650724
Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours am: 6fee9a5e91 am: ade8640d4d
...
am: 57f1af6a0b
2017-07-18 22:11:43 +00:00
Phil Weaver
57f1af6a0b
Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours am: 6fee9a5e91
...
am: ade8640d4d
2017-07-18 22:03:51 +00:00
Phil Weaver
7c3daa9ba5
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 am: 2e690de9cf am: 7a7d6b1d0c am: 3099a7f794
...
am: ce3fef5c99
2017-07-18 21:56:10 +00:00
Phil Weaver
ade8640d4d
Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours
...
am: 6fee9a5e91
2017-07-18 21:55:39 +00:00
Phil Weaver
ce3fef5c99
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 am: 2e690de9cf am: 7a7d6b1d0c
...
am: 3099a7f794
2017-07-18 21:48:55 +00:00
Phil Weaver
6fee9a5e91
Merge "Back-port ag/2491664" into nyc-dev
...
am: 3adf585961
2017-07-18 21:44:43 +00:00
Phil Weaver
3099a7f794
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 am: 2e690de9cf
...
am: 7a7d6b1d0c
2017-07-18 21:43:53 +00:00
Phil Weaver
7a7d6b1d0c
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
...
am: 2e690de9cf
2017-07-18 21:24:36 +00:00
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
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
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
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
Phil Weaver
f6b1267780
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours
...
am: 9d889600a9
2017-07-18 20:35:06 +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
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
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
TreeHugger Robot
b327a6bccd
Merge "Build extra data in wakeup anomaly" into oc-dr1-dev
2017-07-18 02:52:42 +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
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
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
TreeHugger Robot
69eeb6c3d9
Merge "Add setShouldBlink method to get SeekBarPreference" into oc-dr1-dev
2017-07-17 22:49:09 +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
Daniel Nishi
68b16775ae
Align the version number text view.
...
Change-Id: I942b6b8f381332021bf6062afa5e0c7ae5e0bab7
Fixes: 63671892
Test: Manual
2017-07-17 15:15:10 -07:00
Daniel Nishi
67ca29f94c
Make the support loader activity display UI.
...
This lets us show a loader before jumping into the support UI.
Bug: 63117391
Test: Manual
Change-Id: Ie9660f7e89cc02d59e24798f22ca9cd0ef11701d
2017-07-17 12:49:04 -07:00
