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
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
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
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
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
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
4150739791
Back-port ag/2491664
...
am: 1d21738bd6
Change-Id: I30088c2cb1b8c343d21e0b095700df472127c612
2017-07-18 18:26:16 +00: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
xiaocheng.x.wang
21b97c074f
Merge "Black screen appears after tapping the back key" am: abcd256842
...
am: 8ef6f6c839
Change-Id: I0958426aae1d69552e42c903edb4d1b6e89fe390
2017-07-17 21:49:17 +00:00
xiaocheng.x.wang
8ef6f6c839
Merge "Black screen appears after tapping the back key"
...
am: abcd256842
Change-Id: I2deeaed21b9452933e25a324e420c1cacfcfb395
2017-07-17 21:46:47 +00:00
Treehugger Robot
abcd256842
Merge "Black screen appears after tapping the back key"
2017-07-17 21:39:29 +00:00
Phil Weaver
1d21738bd6
Back-port ag/2491664
...
Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.
Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
2017-07-13 00:03:49 +00:00
Phil Weaver
3393f0ff26
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours am: 98e0930394
-s ours am: df045253a4
am: b72ffa47a4
-s ours am: bb12830bf9
am: 4a40ef7688
am: a486c82d9c
am: 24aaf4d7ad
-s ours am: e9d2bdc380
am: 8bf67896d6
am: 254bbe84a3
am: 8870bd7c5a
am: 23a6d1d953
-s ours
...
am: 9e63322457
Change-Id: I5255b1ea7f562b654a0d018f7e9662748f744ea9
2017-07-12 23:22:21 +00:00
Phil Weaver
9e63322457
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours am: 98e0930394
-s ours am: df045253a4
am: b72ffa47a4
-s ours am: bb12830bf9
am: 4a40ef7688
am: a486c82d9c
am: 24aaf4d7ad
-s ours am: e9d2bdc380
am: 8bf67896d6
am: 254bbe84a3
am: 8870bd7c5a
...
am: 23a6d1d953
-s ours
Change-Id: Ic4747be59996146ac76509581e390afc99ebe876
2017-07-12 23:15:51 +00:00
Phil Weaver
23a6d1d953
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours am: 98e0930394
-s ours am: df045253a4
am: b72ffa47a4
-s ours am: bb12830bf9
am: 4a40ef7688
am: a486c82d9c
am: 24aaf4d7ad
-s ours am: e9d2bdc380
am: 8bf67896d6
am: 254bbe84a3
...
am: 8870bd7c5a
Change-Id: I4a9a2124db4e45793d969be6c3e33479524e01c9
2017-07-12 23:08:49 +00:00
Phil Weaver
8870bd7c5a
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours am: 98e0930394
-s ours am: df045253a4
am: b72ffa47a4
-s ours am: bb12830bf9
am: 4a40ef7688
am: a486c82d9c
am: 24aaf4d7ad
-s ours am: e9d2bdc380
am: 8bf67896d6
...
am: 254bbe84a3
Change-Id: I87ffde2e35401e7d027ddae59bbbeddbe6ed91dc
2017-07-12 23:02:11 +00:00
Phil Weaver
254bbe84a3
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours am: 98e0930394
-s ours am: df045253a4
am: b72ffa47a4
-s ours am: bb12830bf9
am: 4a40ef7688
am: a486c82d9c
am: 24aaf4d7ad
-s ours am: e9d2bdc380
...
am: 8bf67896d6
Change-Id: If3df05ce2112fb26b53651f51d47987d4f8582ca
2017-07-12 22:56:17 +00:00
Phil Weaver
8bf67896d6
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours am: 98e0930394
-s ours am: df045253a4
am: b72ffa47a4
-s ours am: bb12830bf9
am: 4a40ef7688
am: a486c82d9c
am: 24aaf4d7ad
-s ours
...
am: e9d2bdc380
Change-Id: I568b19d74265138d2f5cb563491c379bcfbb18aa
2017-07-12 22:50:05 +00:00
Phil Weaver
e9d2bdc380
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours am: 98e0930394
-s ours am: df045253a4
am: b72ffa47a4
-s ours am: bb12830bf9
am: 4a40ef7688
am: a486c82d9c
...
am: 24aaf4d7ad
-s ours
Change-Id: Ibf0c76ba5e9059cd87282cefa9b0c7724ed64128
2017-07-12 22:41:40 +00:00
Phil Weaver
24aaf4d7ad
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours am: 98e0930394
-s ours am: df045253a4
am: b72ffa47a4
-s ours am: bb12830bf9
am: 4a40ef7688
...
am: a486c82d9c
Change-Id: Ib92175b78417bda6e58da2b93e37143a428852c0
2017-07-12 22:35:43 +00:00
Phil Weaver
a486c82d9c
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours am: 98e0930394
-s ours am: df045253a4
am: b72ffa47a4
-s ours am: bb12830bf9
...
am: 4a40ef7688
Change-Id: I6d627519091040c4d64841210003de8aa1471f53
2017-07-12 22:29:09 +00:00
Phil Weaver
4a40ef7688
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours am: 98e0930394
-s ours am: df045253a4
am: b72ffa47a4
-s ours
...
am: bb12830bf9
Change-Id: I51e797becf12a2c21e04eb5e701b44cad5f8045f
2017-07-12 22:23:16 +00:00
Phil Weaver
bb12830bf9
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours am: 98e0930394
-s ours am: df045253a4
...
am: b72ffa47a4
-s ours
Change-Id: Idc84d1fbeb9e6bcb219c231af4565b666d2d1f00
2017-07-12 22:19:08 +00:00
Phil Weaver
b72ffa47a4
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours am: 98e0930394
-s ours
...
am: df045253a4
Change-Id: I1ec6fc85e78e081fba4858c8cb4bd7aa2751811c
2017-07-12 22:13:16 +00:00
Phil Weaver
df045253a4
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours
...
am: 98e0930394
-s ours
Change-Id: I8de29bde0bf73adde876e6cba0e4e61de6e4f2cb
2017-07-12 22:06:35 +00:00
Phil Weaver
98e0930394
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
...
am: bebc9f9f3c
-s ours
Change-Id: I1d6d10dace8425eb21bacd9582404e876da2db7c
2017-07-12 21:59:38 +00:00
Phil Weaver
bebc9f9f3c
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
...
am: 840b78e19e
Change-Id: I5b2add698df347db16bfedb196793ea77b70f8a8
2017-07-12 21:55:38 +00:00
Phil Weaver
840b78e19e
DO NOT MERGE Back-port ag/2491664
...
am: 9a14484b38
Change-Id: Ie1a9075d996f38ac8bbe56e19880bbfd6b9f9a96
2017-07-12 21:43:49 +00:00
Phil Weaver
9a14484b38
DO NOT MERGE Back-port ag/2491664
...
Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.
Change-Id: Icbd00799e4b12cde9d17d3d0abbd38d9643b26c4
2017-07-12 20:50:13 +00:00
Bill Yi
2865272522
Import translations. DO NOT MERGE am: 7267438b58
-s ours
...
am: 750540ae48
-s ours
Change-Id: If2ede8c90fef89686c2ea93765e7d7acab7e9c26
2017-07-11 03:55:18 +00:00
Bill Yi
750540ae48
Import translations. DO NOT MERGE
...
am: 7267438b58
-s ours
Change-Id: Id5933547a1b04477e00dbef1fd88382a01e02891
2017-07-11 03:47:35 +00:00
Bill Yi
bc4faa93e2
Import translations. DO NOT MERGE
...
am: f812f94216
-s ours
Change-Id: If3bc9ec99810524fde2cf69d6a43f4995ed9306a
2017-07-11 03:30:02 +00:00
Bill Yi
7267438b58
Import translations. DO NOT MERGE
...
Change-Id: Ifbee1421f45d2cb6f3d5c533e5c4e9a2735afa10
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-10 17:16:10 -07:00
Bill Yi
f812f94216
Import translations. DO NOT MERGE
...
Change-Id: Ifb8d0e63a8150656a55bb1b2adf5748c75a10224
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-10 16:49:52 -07:00
kun.tang
a482b155f2
Merge "Fix Phone crash when rorate screen on SimStatus." am: 3cbae7d6b5
...
am: d34ce65e22
Change-Id: Ic806452e621c14431576fe4c5ed848ae005122c1
2017-07-10 19:20:58 +00:00
kun.tang
d34ce65e22
Merge "Fix Phone crash when rorate screen on SimStatus."
...
am: 3cbae7d6b5
Change-Id: I3c968a9bbd7bb687aae53d5d74a9a2b3e38bcbae
2017-07-10 19:17:03 +00:00
Treehugger Robot
3cbae7d6b5
Merge "Fix Phone crash when rorate screen on SimStatus."
2017-07-10 19:08:11 +00:00
kun.tang
0c06bab9cc
Fix Phone crash when rorate screen on SimStatus.
...
When rorate screen on SimStatus, Fragment not attached to Activity, phone crash.
Solution: use mRes to getString
Test: build
07-07 13:20:27.237 696 696 E AndroidRuntime: Process: com.android.phone, PID: 696
07-07 13:20:27.237 696 696 E AndroidRuntime: java.lang.IllegalStateException: Fragment SimStatus{d1e4bb3} not attached to Activity
07-07 13:20:27.237 696 696 E AndroidRuntime: at android.app.Fragment.getResources(Fragment.java:861)
07-07 13:20:27.237 696 696 E AndroidRuntime: at com.android.settings.deviceinfo.SimStatus.updateSignalStrength(SimStatus.java:359)
07-07 13:20:27.237 696 696 E AndroidRuntime: at com.android.settings.deviceinfo.SimStatus$4.onSignalStrengthsChanged(SimStatus.java:444)
07-07 13:20:27.237 696 696 E AndroidRuntime: at android.telephony.PhoneStateListener$1.handleMessage(PhoneStateListener.java:334)
07-07 13:20:27.237 696 696 E AndroidRuntime: at android.os.Handler.dispatchMessage(Handler.java:105)
07-07 13:20:27.237 696 696 E AndroidRuntime: at android.os.Looper.loop(Looper.java:164)
07-07 13:20:27.237 696 696 E AndroidRuntime: at android.app.ActivityThread.main(ActivityThread.java:6558)
07-07 13:20:27.237 696 696 E AndroidRuntime: at java.lang.reflect.Method.invoke(Native Method)
07-07 13:20:27.237 696 696 E AndroidRuntime: at com.android.internal.os.Zygote$MethodAndArgsCaller.run(Zygot
Change-Id: Ife8f2e3ed8c4fe6db0fe784a43910768ff3ff4d1
2017-07-08 11:09:02 +08:00
Bill Yi
07a57fc90b
Import translations. DO NOT MERGE
...
am: 126ce95bc6
-s ours
Change-Id: I99cf4ac7ff9a9ae62df014c790a7af691e670cbc
2017-07-01 16:05:02 +00:00
Bill Yi
126ce95bc6
Import translations. DO NOT MERGE
...
Change-Id: Id991a5f419ccb85d8e25a5111b717a84e4de6184
Auto-generated-cl: translation import
2017-06-30 18:07:52 -07:00
Bill Yi
7c952faa77
Import translations. DO NOT MERGE
...
am: 8e132ce53c
-s ours
Change-Id: I4c3a65ee1c1bb82dacea7e874ef906cb08fce1ac
2017-06-27 20:08:19 +00:00
Bill Yi
8e132ce53c
Import translations. DO NOT MERGE
...
Change-Id: I19a85ce3981e7aac6708b6aa2d78fd51c9d03141
Auto-generated-cl: translation import
2017-06-27 00:26:26 -07:00