Paul Crowley
1e4d6e64a4
Merge "Don\'t show a pattern-specific prompt at encryption time." into lmp-mr1-dev automerge: e6ad7bf
...
automerge: 966a1ca
2014-11-05 18:05:05 +00:00
Paul Crowley
966a1cadbf
Merge "Don\'t show a pattern-specific prompt at encryption time." into lmp-mr1-dev
...
automerge: e6ad7bf
2014-11-05 16:35:53 +00:00
Paul Crowley
01fbd9fd3c
Don't show a pattern-specific prompt at encryption time.
...
Bug: 18054895
Change-Id: I8a029142085b9e7f59efc8e313b6438734d5a1bb
2014-11-05 00:43:33 +00:00
vandwalle
68421fd5c6
am e1cb279f: am 508a693c: Merge "sanitize strings and error messages in wiFi picker" into lmp-mr1-dev
...
* commit 'e1cb279f3ebb8813c07c988c3a432825563ccfda':
sanitize strings and error messages in wiFi picker
2014-11-04 20:18:58 +00:00
vandwalle
e1cb279f3e
am 508a693c: Merge "sanitize strings and error messages in wiFi picker" into lmp-mr1-dev
...
* commit '508a693c9a240a5f297704c8cc837a3cb5702d6c':
sanitize strings and error messages in wiFi picker
2014-11-04 20:12:02 +00:00
vandwalle
508a693c9a
Merge "sanitize strings and error messages in wiFi picker" into lmp-mr1-dev
2014-11-04 20:07:44 +00:00
vandwalle
b245731e88
sanitize strings and error messages in wiFi picker
...
Change-Id: I642e79b40902bb45a503be949dea6a09d94b3bc8
2014-11-04 12:05:30 -08:00
Alexandra Gherghina
ab054dc138
am 06ad8ce5: am d47f15a4: Merge "Apply predefined icon and label to managed profiles" into lmp-mr1-dev
...
* commit '06ad8ce5974de67017abb8773646743295cf44f4':
Apply predefined icon and label to managed profiles
2014-11-04 13:59:22 +00:00
Alexandra Gherghina
06ad8ce597
am d47f15a4: Merge "Apply predefined icon and label to managed profiles" into lmp-mr1-dev
...
* commit 'd47f15a4746cda8522fc986a1b2478c76c46d71f':
Apply predefined icon and label to managed profiles
2014-11-04 13:54:52 +00:00
Alexandra Gherghina
d47f15a474
Merge "Apply predefined icon and label to managed profiles" into lmp-mr1-dev
2014-11-04 13:50:52 +00:00
PauloftheWest
f75a8182bd
Merge "Added cellular data popup in DataUsage" into lmp-mr1-dev automerge: ba53a84
...
automerge: e8cf3ee
2014-11-04 00:06:12 +00:00
PauloftheWest
e8cf3eed17
Merge "Added cellular data popup in DataUsage" into lmp-mr1-dev
...
automerge: ba53a84
2014-11-03 23:28:42 +00:00
PauloftheWest
ba53a846b1
Merge "Added cellular data popup in DataUsage" into lmp-mr1-dev
2014-11-03 23:00:19 +00:00
Geoff Mendal
0de0fe0afc
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
2014-11-03 18:03:03 +00:00
Geoff Mendal
99a3f80773
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-11-03 18:01:41 +00:00
Geoff Mendal
a9f8d29262
Import translations. DO NOT MERGE
...
Change-Id: Id22a6dbb43d8911376c6cb3be95d6fce0011638f
Auto-generated-cl: translation import
2014-11-03 10:01:02 -08:00
Geoff Mendal
e15da20061
Import translations. DO NOT MERGE
...
Change-Id: I6ec1f3604264e67b37956a3e6f0960ddfc0f8ee7
Auto-generated-cl: translation import
2014-11-03 09:58:33 -08:00
Jason Monk
7833aae782
am d5032cb5: am 8f5c0e46: Merge "Bring screen lock setting back to screen pinning" into lmp-mr1-dev
...
* commit 'd5032cb5e6d591454902339b7af486d1a1e2edb8':
Bring screen lock setting back to screen pinning
2014-11-03 14:50:44 +00:00
Jason Monk
d5032cb5e6
am 8f5c0e46: Merge "Bring screen lock setting back to screen pinning" into lmp-mr1-dev
...
* commit '8f5c0e4660629546fb651e8bc739677a60ad3302':
Bring screen lock setting back to screen pinning
2014-11-03 14:45:21 +00:00
Jason Monk
78121d9d10
Bring screen lock setting back to screen pinning
...
The material design of the request has removed this option from
the dialog, and now needs to be in settings. When screen
pinning is off it shows a description of how to use the feature,
however when on it shows a switch to control whether it locks
the device on exit. This setting defaults to on if there is a
lock pin/pattern.
Bug: 16957435
Change-Id: I59e0d64964cee4302e6ecff59e622cfe11422807
2014-10-31 15:45:12 -04:00
Alexandra Gherghina
0f5440f6e2
Apply predefined icon and label to managed profiles
...
Bug: 18132630
Change-Id: Ie6cfee420847d6992accb0bc0ca3f5535260bc55
2014-10-31 12:03:53 +00:00
PauloftheWest
de33844d81
Added cellular data popup in DataUsage
...
+ If the user attempts to enable data usage on a SIM that is not the
default, the system will confirm that the user wants data to go through
the new SIM.
Change-Id: Ia1652a30a3641bb29eadad20b2dc61321227a961
2014-10-30 13:56:23 -07:00
Sanket Padawe
4e4a3f8963
am 4a1c5486: am 917aaf9e: Merge "Add sim color selection in settings" into lmp-mr1-dev
...
* commit '4a1c5486b8d187ceb012954dc528bc8417c7cb3e':
Add sim color selection in settings
2014-10-30 11:03:43 +00:00
PauloftheWest
109ca52c67
am 22f257b0: am 93c10334: Merge "Added IMEI status activity." into lmp-mr1-dev
...
* commit '22f257b091a444b0749e66faa4dc79fd24adacbf':
Added IMEI status activity.
2014-10-30 11:03:29 +00:00
Paul Lawrence
870de3eeb9
am be492644: am 00abeba2: Merge "Make emergency button right size" into lmp-mr1-dev
...
* commit 'be492644102083557fa47cde3ee9110826677079':
Make emergency button right size
2014-10-30 10:18:26 +00:00
Geoff Mendal
d4aa6dd89d
Import translations. DO NOT MERGE
...
Change-Id: I79579c3aa684edf09b0bc85941dea8a70a4c12fc
Auto-generated-cl: translation import
2014-10-29 13:31:24 -07:00
Geoff Mendal
15d1b346cf
Import translations. DO NOT MERGE
...
Change-Id: I2b2810ffec88c69ab46b6672df00d381ce2429b2
Auto-generated-cl: translation import
2014-10-29 13:28:44 -07:00
Sanket Padawe
4a1c5486b8
am 917aaf9e: Merge "Add sim color selection in settings" into lmp-mr1-dev
...
* commit '917aaf9ebd2893b9d0cebc2b08c4f7d814fa53c7':
Add sim color selection in settings
2014-10-28 22:53:07 +00:00
Sanket Padawe
917aaf9ebd
Merge "Add sim color selection in settings" into lmp-mr1-dev
2014-10-28 22:48:33 +00:00
PauloftheWest
22f257b091
am 93c10334: Merge "Added IMEI status activity." into lmp-mr1-dev
...
* commit '93c10334c8380b997554a02f6071b3bc620e7705':
Added IMEI status activity.
2014-10-28 22:48:29 +00:00
PauloftheWest
93c10334c8
Merge "Added IMEI status activity." into lmp-mr1-dev
2014-10-28 22:45:34 +00:00
Sanket Padawe
abc505aac3
Add sim color selection in settings
...
Adding a dropdown list to select sim color from sim settings UI.
Change-Id: I26da0a79f5b1edf829fc5d46af2c0c23962226b8
2014-10-28 14:01:50 -07:00
Paul Lawrence
be49264410
am 00abeba2: Merge "Make emergency button right size" into lmp-mr1-dev
...
* commit '00abeba2c08b656db924d967a0733aa76aea40a7':
Make emergency button right size
2014-10-28 20:14:31 +00:00
PauloftheWest
f41aaa249b
Added IMEI status activity.
...
+ Added IMEI support from MTK with formatting changes. Now extra SIM
IMEI information is displayed in a seperate activity.
Bug: 17935115
Change-Id: I48942d77650bef2a1778996db3b1ec3a9d87492c
2014-10-28 13:00:11 -07:00
Paul Lawrence
59717ad3a7
Make emergency button right size
...
Bug: 18123894
Bug: 17394128
Change-Id: I248890b82f62146e1814172fd8b67e9a39661997
2014-10-28 19:01:18 +00:00
Geoff Mendal
f571e511ba
Import translations. DO NOT MERGE
...
Change-Id: Ia682e947ee01ba5ecc42b3a4578fcc010a7efead
Auto-generated-cl: translation import
2014-10-27 09:43:16 -07:00
Geoff Mendal
40f84ca020
Import translations. DO NOT MERGE
...
Change-Id: Ifc5fc4573b40b501282cb71a17ba8c6873dc64c6
Auto-generated-cl: translation import
2014-10-27 09:40:31 -07:00
Sanket Padawe
35f83ca996
am 844c2a77: am 7ff1718e: am 5fd97c55: Merge "WIP support icon" into lmp-sprout-dev
...
* commit '844c2a77f44491ed8fec0e43919c4a3efae0acdf':
WIP support icon
2014-10-24 17:48:17 +00:00
Sanket Padawe
844c2a77f4
am 7ff1718e: am 5fd97c55: Merge "WIP support icon" into lmp-sprout-dev
...
* commit '7ff1718e1fb58b38ebfa4ec0d45e788c9acd2b5c':
WIP support icon
2014-10-24 17:42:48 +00:00
Sanket Padawe
7ff1718e1f
am 5fd97c55: Merge "WIP support icon" into lmp-sprout-dev
...
* commit '5fd97c551fb8cbcc43d762d9c609be1061cc5170':
WIP support icon
2014-10-24 17:39:21 +00:00
Sanket Padawe
5fd97c551f
Merge "WIP support icon" into lmp-sprout-dev
2014-10-24 17:34:24 +00:00
Sanket Padawe
0f596b90fe
WIP support icon
...
Added static sim icon to alert box for selecting different sim accounts.
Change-Id: Ib22ceba4b96d636754d7946859f194488517ff9d
2014-10-24 10:17:08 -07:00
Geoff Mendal
1303f19b5f
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
2014-10-22 23:57:03 +00:00
Geoff Mendal
82454b4721
Import translations. DO NOT MERGE
...
Change-Id: I895931be5f341683d3bed7a087b3b1c4dc5a0359
Auto-generated-cl: translation import
2014-10-22 16:29:28 -07:00
Geoff Mendal
bd265c947b
Import translations. DO NOT MERGE
...
Change-Id: I5df28d6eefcb0e0e3e2fc49baa1a751fa830319b
Auto-generated-cl: translation import
2014-10-22 16:23:27 -07:00
Geoff Mendal
8e2fb4c9c4
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-10-22 23:22:02 +00:00
Geoff Mendal
d5032606cc
Import translations. DO NOT MERGE
...
Change-Id: I7a571f71af317a655f81d6446aebbd5912cd9089
Auto-generated-cl: translation import
2014-10-22 16:20:52 -07:00
Sanket Padawe
f7fad6b6db
am eee65f04: am 286e3c46: am 266e4296: Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev
...
* commit 'eee65f0417e879be499a15d006520b30618cc7c2':
Commit with dialog box but using subinfo records
2014-10-22 21:27:13 +00:00
Sanket Padawe
eee65f0417
am 286e3c46: am 266e4296: Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev
...
* commit '286e3c4651fa0af76e092ea52349d5ae2235825d':
Commit with dialog box but using subinfo records
2014-10-22 21:08:13 +00:00
Sanket Padawe
286e3c4651
am 266e4296: Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev
...
* commit '266e429657774dc7aa14029629a9e78c942c6104':
Commit with dialog box but using subinfo records
2014-10-22 20:45:40 +00:00
