Phil Weaver
7aaec13b05
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
Change-Id: Ie2be7683a783e125a74b8d9383317fdf156d219c
2017-07-19 00:46:36 +00:00
Phil Weaver
1faf81da83
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
Change-Id: Ib2b14e63463ea041575e6d884cc155972264ae91
2017-07-19 00:40:56 +00:00
Phil Weaver
d68bd495ec
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
Change-Id: I08371b60dbed3351a06f49bed71aaca1f46fb864
2017-07-19 00:31:13 +00:00
Phil Weaver
00143e1a7a
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e
am: a801d5e8ec
am: f9d05230df
am: 4f8be72b18
-s ours am: 2b8694c33d
am: 533c1efbc7
...
am: f5675a9ab0
Change-Id: Icbc5147a6050058c78ece104f1c169673b93a373
2017-07-19 00:24:40 +00:00
Phil Weaver
f5675a9ab0
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e
am: a801d5e8ec
am: f9d05230df
am: 4f8be72b18
-s ours am: 2b8694c33d
...
am: 533c1efbc7
Change-Id: Ib54143b47f6c1b09d2d3c5f73630aebcc1fcba33
2017-07-19 00:15:50 +00:00
Phil Weaver
533c1efbc7
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e
am: a801d5e8ec
am: f9d05230df
am: 4f8be72b18
-s ours
...
am: 2b8694c33d
Change-Id: Icef5847bf3eaf4c9fdce6eaaff1d642828f89477
2017-07-19 00:05:08 +00:00
Phil Weaver
2b8694c33d
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e
am: a801d5e8ec
am: f9d05230df
...
am: 4f8be72b18
-s ours
Change-Id: I2b510d0b70eb303fb93a68a0eee0d32bf1226d76
2017-07-18 23:58:43 +00:00
Phil Weaver
4f8be72b18
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e
am: a801d5e8ec
...
am: f9d05230df
Change-Id: I63ffb648e39d06390a7f72951ad41bed0cf5aac9
2017-07-18 23:41:33 +00:00
Phil Weaver
f9d05230df
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e
...
am: a801d5e8ec
Change-Id: I26fad2824208aa46dbfac0bef585729e5424c24c
2017-07-18 23:35:31 +00:00
Phil Weaver
a801d5e8ec
Merge "Back-port ag/2491664" into mnc-dev
...
am: 7b3ca9886e
Change-Id: Id4c50a2c37096f91accd2b2b28470c230dd655db
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
8c1c7cae13
Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961
-s ours am: 6fee9a5e91
am: ade8640d4d
am: 57f1af6a0b
am: ae07650724
...
am: 3ae8ac0911
Change-Id: Ie3af58a1cfe48fadbf32d9634483571fc12c1d52
2017-07-18 22:22:39 +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
Change-Id: I43d075a57c5d327f3949408da7ed4890b0b045f4
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
Change-Id: I50c783c642a0f1a86535c2423dd335d2e4ec2999
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
Change-Id: I77a9c4c0d8ce78a02615c5e37bf1843c46a1e5d8
2017-07-18 22:03:51 +00:00
Phil Weaver
b2d3c5e392
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
Change-Id: Ie8bbee7db53b887311684ead2b2bd9d82ff8ba58
2017-07-18 21:56:14 +00:00
Phil Weaver
ade8640d4d
Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961
-s ours
...
am: 6fee9a5e91
Change-Id: I463a22c05f439acd264c21cb99d2700e9600b78d
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
Change-Id: Ib02617e2779b6da6569182cd94936dafc07b7422
2017-07-18 21:48:55 +00:00
Phil Weaver
6fee9a5e91
Merge "Back-port ag/2491664" into nyc-dev
...
am: 3adf585961
-s ours
Change-Id: I8ba7e805110028752e1968e38ac548fcd4194438
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
Change-Id: I7a12d05b79c4a78e14fccf5288c9bea50ae4c4d9
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
Change-Id: Idb805deec53765994f5ed8a1bd7b1f56d6717b3b
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
Change-Id: I410bcb403ace5044da8f98fadbb622a44d21021b
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
Change-Id: I0dc45ca53a9c60c830795d6686a0d86efa356f4e
2017-07-18 21:09:55 +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
Change-Id: I9d4b01aff8483315c34874052bc1dca69f9be680
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
Change-Id: Idb85f53bc0ad17856ee65b4cc2240bef6710851c
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
Change-Id: I89635be6d5f768bd4780dd1b6daeb30e9cbab4d2
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
Change-Id: I2d9d6a7fb0ac1d88a4e910e9e23e7160bbfcdafd
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
Change-Id: I8d411e2b84113763c49ec5c627f966da662a42b6
2017-07-18 20:57:24 +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
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
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
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
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
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
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
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