OSDN Git Service
Jim Miller [Sat, 25 Oct 2014 03:42:06 +0000 (03:42 +0000)]
am
a30955a6: am
500ecf26: am
dd932476: Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev
* commit '
a30955a6634323dfc1ed2704ce0ca2f4f19d3ef3':
Minor cleanup in EncryptionInterstitial
Michael Wright [Sat, 25 Oct 2014 02:36:55 +0000 (02:36 +0000)]
am
56f8032a: am
7f402457: am
ca6bc2ae: Skip Misc/Overcounted battery stats in release builds. automerge:
f7a5017 automerge:
95f29a1
* commit '
56f8032a0c826019ac5588dc2f059a4bf00a0455':
Skip Misc/Overcounted battery stats in release builds.
Sanket Padawe [Sat, 25 Oct 2014 02:35:52 +0000 (02:35 +0000)]
am
6215d8dd: Default sim name set to carrier name in sim settings automerge:
745046c automerge:
8d60883
* commit '
6215d8dda9a94bb7dcacb483b3a26cdd39e299eb':
Default sim name set to carrier name in sim settings
Jim Miller [Sat, 25 Oct 2014 01:20:33 +0000 (01:20 +0000)]
am
500ecf26: am
dd932476: Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev
* commit '
500ecf26d15d75fa5baa8bc98ff61792fa858857':
Minor cleanup in EncryptionInterstitial
Jim Miller [Sat, 25 Oct 2014 01:09:05 +0000 (01:09 +0000)]
am
dd932476: Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev
* commit '
dd932476b92f9d0e7ef8617d32a1d49d830b6787':
Minor cleanup in EncryptionInterstitial
Jim Miller [Sat, 25 Oct 2014 01:01:16 +0000 (01:01 +0000)]
Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev
Michael Wright [Fri, 24 Oct 2014 23:27:51 +0000 (23:27 +0000)]
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.
Michael Wright [Fri, 24 Oct 2014 23:03:44 +0000 (23:03 +0000)]
am
ca6bc2ae: Skip Misc/Overcounted battery stats in release builds. automerge:
f7a5017 automerge:
95f29a1
* commit '
ca6bc2aefad547d3ca3897b5ef8b8d5feafc7e2b':
Skip Misc/Overcounted battery stats in release builds.
Jim Miller [Fri, 24 Oct 2014 22:41:44 +0000 (15:41 -0700)]
Minor cleanup in EncryptionInterstitial
Fixes bug
18037481
Change-Id: I4e9dcc86a2d3db5c9311d5f743f03db19ca164e6
Michael Wright [Fri, 24 Oct 2014 22:33:50 +0000 (22:33 +0000)]
Skip Misc/Overcounted battery stats in release builds. automerge:
f7a5017
automerge:
95f29a1
* commit '
95f29a1930244b9978a55073326c9fb071c2615f':
Skip Misc/Overcounted battery stats in release builds.
Michael Wright [Fri, 24 Oct 2014 22:04:21 +0000 (22:04 +0000)]
Skip Misc/Overcounted battery stats in release builds.
automerge:
f7a5017
* commit '
f7a5017fa60d4cd3c802a45a7b04a4c8f34d969e':
Skip Misc/Overcounted battery stats in release builds.
Sanket Padawe [Fri, 24 Oct 2014 21:29:41 +0000 (21:29 +0000)]
Default sim name set to carrier name in sim settings automerge:
745046c
automerge:
8d60883
* commit '
8d60883ce4f10419c89282395277de60c25a7e4b':
Default sim name set to carrier name in sim settings
Michael Wright [Fri, 24 Oct 2014 21:25:49 +0000 (14:25 -0700)]
Skip Misc/Overcounted battery stats in release builds.
Bug:
18090734
Change-Id: I24d8eea9fcb0d0b9e50d512325ed91ce70eb16ac
Sanket Padawe [Fri, 24 Oct 2014 21:09:57 +0000 (21:09 +0000)]
Default sim name set to carrier name in sim settings
automerge:
745046c
* commit '
745046c15783880eb7e8559c5fb41f8c87e634b3':
Default sim name set to carrier name in sim settings
Sanket Padawe [Fri, 24 Oct 2014 18:15:11 +0000 (11:15 -0700)]
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
Sanket Padawe [Fri, 24 Oct 2014 18:49:34 +0000 (18:49 +0000)]
am
409fa9f9: am
f6499e01: am
22eb414b: Set subscription id for "ask everytime" in sim settings
* commit '
409fa9f97b13ba669ac0553251554e10758579c5':
Set subscription id for "ask everytime" in sim settings
Sanket Padawe [Fri, 24 Oct 2014 18:44:16 +0000 (18:44 +0000)]
am
f6499e01: am
22eb414b: Set subscription id for "ask everytime" in sim settings
* commit '
f6499e01376208bdeb26f05d02b98d7d04d1a3fb':
Set subscription id for "ask everytime" in sim settings
Sanket Padawe [Fri, 24 Oct 2014 18:39:30 +0000 (18:39 +0000)]
am
22eb414b: Set subscription id for "ask everytime" in sim settings
* commit '
22eb414bbd0b1d4c988d71f97a24a9ff48f5cf9b':
Set subscription id for "ask everytime" in sim settings
Sanket Padawe [Fri, 24 Oct 2014 18:01:15 +0000 (11:01 -0700)]
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
Sanket Padawe [Fri, 24 Oct 2014 17:52:53 +0000 (17:52 +0000)]
am
35f83ca9: am
844c2a77: am
7ff1718e: am
5fd97c55: Merge "WIP support icon" into lmp-sprout-dev
* commit '
35f83ca9966e22b5fe4a115114bd37ea1cb07847':
WIP support icon
Sanket Padawe [Fri, 24 Oct 2014 17:48:17 +0000 (17:48 +0000)]
am
844c2a77: am
7ff1718e: am
5fd97c55: Merge "WIP support icon" into lmp-sprout-dev
* commit '
844c2a77f44491ed8fec0e43919c4a3efae0acdf':
WIP support icon
Sanket Padawe [Fri, 24 Oct 2014 17:42:48 +0000 (17:42 +0000)]
am
7ff1718e: am
5fd97c55: Merge "WIP support icon" into lmp-sprout-dev
* commit '
7ff1718e1fb58b38ebfa4ec0d45e788c9acd2b5c':
WIP support icon
Sanket Padawe [Fri, 24 Oct 2014 17:39:21 +0000 (17:39 +0000)]
am
5fd97c55: Merge "WIP support icon" into lmp-sprout-dev
* commit '
5fd97c551fb8cbcc43d762d9c609be1061cc5170':
WIP support icon
Sanket Padawe [Fri, 24 Oct 2014 17:34:23 +0000 (17:34 +0000)]
Merge "WIP support icon" into lmp-sprout-dev
Sanket Padawe [Fri, 24 Oct 2014 17:17:08 +0000 (10:17 -0700)]
WIP support icon
Added static sim icon to alert box for selecting different sim accounts.
Change-Id: Ib22ceba4b96d636754d7946859f194488517ff9d
Selim Gurun [Fri, 24 Oct 2014 16:33:50 +0000 (16:33 +0000)]
Merge "Enable DRP only through command line."
Selim Gurun [Fri, 24 Oct 2014 14:47:14 +0000 (14:47 +0000)]
Enable DRP only through command line.
Enable DRP only through command line so remove it from dev settings.
This reverts commit
7818de107afc62eda1c53177aa46dfc69ba79576.
Change-Id: I2a3c60d9200b79a876ab69c7c495416a41108c39
Baligh Uddin [Thu, 23 Oct 2014 22:31:19 +0000 (22:31 +0000)]
am
0f080f9d: (-s ours) am
45ab2fe4: (-s ours) am
52e57d2d: (-s ours) am
cc5b08b6: (-s ours) am
8d7fdc61: (-s ours) Import translations. DO NOT MERGE
* commit '
0f080f9d4055f52ca276b0f7979bb1798ff4b925':
Import translations. DO NOT MERGE
Amith Yamasani [Thu, 23 Oct 2014 22:31:18 +0000 (22:31 +0000)]
am
d505dcbd: am
95a5169d: am
0e64404a: am
526e4b41: am
c1dc8752: Merge "Disable factory reset for secondary users" into lmp-dev
* commit '
d505dcbd666d8a208d267ce9c78cf7b4d41c5142':
Disable factory reset for secondary users
Geoff Mendal [Thu, 23 Oct 2014 22:31:17 +0000 (22:31 +0000)]
am
7b18e2f2: (-s ours) am
78819ec3: (-s ours) am
f62af382: (-s ours) am
5b7e25aa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
7b18e2f2feeacf4341a73884d033c23c3b16920d':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 23 Oct 2014 22:24:11 +0000 (22:24 +0000)]
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
Amith Yamasani [Thu, 23 Oct 2014 22:24:10 +0000 (22:24 +0000)]
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
Geoff Mendal [Thu, 23 Oct 2014 22:24:09 +0000 (22:24 +0000)]
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
Baligh Uddin [Thu, 23 Oct 2014 22:16:13 +0000 (22:16 +0000)]
am
52e57d2d: (-s ours) am
cc5b08b6: (-s ours) am
8d7fdc61: (-s ours) Import translations. DO NOT MERGE
* commit '
52e57d2d252e585c034161173f605d773821c588':
Import translations. DO NOT MERGE
Amith Yamasani [Thu, 23 Oct 2014 22:16:12 +0000 (22:16 +0000)]
am
0e64404a: am
526e4b41: am
c1dc8752: Merge "Disable factory reset for secondary users" into lmp-dev
* commit '
0e64404a9445c3e073480681d22720240a70f2c1':
Disable factory reset for secondary users
Geoff Mendal [Thu, 23 Oct 2014 22:16:11 +0000 (22:16 +0000)]
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
Baligh Uddin [Thu, 23 Oct 2014 22:10:38 +0000 (22:10 +0000)]
am
cc5b08b6: (-s ours) am
8d7fdc61: (-s ours) Import translations. DO NOT MERGE
* commit '
cc5b08b63c997acd13d566045d12ff232630e521':
Import translations. DO NOT MERGE
Amith Yamasani [Thu, 23 Oct 2014 22:10:38 +0000 (22:10 +0000)]
am
526e4b41: am
c1dc8752: Merge "Disable factory reset for secondary users" into lmp-dev
* commit '
526e4b41550fa70e08cfcfc7bfbc2aa88a9f71d7':
Disable factory reset for secondary users
Baligh Uddin [Thu, 23 Oct 2014 21:52:59 +0000 (21:52 +0000)]
am
8d7fdc61: (-s ours) Import translations. DO NOT MERGE
* commit '
8d7fdc618a914d6c35f1033dafac5ab3cf0c930e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 23 Oct 2014 21:37:38 +0000 (14:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9e17d1cbaab06ef2e48001b946476e99d70ba195
Auto-generated-cl: translation import
Geoff Mendal [Thu, 23 Oct 2014 00:14:41 +0000 (00:14 +0000)]
am
5b7e25aa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
5b7e25aa7cfa2e39f4168049eda0b435e87e147a':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 23 Oct 2014 00:03:23 +0000 (00:03 +0000)]
am
4561b9e8: (-s ours) am
1303f19b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
4561b9e834589e7b8921e446dd15a76a377dfeda':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 23 Oct 2014 00:03:22 +0000 (00:03 +0000)]
am
c07b54af: (-s ours) am
04fc60c4: (-s ours) am
8e2fb4c9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
c07b54afa615d23f88960161048b308d0829bacb':
Import translations. DO NOT MERGE
Amith Yamasani [Thu, 23 Oct 2014 00:02:44 +0000 (00:02 +0000)]
am
c1dc8752: Merge "Disable factory reset for secondary users" into lmp-dev
* commit '
c1dc875224f9b2286bfe455f37006aabaa057431':
Disable factory reset for secondary users
Amith Yamasani [Wed, 22 Oct 2014 23:59:18 +0000 (23:59 +0000)]
Merge "Disable factory reset for secondary users" into lmp-dev
Geoff Mendal [Wed, 22 Oct 2014 23:58:51 +0000 (23:58 +0000)]
am
1303f19b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
1303f19b5f11fe492e4531239c28ae807efc2e5b':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 22 Oct 2014 23:58:50 +0000 (23:58 +0000)]
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
Geoff Mendal [Wed, 22 Oct 2014 23:57:49 +0000 (23:57 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 22 Oct 2014 23:57:24 +0000 (23:57 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Wed, 22 Oct 2014 23:57:03 +0000 (23:57 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 22 Oct 2014 23:55:52 +0000 (23:55 +0000)]
am
8e2fb4c9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
8e2fb4c9c46dc15250c24083a312aeebbbf10d22':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 22 Oct 2014 23:42:00 +0000 (16:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie249deb29eeccc524e22d79031615730599c6581
Auto-generated-cl: translation import
Geoff Mendal [Wed, 22 Oct 2014 23:29:28 +0000 (16:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I895931be5f341683d3bed7a087b3b1c4dc5a0359
Auto-generated-cl: translation import
Geoff Mendal [Wed, 22 Oct 2014 23:23:27 +0000 (16:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5df28d6eefcb0e0e3e2fc49baa1a751fa830319b
Auto-generated-cl: translation import
Geoff Mendal [Wed, 22 Oct 2014 23:22:01 +0000 (23:22 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Wed, 22 Oct 2014 23:20:52 +0000 (16:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7a571f71af317a655f81d6446aebbd5912cd9089
Auto-generated-cl: translation import
Sanket Padawe [Wed, 22 Oct 2014 22:51:07 +0000 (22:51 +0000)]
am
49c5efde: am
828f5df0: am
9fbff5a3: am
59dc8d1d: SIM settings display name changes
* commit '
49c5efde90d75f07f13f01493a77495701545969':
SIM settings display name changes
Paul Jensen [Wed, 22 Oct 2014 22:51:06 +0000 (22:51 +0000)]
am
58fd281c: am
23f4c425: am
246273ae: am
a1640daf: am
d9b8d180: Merge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev
* commit '
58fd281c1f038a382758ceab8f50ce405869d3db':
Launch browser directly when user selects "Mobile Plan".
Sanket Padawe [Wed, 22 Oct 2014 22:40:47 +0000 (22:40 +0000)]
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
Sanket Padawe [Wed, 22 Oct 2014 21:40:30 +0000 (21:40 +0000)]
am
828f5df0: am
9fbff5a3: am
59dc8d1d: SIM settings display name changes
* commit '
828f5df065320b3f798f64a8b032e5b7c0534a4c':
SIM settings display name changes
Paul Jensen [Wed, 22 Oct 2014 21:40:29 +0000 (21:40 +0000)]
am
23f4c425: am
246273ae: am
a1640daf: am
d9b8d180: Merge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev
* commit '
23f4c425a5855e72b0f0f1aa49329c37aef161c7':
Launch browser directly when user selects "Mobile Plan".
Sanket Padawe [Wed, 22 Oct 2014 21:30:29 +0000 (21:30 +0000)]
am
9fbff5a3: am
59dc8d1d: SIM settings display name changes
* commit '
9fbff5a31b4041906c14f2f3d015a1611adb5209':
SIM settings display name changes
Paul Jensen [Wed, 22 Oct 2014 21:30:28 +0000 (21:30 +0000)]
am
246273ae: am
a1640daf: am
d9b8d180: Merge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev
* commit '
246273ae35035b99328a5300e84ecb93067627fc':
Launch browser directly when user selects "Mobile Plan".
Sanket Padawe [Wed, 22 Oct 2014 21:27:13 +0000 (21:27 +0000)]
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
Sanket Padawe [Wed, 22 Oct 2014 21:22:25 +0000 (21:22 +0000)]
am
59dc8d1d: SIM settings display name changes
* commit '
59dc8d1db4c557ace1ded52122993be2e73f6863':
SIM settings display name changes
Paul Jensen [Wed, 22 Oct 2014 21:22:20 +0000 (21:22 +0000)]
am
a1640daf: am
d9b8d180: Merge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev
* commit '
a1640daf6202b12e64bcc26647449695f9ef2a61':
Launch browser directly when user selects "Mobile Plan".
Sanket Padawe [Wed, 22 Oct 2014 21:08:13 +0000 (21:08 +0000)]
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
Amith Yamasani [Wed, 22 Oct 2014 20:51:53 +0000 (13:51 -0700)]
Disable factory reset for secondary users
Search in Settings makes it possible to find the factory reset screen.
Disable the search index in PrivacySettings so that backup and reset
keywords don't get indexed for secondary users.
Also add additional safeguards for other entry points such as public
intents, so that the backup/reset screen does not show any options.
Bug:
18076086
Change-Id: Ie5135fbf4084038c99947a1a107ab4758f0c15a9
Sanket Padawe [Wed, 22 Oct 2014 20:45:40 +0000 (20:45 +0000)]
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
Sanket Padawe [Wed, 22 Oct 2014 18:36:08 +0000 (11:36 -0700)]
SIM settings display name changes
Resubmitting the change for displaying SIM name in SIM settings.
Change-Id: I22d368c3880eaa54d37c9afcfd63d4e94e41fea8
John Spurlock [Wed, 22 Oct 2014 18:20:33 +0000 (18:20 +0000)]
am
968a2947: am
5c1f4155: am
2ae90864: Settings: Remove obsolete string: heads_up_enabled_title.
* commit '
968a294720b07c75dde10f371f02808bb5162904':
Settings: Remove obsolete string: heads_up_enabled_title.
Paul Jensen [Wed, 22 Oct 2014 17:26:58 +0000 (17:26 +0000)]
am
d9b8d180: Merge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev
* commit '
d9b8d1803aac44f382e330ea62bc936e049a1aed':
Launch browser directly when user selects "Mobile Plan".
Paul Jensen [Wed, 22 Oct 2014 17:17:00 +0000 (17:17 +0000)]
Merge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev
John Spurlock [Wed, 22 Oct 2014 17:15:24 +0000 (17:15 +0000)]
am
5c1f4155: am
2ae90864: Settings: Remove obsolete string: heads_up_enabled_title.
* commit '
5c1f41558f47ce79c3b30448d6f5025669704f06':
Settings: Remove obsolete string: heads_up_enabled_title.
John Spurlock [Wed, 22 Oct 2014 16:42:54 +0000 (16:42 +0000)]
am
2ae90864: Settings: Remove obsolete string: heads_up_enabled_title.
* commit '
2ae908649c5eb4708af1c29cefbf97cfab2cc341':
Settings: Remove obsolete string: heads_up_enabled_title.
John Spurlock [Wed, 22 Oct 2014 15:36:58 +0000 (11:36 -0400)]
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
Alan Viverette [Wed, 22 Oct 2014 05:52:36 +0000 (05:52 +0000)]
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
Alan Viverette [Wed, 22 Oct 2014 05:19:48 +0000 (05:19 +0000)]
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
Alan Viverette [Wed, 22 Oct 2014 02:08:12 +0000 (02:08 +0000)]
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
Alan Viverette [Wed, 22 Oct 2014 01:25:23 +0000 (01:25 +0000)]
Merge "Adjust caption preset picker items dimens for Material" into lmp-mr1-dev
Alexandra Gherghina [Wed, 22 Oct 2014 00:59:20 +0000 (00:59 +0000)]
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
Alexandra Gherghina [Wed, 22 Oct 2014 00:28:07 +0000 (00:28 +0000)]
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
Selim Gurun [Wed, 22 Oct 2014 00:07:26 +0000 (00:07 +0000)]
Merge "Revert "Remove WebView DRP Setting from Developer Settings""
Selim Gurun [Tue, 21 Oct 2014 23:31:15 +0000 (16:31 -0700)]
Revert "Remove WebView DRP Setting from Developer Settings"
This reverts commit
90886b8284698698c09f8d272308597989fba92c.
Conflicts:
src/com/android/settings/DevelopmentSettings.java
Change-Id: Ib41061bfbd74294ad643173c0caaf5f66bba410e
Alan Viverette [Tue, 21 Oct 2014 23:51:54 +0000 (16:51 -0700)]
Adjust caption preset picker items dimens for Material
BUG:
18027521
Change-Id: Icce397410af495639df0b6852b21c159ec103ed8
Alexandra Gherghina [Tue, 21 Oct 2014 22:57:20 +0000 (22:57 +0000)]
am
7574ee6a: am
aadc070a: Move up spinner in apps screen
automerge:
9dbaf77
* commit '
9dbaf77696c21b7ab857d7048fbbf442a3d23308':
Move up spinner in apps screen
Alexandra Gherghina [Tue, 21 Oct 2014 22:29:39 +0000 (22:29 +0000)]
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
Alexandra Gherghina [Tue, 21 Oct 2014 22:20:06 +0000 (22:20 +0000)]
Merge "Fix user spinner anchor following system ui changes" into lmp-mr1-dev
Alexandra Gherghina [Tue, 21 Oct 2014 22:19:36 +0000 (22:19 +0000)]
am
7574ee6a: am
aadc070a: Move up spinner in apps screen
* commit '
7574ee6a257b7d24447a9ec9767b8d985baaafcf':
Move up spinner in apps screen
Alexandra Gherghina [Tue, 21 Oct 2014 22:14:30 +0000 (22:14 +0000)]
am
aadc070a: Move up spinner in apps screen
* commit '
aadc070a35ca47940e9fa964ba68c5ce817202ef':
Move up spinner in apps screen
Sanket Padawe [Tue, 21 Oct 2014 21:56:06 +0000 (21:56 +0000)]
Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev
Sanket Padawe [Tue, 21 Oct 2014 21:16:12 +0000 (14:16 -0700)]
Commit with dialog box but using subinfo records
Change-Id: I144aa8899eb050db29a9d78aaf7af4c1f31d9eab
Alexandra Gherghina [Thu, 16 Oct 2014 22:03:10 +0000 (23:03 +0100)]
Move up spinner in apps screen
Bug:
18006320
Change-Id: Ic23c2c3e02a6c6a20b180065975228d42fd91899
Alexandra Gherghina [Tue, 21 Oct 2014 17:03:17 +0000 (17:03 +0000)]
am
74ebc630: am
8af56164: am
2f90c4cd: Merge "Reset spinner selection" into lmp-mr1-dev
* commit '
74ebc630699030cb9986c28cf7f5416ae4fff979':
Reset spinner selection
Geoff Mendal [Tue, 21 Oct 2014 17:03:16 +0000 (17:03 +0000)]
am
11253ea4: (-s ours) am
d66d7e51: (-s ours) am
c69ed5e0: (-s ours) am
eda5136b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
11253ea40a598bce5f24a2eaea324090549a1659':
Import translations. DO NOT MERGE
Alexandra Gherghina [Tue, 21 Oct 2014 16:58:22 +0000 (16:58 +0000)]
am
8af56164: am
2f90c4cd: Merge "Reset spinner selection" into lmp-mr1-dev
* commit '
8af561648450062dcd536eed44b3b774565f3356':
Reset spinner selection
Geoff Mendal [Tue, 21 Oct 2014 16:58:21 +0000 (16:58 +0000)]
am
d66d7e51: (-s ours) am
c69ed5e0: (-s ours) am
eda5136b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
d66d7e519fa3e0f5c847d880946350c52bc91ebc':
Import translations. DO NOT MERGE
Alexandra Gherghina [Tue, 21 Oct 2014 16:55:03 +0000 (16:55 +0000)]
am
2f90c4cd: Merge "Reset spinner selection" into lmp-mr1-dev
* commit '
2f90c4cd52326b712e4f886976f27d6610162a82':
Reset spinner selection
Geoff Mendal [Tue, 21 Oct 2014 16:50:12 +0000 (16:50 +0000)]
am
c69ed5e0: (-s ours) am
eda5136b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
c69ed5e09f9f53ebf9462b2bad91f6742e827bca':
Import translations. DO NOT MERGE
Alexandra Gherghina [Tue, 21 Oct 2014 16:49:23 +0000 (16:49 +0000)]
Merge "Reset spinner selection" into lmp-mr1-dev