Jeff Sharkey
2fa5c2645e
resolve merge conflicts of 071352de9e to master.
...
Change-Id: Ib777927fd479fcb567d005910930fda7354865d0
2015-10-20 16:04:59 -07:00
Geoff Mendal
8fa7e23b32
Import translations. DO NOT MERGE am: 3a7368e9c3 -s ours am: 6bdaffa2af -s ours am: 275a235437 -s ours
...
am: 8da5906dcb
2015-10-20 21:37:42 +00:00
Jason Monk
30e0a4a48a
resolve merge conflicts of 8e18934478 to master.
...
Change-Id: I07300436383f8f67cb1d85e6f06f2b2ca3a27534
2015-10-20 14:29:43 -07:00
Jeff Sharkey
071352de9e
Merge "Clamp large data usage values." into mnc-dr-dev am: 29b0ea2dbf am: a8bd650e81
...
am: 10338550c4
2015-10-20 18:30:09 +00:00
Jeff Sharkey
10338550c4
Merge "Clamp large data usage values." into mnc-dr-dev am: 29b0ea2dbf
...
am: a8bd650e81
2015-10-20 17:48:14 +00:00
Jeff Sharkey
a8bd650e81
Merge "Clamp large data usage values." into mnc-dr-dev
...
am: 29b0ea2dbf
2015-10-20 17:32:47 +00:00
Jeff Sharkey
29b0ea2dbf
Merge "Clamp large data usage values." into mnc-dr-dev
2015-10-20 17:21:43 +00:00
Geoff Mendal
8da5906dcb
Import translations. DO NOT MERGE am: 3a7368e9c3 -s ours am: 6bdaffa2af -s ours
...
am: 275a235437
2015-10-20 11:59:56 +00:00
Geoff Mendal
275a235437
Import translations. DO NOT MERGE am: 3a7368e9c3 -s ours
...
am: 6bdaffa2af
2015-10-20 11:56:07 +00:00
Geoff Mendal
6bdaffa2af
Import translations. DO NOT MERGE
...
am: 3a7368e9c3
2015-10-20 11:52:42 +00:00
Geoff Mendal
3a7368e9c3
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 25001286
Change-Id: Idc0260cd6aead133bb00dc3b62ddd21009a6315c
2015-10-19 21:22:01 -07:00
Jason Monk
8e18934478
Hide SIM and IMEI for wifi only devices am: 417a0500c3 am: 2a90c111ee
...
am: 554c3aef41
2015-10-20 03:00:11 +00:00
Jason Monk
554c3aef41
Hide SIM and IMEI for wifi only devices am: 417a0500c3
...
am: 2a90c111ee
2015-10-20 02:22:55 +00:00
Jason Monk
2a90c111ee
Hide SIM and IMEI for wifi only devices
...
am: 417a0500c3
2015-10-20 02:05:14 +00:00
Jason Monk
417a0500c3
Hide SIM and IMEI for wifi only devices
...
Bug: 24342670
Change-Id: Icfb7db0c1b5c6688c16248daa5e6c0443ff45392
2015-10-19 20:02:11 -04:00
Jeff Sharkey
3105ea30d4
Clamp large data usage values.
...
Without clamping, they can wrap around to negative values and cause
all sorts of havok. 1TB ought to be enough for anyone: that's 3Mbps
for a solid month.
Bug: 24555152
Change-Id: If92c87f9920c3f05cd3ff2cc6630b1bbb65335b8
2015-10-19 16:41:53 -07:00
Geoff Mendal
57217ae00a
am edfdeeee: (-s ours) am b2568ed0: (-s ours) am 35e01bf7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 84c62dde3d -s ours
...
* commit 'edfdeeee309c19c553f5a5661d4070b5132995cf':
Import translations. DO NOT MERGE
2015-10-19 14:42:38 +00:00
Geoff Mendal
edfdeeee30
am b2568ed0: (-s ours) am 35e01bf7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 84c62dde3d -s ours
...
* commit 'b2568ed0d1ae4cdaabcb061b2a503fece4aaa22a':
Import translations. DO NOT MERGE
2015-10-19 14:38:55 +00:00
Geoff Mendal
b2568ed0d1
am 35e01bf7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 84c62dde3d -s ours
...
* commit '35e01bf70f560c3651ae34968cd1082cb2dd8536':
Import translations. DO NOT MERGE
2015-10-19 14:33:34 +00:00
Geoff Mendal
35e01bf70f
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
am: 84c62dde3d
2015-10-19 14:28:59 +00:00
Geoff Mendal
84c62dde3d
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-10-19 14:27:20 +00:00
Geoff Mendal
7f62f29b24
Import translations. DO NOT MERGE
...
Change-Id: I9068be1f0479a7025a7eacfce03046cd54e3d1a8
Auto-generated-cl: translation import
2015-10-19 07:25:38 -07:00
Geoff Mendal
2f38c25b0b
Merge "Import translations. DO NOT MERGE"
2015-10-19 13:40:02 +00:00
Geoff Mendal
f1bd8f3446
Import translations. DO NOT MERGE
...
Change-Id: I5165b5d0fe4fc0cf9dff9ccf44fe1aa95db26628
Auto-generated-cl: translation import
2015-10-19 06:39:34 -07:00
Geoff Mendal
3ea647bcdc
am 1c95645b: (-s ours) am ca059bfb: (-s ours) am 51b43e12: (-s ours) am 99131cf6: (-s ours) am f191953c: (-s ours) Import translations. DO NOT MERGE am: 862568de0d -s ours
...
* commit '1c95645b3bbc55db50d5720e29a2b867d849d0f8':
Import translations. DO NOT MERGE
2015-10-19 13:21:41 +00:00
Geoff Mendal
1c95645b3b
am ca059bfb: (-s ours) am 51b43e12: (-s ours) am 99131cf6: (-s ours) am f191953c: (-s ours) Import translations. DO NOT MERGE am: 862568de0d -s ours
...
* commit 'ca059bfb439df9db2c4ee2f7d860e8a29bf0a91f':
Import translations. DO NOT MERGE
2015-10-19 13:17:46 +00:00
Geoff Mendal
ca059bfb43
am 51b43e12: (-s ours) am 99131cf6: (-s ours) am f191953c: (-s ours) Import translations. DO NOT MERGE am: 862568de0d -s ours
...
* commit '51b43e1236fa70711d914d0bc117a1ac745f0172':
Import translations. DO NOT MERGE
2015-10-19 13:13:08 +00:00
Geoff Mendal
51b43e1236
am 99131cf6: (-s ours) am f191953c: (-s ours) Import translations. DO NOT MERGE
...
am: 862568de0d
2015-10-19 13:09:13 +00:00
Geoff Mendal
862568de0d
am 99131cf6: (-s ours) am f191953c: (-s ours) Import translations. DO NOT MERGE
...
* commit '99131cf64253cf997d8ee6e356843e376a141846':
Import translations. DO NOT MERGE
2015-10-19 13:04:28 +00:00
Geoff Mendal
99131cf642
am f191953c: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f191953c77af3c5b78e576a430577aaf050aa5f1':
Import translations. DO NOT MERGE
2015-10-19 13:01:28 +00:00
Geoff Mendal
f191953c77
Import translations. DO NOT MERGE
...
Change-Id: Id2b08418cad5acba5716761650814489a2a94234
Auto-generated-cl: translation import
2015-10-19 05:21:10 -07:00
Julia Reynolds
36d2b3faa9
Merge "Update sorting for rule types and instances."
2015-10-16 19:29:39 +00:00
Maurice Lam
80129d936b
Merge "Fix preferences v14 issues in lock screeen setup"
2015-10-16 17:44:04 +00:00
Jason Monk
c03a45fa9c
am 6d85d168: am d2975f9d: am d9774c9f: am cdcba9ce: Merge "Fix crashes in Settings" into mnc-dr-dev
...
* commit '6d85d1686e6a333fe990d9e3ae5b978e8a8ce8c2':
Fix crashes in Settings
2015-10-16 16:56:40 +00:00
Jason Monk
6d85d1686e
am d2975f9d: am d9774c9f: am cdcba9ce: Merge "Fix crashes in Settings" into mnc-dr-dev
...
* commit 'd2975f9d0c12b46978c2a108961617293eeaba85':
Fix crashes in Settings
2015-10-16 16:49:38 +00:00
Jason Monk
d2975f9d0c
am d9774c9f: am cdcba9ce: Merge "Fix crashes in Settings" into mnc-dr-dev
...
* commit 'd9774c9f5b4b5e0c51c03795cdc1658d1388ec87':
Fix crashes in Settings
2015-10-16 16:45:11 +00:00
Jason Monk
d9774c9f5b
am cdcba9ce: Merge "Fix crashes in Settings" into mnc-dr-dev
...
* commit 'cdcba9ce5f44cf4cad9e308919272db4e15e9717':
Fix crashes in Settings
2015-10-16 16:41:22 +00:00
Jason Monk
cdcba9ce5f
Merge "Fix crashes in Settings" into mnc-dr-dev
2015-10-16 16:33:56 +00:00
Jeff Sharkey
1f5e53f9db
am bfee8b48: am 31e2ce0e: am d36edb9f: am de005547: Merge "Bail if activity was destroyed." into mnc-dr-dev
...
* commit 'bfee8b484f3bb4807d185526058ea463f91f1091':
Bail if activity was destroyed.
2015-10-16 16:33:53 +00:00
Jeff Sharkey
bfee8b484f
am 31e2ce0e: am d36edb9f: am de005547: Merge "Bail if activity was destroyed." into mnc-dr-dev
...
* commit '31e2ce0ea617bfe07a5c20d3c2b0433f14531678':
Bail if activity was destroyed.
2015-10-16 16:29:54 +00:00
Jeff Sharkey
31e2ce0ea6
am d36edb9f: am de005547: Merge "Bail if activity was destroyed." into mnc-dr-dev
...
* commit 'd36edb9f462ee430d53515e02534e20d92e7a5d0':
Bail if activity was destroyed.
2015-10-16 16:24:30 +00:00
Jeff Sharkey
d36edb9f46
am de005547: Merge "Bail if activity was destroyed." into mnc-dr-dev
...
* commit 'de005547bae3799265fdad8f61720a82241f4b07':
Bail if activity was destroyed.
2015-10-16 16:18:41 +00:00
Jeff Sharkey
de005547ba
Merge "Bail if activity was destroyed." into mnc-dr-dev
2015-10-16 16:14:47 +00:00
Julia Reynolds
8fe6efc8e1
Update sorting for rule types and instances.
...
Bug: 22977552
Change-Id: I671f45f156f8f3faa4ce55608dd1d61b9f07d16a
2015-10-16 11:43:54 -04:00
Jason Monk
562e40f66a
Fix add account screen
...
Don't use layout that didn't do anything special.
Bug: 24961118
Change-Id: I9207ee16e8c2c8325f3b4c00e423ac015170d10e
2015-10-16 10:59:02 -04:00
Jason Monk
afa3a1a0cb
Fix ManagedServiceSettings to work with Preferencev14
...
Bug: 25007000
Change-Id: I5e3a59b77001ce0e2928b35fa1b87878e22d4fbd
2015-10-16 10:52:16 -04:00
Jason Monk
77b11fa470
Fix crashes in Settings
...
Fix problems from unsupported intents being launched through adb.
Remove the ones we can, fix the other.
Bug: 19634064
Change-Id: Iba0adeb135e76ee70365e5891380ba8b55110c26
2015-10-16 10:13:53 -04:00
Maurice Lam
bd28ceef10
Fix preferences v14 issues in lock screeen setup
...
Preferences support-v14 expects a RecyclerView, and cannot override
onCreateView to inflate custom views. This changes
SetupChooseLockGeneric to use suw_template_no_scroll and let
preference framework inflate its RecyclerView inside it.
Bug: 24929660
Change-Id: Icda0fed37b68d4cffb49da46a241185f32d7e467
2015-10-15 14:34:06 -07:00
Jason Monk
2b7592d817
Fix SUW Settings themes
...
Bug: 24929660
Change-Id: I21979a115e968a9e3a7ecd42f8258d0ce470cd6e
2015-10-15 15:37:59 -04:00
Amit Mahajan
2ffc11c069
am 7b990298: am f20d51f3: am 6d042a69: am 1704ca96: Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev
...
* commit '7b990298323f0e24c87123d955cfd08717a079d3':
Change to add user_visible field to Carriers table.
2015-10-14 23:54:00 +00:00
