Geoff Mendal
855f0d2643
Import translations. DO NOT MERGE
...
automerge: c7df50c
2014-10-27 17:11:43 +00:00
Geoff Mendal
c7df50c5fd
Import translations. DO NOT MERGE
...
Change-Id: Id43df7ce7c8056dcdd1813ddc804acbc3ba46dd6
Auto-generated-cl: translation import
2014-10-27 09:49:35 -07: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
vandwalle
30ac117228
prettify debug informations
...
Change-Id: I8e5c982f882a333e3f5ffdde6418447572547ea5
2014-10-26 14:15:33 -07:00
Jim Miller
a30955a663
am 500ecf26: am dd932476: Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev
...
* commit '500ecf26d15d75fa5baa8bc98ff61792fa858857':
Minor cleanup in EncryptionInterstitial
2014-10-25 01:20:33 +00:00
Jim Miller
500ecf26d1
am dd932476: Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev
...
* commit 'dd932476b92f9d0e7ef8617d32a1d49d830b6787':
Minor cleanup in EncryptionInterstitial
2014-10-25 01:09:05 +00:00
Jim Miller
dd932476b9
Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev
2014-10-25 01:01:17 +00:00
Michael Wright
56f8032a0c
am 7f402457: am ca6bc2ae: Skip Misc/Overcounted battery stats in release builds. automerge: f7a5017 automerge: 95f29a1
...
* commit '7f402457773721192d906af817db7256a4622e5e':
Skip Misc/Overcounted battery stats in release builds.
2014-10-24 23:27:51 +00:00
Michael Wright
7f40245777
am ca6bc2ae: Skip Misc/Overcounted battery stats in release builds. automerge: f7a5017 automerge: 95f29a1
...
* commit 'ca6bc2aefad547d3ca3897b5ef8b8d5feafc7e2b':
Skip Misc/Overcounted battery stats in release builds.
2014-10-24 23:03:44 +00:00
Jim Miller
59864d2ce7
Minor cleanup in EncryptionInterstitial
...
Fixes bug 18037481
Change-Id: I4e9dcc86a2d3db5c9311d5f743f03db19ca164e6
2014-10-24 15:41:44 -07:00
Michael Wright
ca6bc2aefa
Skip Misc/Overcounted battery stats in release builds. automerge: f7a5017
...
automerge: 95f29a1
2014-10-24 22:33:50 +00:00
Wink Saville
b003a85941
Change subId to int from long
...
Change-Id: Idae6335e63e7b1e4e714bc17e71b1a4705e38474
2014-10-24 15:08:44 -07:00
Michael Wright
95f29a1930
Skip Misc/Overcounted battery stats in release builds.
...
automerge: f7a5017
2014-10-24 22:04:21 +00:00
Sanket Padawe
6215d8dda9
Default sim name set to carrier name in sim settings automerge: 745046c
...
automerge: 8d60883
2014-10-24 21:29:41 +00:00
Michael Wright
f7a5017fa6
Skip Misc/Overcounted battery stats in release builds.
...
Bug: 18090734
Change-Id: I24d8eea9fcb0d0b9e50d512325ed91ce70eb16ac
2014-10-24 14:25:49 -07:00
Sanket Padawe
8d60883ce4
Default sim name set to carrier name in sim settings
...
automerge: 745046c
2014-10-24 21:09:57 +00:00
Sanket Padawe
745046c157
Default sim name set to carrier name in sim settings
...
Default sim name in SIM settings UI should be carrier name untill user
specifies a name for SIM.
Bug: 17732079
Change-Id: I302ad00095fd06b393dbe358b135f031390a3678
2014-10-24 11:51:44 -07:00
Sanket Padawe
409fa9f97b
am f6499e01: am 22eb414b: Set subscription id for "ask everytime" in sim settings
...
* commit 'f6499e01376208bdeb26f05d02b98d7d04d1a3fb':
Set subscription id for "ask everytime" in sim settings
2014-10-24 18:44:16 +00:00
Sanket Padawe
f6499e0137
am 22eb414b: Set subscription id for "ask everytime" in sim settings
...
* commit '22eb414bbd0b1d4c988d71f97a24a9ff48f5cf9b':
Set subscription id for "ask everytime" in sim settings
2014-10-24 18:39:30 +00:00
Sanket Padawe
22eb414bbd
Set subscription id for "ask everytime" in sim settings
...
Added default subscription id when user selects "Ask everytime"
while selecting sim card to select for phone calls.
Change-Id: I7f720f919850a85b65af648c9a7e078a0c05815e
2014-10-24 18:24:51 +00: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
Alexandra Gherghina
14819b0d3d
Close account settings if there's no account to show
...
This makes sure we don't keep the Settings screen on when there are no
accounts left to show.
Bug: 17713957
Change-Id: I6e1d6819477f051e3a521360aa3138b18fdd3fe2
2014-10-24 17:00:38 +01:00
Baligh Uddin
0f080f9d40
am 45ab2fe4: (-s ours) am 52e57d2d: (-s ours) am cc5b08b6: (-s ours) am 8d7fdc61: (-s ours) Import translations. DO NOT MERGE
...
* commit '45ab2fe400cc0b6e50c76239f1d40c5b5daaa9ec':
Import translations. DO NOT MERGE
2014-10-23 22:24:11 +00:00
Amith Yamasani
d505dcbd66
am 95a5169d: am 0e64404a: am 526e4b41: am c1dc8752: Merge "Disable factory reset for secondary users" into lmp-dev
...
* commit '95a5169d564466a68ae13e28494f8cefe6153e2f':
Disable factory reset for secondary users
2014-10-23 22:24:10 +00:00
Geoff Mendal
7b18e2f2fe
am 78819ec3: (-s ours) am f62af382: (-s ours) am 5b7e25aa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit '78819ec30af2139b04bd39dde35fbbe3eaf33bae':
Import translations. DO NOT MERGE
2014-10-23 22:24:09 +00:00
Baligh Uddin
45ab2fe400
am 52e57d2d: (-s ours) am cc5b08b6: (-s ours) am 8d7fdc61: (-s ours) Import translations. DO NOT MERGE
...
* commit '52e57d2d252e585c034161173f605d773821c588':
Import translations. DO NOT MERGE
2014-10-23 22:16:13 +00:00
Amith Yamasani
95a5169d56
am 0e64404a: am 526e4b41: am c1dc8752: Merge "Disable factory reset for secondary users" into lmp-dev
...
* commit '0e64404a9445c3e073480681d22720240a70f2c1':
Disable factory reset for secondary users
2014-10-23 22:16:12 +00:00
Geoff Mendal
78819ec30a
am f62af382: (-s ours) am 5b7e25aa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit 'f62af382665f7a8c6d4968a6cb15a0cfb638c505':
Import translations. DO NOT MERGE
2014-10-23 22:16:11 +00:00
Baligh Uddin
52e57d2d25
am cc5b08b6: (-s ours) am 8d7fdc61: (-s ours) Import translations. DO NOT MERGE
...
* commit 'cc5b08b63c997acd13d566045d12ff232630e521':
Import translations. DO NOT MERGE
2014-10-23 22:10:38 +00:00
Amith Yamasani
0e64404a94
am 526e4b41: am c1dc8752: Merge "Disable factory reset for secondary users" into lmp-dev
...
* commit '526e4b41550fa70e08cfcfc7bfbc2aa88a9f71d7':
Disable factory reset for secondary users
2014-10-23 22:10:38 +00:00
Baligh Uddin
cc5b08b63c
am 8d7fdc61: (-s ours) Import translations. DO NOT MERGE
...
* commit '8d7fdc618a914d6c35f1033dafac5ab3cf0c930e':
Import translations. DO NOT MERGE
2014-10-23 21:52:59 +00:00
Baligh Uddin
8d7fdc618a
Import translations. DO NOT MERGE
...
Change-Id: I9e17d1cbaab06ef2e48001b946476e99d70ba195
Auto-generated-cl: translation import
2014-10-23 14:37:38 -07:00
Geoff Mendal
f62af38266
am 5b7e25aa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit '5b7e25aa7cfa2e39f4168049eda0b435e87e147a':
Import translations. DO NOT MERGE
2014-10-23 00:14:41 +00:00
Amith Yamasani
526e4b4155
am c1dc8752: Merge "Disable factory reset for secondary users" into lmp-dev
...
* commit 'c1dc875224f9b2286bfe455f37006aabaa057431':
Disable factory reset for secondary users
2014-10-23 00:02:44 +00:00
Amith Yamasani
c1dc875224
Merge "Disable factory reset for secondary users" into lmp-dev
2014-10-22 23:59:19 +00:00
Geoff Mendal
4561b9e834
am 1303f19b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
* commit '1303f19b5f11fe492e4531239c28ae807efc2e5b':
Import translations. DO NOT MERGE
2014-10-22 23:58:51 +00:00
Geoff Mendal
c07b54afa6
am 04fc60c4: (-s ours) am 8e2fb4c9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '04fc60c4d37617eaad6c2b8bb6002c4679bb0f0a':
Import translations. DO NOT MERGE
2014-10-22 23:58:50 +00:00
Geoff Mendal
5b7e25aa7c
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-10-22 23:57:24 +00: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
04fc60c4d3
am 8e2fb4c9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '8e2fb4c9c46dc15250c24083a312aeebbbf10d22':
Import translations. DO NOT MERGE
2014-10-22 23:55:52 +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
49c5efde90
am 828f5df0: am 9fbff5a3: am 59dc8d1d: SIM settings display name changes
...
* commit '828f5df065320b3f798f64a8b032e5b7c0534a4c':
SIM settings display name changes
2014-10-22 21:40:30 +00:00
