TreeHugger Robot
295f5a03bc
Merge "Add visibility metrics to dialogs."
2016-09-20 15:55:41 +00:00
Bill Yi
fe9e71bb3f
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: a365d9123c
-s ours am: 8469c01294
-s ours
...
am: f3154c6763
-s ours
Change-Id: Ie909ff8d5138e71f5d2514f0f017dd135e2c1dc8
2016-09-20 07:07:50 +00:00
Bill Yi
bb85059129
Import translations. DO NOT MERGE am: a860e80b92
-s ours am: 9cc0e28204
-s ours
...
am: 4ebeaf09fd
-s ours
Change-Id: I1d6a5a7cacc3d8d8b769c51025a72ca7a06b3cff
2016-09-20 07:07:29 +00:00
Bill Yi
0285dd25e1
Import translations. DO NOT MERGE am: 225c634f99
-s ours am: 41e378d12c
-s ours am: 9b33478680
-s ours am: e281868348
-s ours
...
am: 821890c1ac
-s ours
Change-Id: I7523089878a408614fbd6778d676444ed35f7b3c
2016-09-20 07:07:06 +00:00
Bill Yi
4e8fb7e69a
Import translations. DO NOT MERGE am: 225c634f99
-s ours am: 9506876a5f
-s ours
...
am: cb2f7d4dcd
-s ours
Change-Id: Ie0908c1965991bbff6931355a4b896215aacfdd5
2016-09-20 07:06:48 +00:00
Bill Yi
e9c50c0658
Import translations. DO NOT MERGE am: 82eff79103
-s ours am: 69ca405545
-s ours am: 4f2e73cd62
-s ours
...
am: b828cfe04b
-s ours
Change-Id: I75f25db8ba00551af2eb41c5a2ec3e70ae3fb4ed
2016-09-20 07:06:28 +00:00
Amit Mahajan
117eaaf13d
Merge "Changes to support read-only apn types." into nyc-mr1-dev am: 9887baecf3
am: cd49d13266
...
am: eb8b2b1050
Change-Id: I902412ca2cff7a2aa4bf3a86211103b6810254c7
2016-09-20 07:06:08 +00:00
Lorenzo Colitti
c179f33c87
Add a "Don't ask again" checkbox to the avoid bad wifi dialog.
...
Also update the settings code to reflect the new tristate
semantics of the NETWORK_AVOID_BAD_WIFI setting.
Bug: 31075769
Change-Id: Icd21d8272abe6afd42ee8a41e2c7e1a6af77f0b3
2016-09-20 14:35:59 +09:00
Fan Zhang
1e516287bd
Add visibility metrics to dialogs.
...
Bug: 30681529
Test: adb logcat -b events | egrep "(sysui_|notification_)"
Change-Id: I199d2e1b2cb8588a562b46bb8128d8ece24952f0
2016-09-19 17:34:12 -07:00
Amin Shaikh
e5d373b044
Merge "Test for wallpaper preference layout crash."
2016-09-19 21:59:41 +00:00
TreeHugger Robot
6fdf0e51eb
Merge "resolve merge conflicts of 66a8895
to master"
2016-09-19 21:24:33 +00:00
Daniel Nishi
c0b33f70ed
Use a config flag instead of a RO flag for showing Manage Storage.
...
Bug: 30455784
Test: make SettingsTests; run the instrumentation.
Change-Id: I860192c1c20fcaec2a5cbcdc085ff01dafa7351a
(cherry picked from commit 7f075a3c41
)
2016-09-19 20:39:33 +00:00
Daniel Nishi
f83a21d0fc
Merge "Use a config flag instead of a RO flag for showing Manage Storage."
2016-09-19 20:36:03 +00:00
TreeHugger Robot
8fd528f16d
Merge "Add tests for data warning related classes."
2016-09-19 20:26:15 +00:00
Fan Zhang
2c6dbab68a
Clean up string description for NFC disclaimer dialog.
...
Bug: 30852261
Bug: 30860218
Test: manual build
Change-Id: I7be1e5ac0bf2a044efe6820a3cf011dc32ebc14b
2016-09-19 12:17:04 -07:00
Daniel Nishi
355390da93
Move private volume storage calculations into a shared lib.
...
Bug: 30895163
Test: m RunStorageManagerRoboTests
Change-Id: I3e464c8b721373ebc1527eb5411622c69bf587d1
2016-09-19 12:16:21 -07:00
Matthew Fritze
9a3dc4e2a8
Update Robolectric tests to use google truth
...
Bug: 31545801
Test: make RunSettingsRoboTests
Change-Id: Idb801d51b6a4dc02ea062bc32086e1a8fc28b94b
2016-09-19 11:42:11 -07:00
Bill Yi
f3154c6763
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: a365d9123c
-s ours
...
am: 8469c01294
-s ours
Change-Id: I46a013fa04395eb805c3a451788b981f553b520f
2016-09-19 18:40:56 +00:00
Bill Yi
4ebeaf09fd
Import translations. DO NOT MERGE am: a860e80b92
-s ours
...
am: 9cc0e28204
-s ours
Change-Id: I8e19c6ac68280a665ed4436451fd05b951083bdc
2016-09-19 18:40:36 +00:00
Bill Yi
8469c01294
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: a365d9123c
-s ours
Change-Id: Ie64b56ae99d4363edfbeb2d637d89abd6e356cac
2016-09-19 18:36:50 +00:00
Bill Yi
9cc0e28204
Import translations. DO NOT MERGE
...
am: a860e80b92
-s ours
Change-Id: I4050d7e0cf2c5967382acb5e8465f213f0322c5f
2016-09-19 18:36:49 +00:00
TreeHugger Robot
a365d9123c
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-09-19 18:30:15 +00:00
Fan Zhang
0b056c1bf6
Add tests for data warning related classes.
...
Bug: 26934313
Test: make RunSettingsRoboTests
Test: make & run SettingsUnitTests
Change-Id: I1e5ce91c02a9c9025afec4e07bb99e4830194a21
2016-09-19 11:16:01 -07:00
TreeHugger Robot
b949075b30
Merge "Import translations. DO NOT MERGE"
2016-09-19 18:09:23 +00:00
Bill Yi
821890c1ac
Import translations. DO NOT MERGE am: 225c634f99
-s ours am: 41e378d12c
-s ours am: 9b33478680
-s ours
...
am: e281868348
-s ours
Change-Id: Ic2cf855de56430d16ef1933cc1379a522dc68365
2016-09-19 18:09:12 +00:00
Bill Yi
e281868348
Import translations. DO NOT MERGE am: 225c634f99
-s ours am: 41e378d12c
-s ours
...
am: 9b33478680
-s ours
Change-Id: I42ad1fcf105462e8bcbabd01d09f0a440d0a7d63
2016-09-19 18:05:13 +00:00
Bill Yi
cb2f7d4dcd
Import translations. DO NOT MERGE am: 225c634f99
-s ours
...
am: 9506876a5f
-s ours
Change-Id: Ic1160814240720adc7e0cc6b61d8968e9d53fe9d
2016-09-19 18:02:21 +00:00
Bill Yi
9b33478680
Import translations. DO NOT MERGE am: 225c634f99
-s ours
...
am: 41e378d12c
-s ours
Change-Id: I9b482638cdb3ac06afdfd03f32da3c19fdf18334
2016-09-19 18:02:11 +00:00
Bill Yi
9506876a5f
Import translations. DO NOT MERGE
...
am: 225c634f99
-s ours
Change-Id: Ibcaa7c4ec9f7ba5fc469157a524677a0f1223cfa
2016-09-19 17:58:44 +00:00
Bill Yi
41e378d12c
Import translations. DO NOT MERGE
...
am: 225c634f99
-s ours
Change-Id: I736df56414345c07d99630433996abf2819d6ece
2016-09-19 17:58:43 +00:00
Amit Mahajan
a69a6a9e34
resolve merge conflicts of 66a8895
to master
...
Change-Id: I227a240175034e862ad241ce9c6722a093919616
2016-09-19 10:14:41 -07:00
Bill Yi
b828cfe04b
Import translations. DO NOT MERGE am: 82eff79103
-s ours am: 69ca405545
-s ours
...
am: 4f2e73cd62
-s ours
Change-Id: I59222b09163992252c94bb23025542b8bc4e2b51
2016-09-19 17:14:04 +00:00
Bill Yi
4f2e73cd62
Import translations. DO NOT MERGE am: 82eff79103
-s ours
...
am: 69ca405545
-s ours
Change-Id: I7fdd07250de1e33328b722b5406c761dec56a5ec
2016-09-19 17:10:32 +00:00
Bill Yi
69ca405545
Import translations. DO NOT MERGE
...
am: 82eff79103
-s ours
Change-Id: I56e2ce78f4d4dc4985b789b6a45c0fabaeac096f
2016-09-19 17:07:31 +00:00
Bill Yi
a860e80b92
Import translations. DO NOT MERGE
...
Change-Id: I6959685436657e51d7c951d9bbc9a0c62cb8696e
Auto-generated-cl: translation import
2016-09-19 09:57:21 -07:00
Amit Mahajan
eb8b2b1050
Merge "Changes to support read-only apn types." into nyc-mr1-dev am: 9887baecf3
...
am: cd49d13266
Change-Id: Ie2ec37bcb10e2cb7cae2c23c6bcf45ad015c514e
2016-09-19 16:48:57 +00:00
Amit Mahajan
cd49d13266
Merge "Changes to support read-only apn types." into nyc-mr1-dev
...
am: 9887baecf3
Change-Id: I8d0fda57fb0666d4d36be5a7dba645381ceb5c27
2016-09-19 16:46:05 +00:00
Matthew Fritze
011907c1e9
Merge "Update edit text padding on Bluetooth device renaming dialog" into nyc-mr1-dev am: dcc265dcbf
am: 9cdaba3861
...
am: 8525947779
Change-Id: Ia1fdc6fcf607a7ee827cfd48141cf37653a3a519
2016-09-19 16:43:15 +00:00
Matthew Fritze
1823fba4a4
Update edit text padding on Bluetooth device renaming dialog am: 68125813b2
am: 152a666154
...
am: 86a343e8c5
Change-Id: I2c13095ddba956acfd1508e2624b33ceb0dd097a
2016-09-19 16:42:57 +00:00
Amit Mahajan
66a889588d
Changes to support read-only apn types. am: 5892792b17
...
am: b56fab0270
Change-Id: I297226cff2cc7e002686a65ed02b4cea6874f827
2016-09-19 16:41:01 +00:00
Matthew Fritze
8525947779
Merge "Update edit text padding on Bluetooth device renaming dialog" into nyc-mr1-dev am: dcc265dcbf
...
am: 9cdaba3861
Change-Id: Ied27384d32ccc50c3678c6517910c633498d8ee7
2016-09-19 16:39:44 +00:00
Matthew Fritze
86a343e8c5
Update edit text padding on Bluetooth device renaming dialog am: 68125813b2
...
am: 152a666154
Change-Id: Ib420ca9f6a46a4768f9caff824ccf7924b41ceac
2016-09-19 16:39:26 +00:00
Bill Yi
225c634f99
Import translations. DO NOT MERGE
...
Change-Id: I28c47f226372a174128aeceb5d61b686e7db742b
Auto-generated-cl: translation import
2016-09-19 09:38:48 -07:00
Amit Mahajan
b56fab0270
Changes to support read-only apn types.
...
am: 5892792b17
Change-Id: I97d5045f060ac8d475fab876143230e2bea73804
2016-09-19 16:36:26 +00:00
Matthew Fritze
9cdaba3861
Merge "Update edit text padding on Bluetooth device renaming dialog" into nyc-mr1-dev
...
am: dcc265dcbf
Change-Id: I40be92f80e15100b96576050e39699046d0f090d
2016-09-19 16:35:55 +00:00
Matthew Fritze
152a666154
Update edit text padding on Bluetooth device renaming dialog
...
am: 68125813b2
Change-Id: I96e7f964342c5f5b41aa9dfb6aff4e0547551a79
2016-09-19 16:35:53 +00:00
TreeHugger Robot
9887baecf3
Merge "Changes to support read-only apn types." into nyc-mr1-dev
2016-09-19 16:30:17 +00:00
Matthew Fritze
dcc265dcbf
Merge "Update edit text padding on Bluetooth device renaming dialog" into nyc-mr1-dev
2016-09-19 16:29:44 +00:00
Bill Yi
055b63c404
Import translations. DO NOT MERGE
...
Change-Id: If7030d2f90712f31a40fec2403e224dc2991021f
Auto-generated-cl: translation import
2016-09-19 09:20:03 -07:00
Bill Yi
82eff79103
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 31075769
Change-Id: I8ed0dcd8d79e366a4f5963f1ec5b2d60346b7376
2016-09-19 08:53:13 -07:00