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
1cb2797744
Import translations. DO NOT MERGE
...
Change-Id: Ic88453a3d2b7eb50fc739869dc84d3cbce836d6b
Auto-generated-cl: translation import
2014-10-27 10:03:05 -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
Sanket Padawe
61990241c1
am 35f83ca9
: am 844c2a77
: am 7ff1718e
: am 5fd97c55
: Merge "WIP support icon" into lmp-sprout-dev
...
* commit '35f83ca9966e22b5fe4a115114bd37ea1cb07847':
WIP support icon
2014-10-24 17:52:53 +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
Selim Gurun
4920f0fcfd
Merge "Enable DRP only through command line."
2014-10-24 16:33:50 +00:00
Selim Gurun
65723ffe12
Enable DRP only through command line.
...
Enable DRP only through command line so remove it from dev settings.
This reverts commit 7818de107a
.
Change-Id: I2a3c60d9200b79a876ab69c7c495416a41108c39
2014-10-24 14:48:30 +00:00
Geoff Mendal
e70de7dde2
Merge "Import translations. DO NOT MERGE"
2014-10-22 23:57:49 +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
b2a5a19e0c
Import translations. DO NOT MERGE
...
Change-Id: Ie249deb29eeccc524e22d79031615730599c6581
Auto-generated-cl: translation import
2014-10-22 16:42:00 -07: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
480ce321ea
am f7fad6b6
: am eee65f04
: am 286e3c46
: am 266e4296
: Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev
...
* commit 'f7fad6b6db1476f1972fc7399bead8937057906a':
Commit with dialog box but using subinfo records
2014-10-22 22:40:47 +00: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
John Spurlock
047bbf31e9
am 968a2947
: am 5c1f4155
: am 2ae90864
: Settings: Remove obsolete string: heads_up_enabled_title.
...
* commit '968a294720b07c75dde10f371f02808bb5162904':
Settings: Remove obsolete string: heads_up_enabled_title.
2014-10-22 18:20:33 +00:00
John Spurlock
968a294720
am 5c1f4155
: am 2ae90864
: Settings: Remove obsolete string: heads_up_enabled_title.
...
* commit '5c1f41558f47ce79c3b30448d6f5025669704f06':
Settings: Remove obsolete string: heads_up_enabled_title.
2014-10-22 17:15:24 +00:00
John Spurlock
5c1f41558f
am 2ae90864
: Settings: Remove obsolete string: heads_up_enabled_title.
...
* commit '2ae908649c5eb4708af1c29cefbf97cfab2cc341':
Settings: Remove obsolete string: heads_up_enabled_title.
2014-10-22 16:42:54 +00:00
John Spurlock
2ae908649c
Settings: Remove obsolete string: heads_up_enabled_title.
...
Instead of bumping the char limit as requested by translation, simply
remove it altogether, it's no longer used.
Bug: 14244562
Change-Id: I20737ec80c748c1a0eb206819ae82348a05c31a9
2014-10-22 11:36:58 -04:00
Alan Viverette
bfa1932e89
am 2625d8ed
: Merge "Adjust caption preset picker items dimens for Material" into lmp-mr1-dev automerge: 6a4d223
...
automerge: c734de2
* commit 'c734de2aadc7cad71945b9037978f8871eb3f8f6':
Adjust caption preset picker items dimens for Material
2014-10-22 05:52:36 +00:00
Alan Viverette
c734de2aad
am 2625d8ed
: Merge "Adjust caption preset picker items dimens for Material" into lmp-mr1-dev
...
automerge: 6a4d223
* commit '6a4d22389a3f214d73f1d40c5b28966433b656da':
Adjust caption preset picker items dimens for Material
2014-10-22 05:19:48 +00:00
Alan Viverette
6a4d22389a
am 2625d8ed
: Merge "Adjust caption preset picker items dimens for Material" into lmp-mr1-dev
...
* commit '2625d8ed8914ccdfd47983f63df800d991ca3f0c':
Adjust caption preset picker items dimens for Material
2014-10-22 02:08:12 +00:00
Alan Viverette
2625d8ed89
Merge "Adjust caption preset picker items dimens for Material" into lmp-mr1-dev
2014-10-22 01:25:24 +00:00
Alexandra Gherghina
a160b96005
am b9d05d6c
: Merge "Fix user spinner anchor following system ui changes" into lmp-mr1-dev automerge: 3748b94
...
automerge: 3ac497d
* commit '3ac497d8d5ba1f1b9f3e5e4d2b8af8ddc7539025':
Fix user spinner anchor following system ui changes
2014-10-22 00:59:20 +00:00
Alexandra Gherghina
3ac497d8d5
am b9d05d6c
: Merge "Fix user spinner anchor following system ui changes" into lmp-mr1-dev
...
automerge: 3748b94
* commit '3748b940a3c86377e55d0a505858da2c2fc1cdaa':
Fix user spinner anchor following system ui changes
2014-10-22 00:28:07 +00:00
Selim Gurun
146ab4684a
Merge "Revert "Remove WebView DRP Setting from Developer Settings""
2014-10-22 00:07:27 +00:00
Selim Gurun
7818de107a
Revert "Remove WebView DRP Setting from Developer Settings"
...
This reverts commit 90886b8284
.
Conflicts:
src/com/android/settings/DevelopmentSettings.java
Change-Id: Ib41061bfbd74294ad643173c0caaf5f66bba410e
2014-10-21 16:56:46 -07:00
Alan Viverette
285fb04711
Adjust caption preset picker items dimens for Material
...
BUG: 18027521
Change-Id: Icce397410af495639df0b6852b21c159ec103ed8
2014-10-21 16:51:54 -07:00
Alexandra Gherghina
2999ce46c3
am 7574ee6a
: am aadc070a
: Move up spinner in apps screen
...
automerge: 9dbaf77
* commit '9dbaf77696c21b7ab857d7048fbbf442a3d23308':
Move up spinner in apps screen
2014-10-21 22:57:20 +00:00
Alexandra Gherghina
3748b940a3
am b9d05d6c
: Merge "Fix user spinner anchor following system ui changes" into lmp-mr1-dev
...
* commit 'b9d05d6c63c7bdd866b2cfb3e5b549c352d1493f':
Fix user spinner anchor following system ui changes
2014-10-21 22:29:39 +00:00
Alexandra Gherghina
b9d05d6c63
Merge "Fix user spinner anchor following system ui changes" into lmp-mr1-dev
2014-10-21 22:20:07 +00:00
Alexandra Gherghina
9dbaf77696
am 7574ee6a
: am aadc070a
: Move up spinner in apps screen
...
* commit '7574ee6a257b7d24447a9ec9767b8d985baaafcf':
Move up spinner in apps screen
2014-10-21 22:19:36 +00:00
Alexandra Gherghina
7574ee6a25
am aadc070a
: Move up spinner in apps screen
...
* commit 'aadc070a35ca47940e9fa964ba68c5ce817202ef':
Move up spinner in apps screen
2014-10-21 22:14:30 +00:00
Sanket Padawe
266e429657
Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev
2014-10-21 21:56:06 +00:00
Sanket Padawe
a501137f26
Commit with dialog box but using subinfo records
...
Change-Id: I144aa8899eb050db29a9d78aaf7af4c1f31d9eab
2014-10-21 14:16:12 -07:00
Alexandra Gherghina
aadc070a35
Move up spinner in apps screen
...
Bug: 18006320
Change-Id: Ic23c2c3e02a6c6a20b180065975228d42fd91899
2014-10-21 18:39:07 +01:00
John Spurlock
e519a16545
am 12680faf
: am e926cd5c
: am 196aaceb
: Merge "Settings: Display \'Calls\' category on non-voice devices." into lmp-mr1-dev
...
* commit '12680fafb7bdf67a8cf624e3533321c7df2aa11a':
Settings: Display 'Calls' category on non-voice devices.
2014-10-21 16:37:48 +00:00