git.osdn.net Git - android-x86/packages-apps-Settings.git/log

Paul Lawrence [Tue, 28 Oct 2014 20:14:31 +0000 (20:14 +0000)]

am 00abeba2: Merge "Make emergency button right size" into lmp-mr1-dev

* commit '00abeba2c08b656db924d967a0733aa76aea40a7':
Make emergency button right size

commit | commitdiff | tree

Paul Lawrence [Tue, 28 Oct 2014 20:08:33 +0000 (20:08 +0000)]

Merge "Make emergency button right size" into lmp-mr1-dev

Merge "Allow QS to launch adding network dialog" into lmp-mr1-dev
automerge: 496b3f6

* commit '496b3f647186866703af1081d26a987069a468a8':
Allow QS to launch adding network dialog

Merge "prettify debug informations" into lmp-mr1-dev
automerge: 10a4cac

* commit '10a4cacc0f51a8d0e0f62be9375a3ca638b0ac4a':
prettify debug informations

commit | commitdiff | tree

Paul Lawrence [Tue, 28 Oct 2014 18:32:42 +0000 (11:32 -0700)]

Make emergency button right size

Bug: 18123894
Bug: 17394128
Change-Id: I248890b82f62146e1814172fd8b67e9a39661997

Merge "Allow QS to launch adding network dialog" into lmp-mr1-dev

Merge "prettify debug informations" into lmp-mr1-dev

Allow QS to launch adding network dialog

This allows QS to set an extra that will launch the adding network
dialog directly for a specified ssid. It will be used to take users
straight from QS to the password entry, when a secure network is
selected.

Bug: 17722817
Change-Id: I570596af906de005c505678b539f915c06e6fd14

commit | commitdiff | tree

John Spurlock [Tue, 28 Oct 2014 17:12:57 +0000 (17:12 +0000)]

am 90674e53: Merge "Settings: Follow update to common conditions call." into lmp-mr1-dev

* commit '90674e53fc1fbac31f112fd6f11a5365cf66ec42':
Settings: Follow update to common conditions call.

commit | commitdiff | tree

John Spurlock [Tue, 28 Oct 2014 17:08:50 +0000 (17:08 +0000)]

Merge "Settings: Follow update to common conditions call." into lmp-mr1-dev

commit | commitdiff | tree

John Spurlock [Tue, 28 Oct 2014 15:25:37 +0000 (11:25 -0400)]

Settings: Follow update to common conditions call.

Bug: 16824863
Change-Id: I4a4e455b99e1c68a65c63bfd3a9972e57555825f

commit | commitdiff | tree

Alexandra Gherghina [Tue, 28 Oct 2014 15:35:36 +0000 (15:35 +0000)]

am 9f0bab9b: Merge "Close account settings if there\'s no account to show" into lmp-mr1-dev

* commit '9f0bab9bcb756607da99758971207ad833c4608b':
Close account settings if there's no account to show

commit | commitdiff | tree

Alexandra Gherghina [Tue, 28 Oct 2014 15:29:37 +0000 (15:29 +0000)]

Merge "Close account settings if there's no account to show" into lmp-mr1-dev

commit | commitdiff | tree

Wink Saville [Mon, 27 Oct 2014 20:37:06 +0000 (20:37 +0000)]

am 4aab7ecb: Merge "Change subId to int from long" into lmp-mr1-dev

* commit '4aab7ecb56e9af4600b126c67d7efe0b7e1f6ee1':
Change subId to int from long

commit | commitdiff | tree

Geoff Mendal [Mon, 27 Oct 2014 20:37:05 +0000 (20:37 +0000)]

am 855f0d26: (-s ours) Import translations. DO NOT MERGE automerge: c7df50c -s ours

* commit '855f0d264343325fb308bd27c509d7f95893d645':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 27 Oct 2014 20:37:04 +0000 (20:37 +0000)]

am 40f84ca0: (-s ours) Import translations. DO NOT MERGE

* commit '40f84ca02033ce62e301dd6d16fdc1f4b9a5326a':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Wink Saville [Mon, 27 Oct 2014 17:35:43 +0000 (17:35 +0000)]

Merge "Change subId to int from long" into lmp-mr1-dev

commit | commitdiff | tree

Geoff Mendal [Mon, 27 Oct 2014 17:11:43 +0000 (17:11 +0000)]

Import translations. DO NOT MERGE
automerge: c7df50c -s ours

* commit 'c7df50c5fdb8e4e3b26ff1647047e9e31c444994':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 27 Oct 2014 16:49:35 +0000 (09:49 -0700)]

Import translations. DO NOT MERGE

Change-Id: Id43df7ce7c8056dcdd1813ddc804acbc3ba46dd6
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Mon, 27 Oct 2014 16:43:16 +0000 (09:43 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ia682e947ee01ba5ecc42b3a4578fcc010a7efead
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Mon, 27 Oct 2014 16:40:31 +0000 (09:40 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ifc5fc4573b40b501282cb71a17ba8c6873dc64c6
Auto-generated-cl: translation import

prettify debug informations

Change-Id: I8e5c982f882a333e3f5ffdde6418447572547ea5

am dd932476: Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev

* commit 'dd932476b92f9d0e7ef8617d32a1d49d830b6787':
Minor cleanup in EncryptionInterstitial

Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev

commit | commitdiff | tree

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.

Minor cleanup in EncryptionInterstitial

Fixes bug 18037481

Change-Id: I4e9dcc86a2d3db5c9311d5f743f03db19ca164e6

commit | commitdiff | tree

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.

commit | commitdiff | tree

Wink Saville [Thu, 23 Oct 2014 17:16:26 +0000 (10:16 -0700)]

Change subId to int from long

Change-Id: Idae6335e63e7b1e4e714bc17e71b1a4705e38474

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sanket Padawe [Fri, 24 Oct 2014 17:34:23 +0000 (17:34 +0000)]

Merge "WIP support icon" into lmp-sprout-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Alexandra Gherghina [Tue, 21 Oct 2014 21:39:03 +0000 (22:39 +0100)]

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Amith Yamasani [Wed, 22 Oct 2014 23:59:18 +0000 (23:59 +0000)]

Merge "Disable factory reset for secondary users" into lmp-dev

commit | commitdiff | tree

Geoff Mendal [Wed, 22 Oct 2014 23:57:24 +0000 (23:57 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

commit | commitdiff | tree

Geoff Mendal [Wed, 22 Oct 2014 23:57:03 +0000 (23:57 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Geoff Mendal [Wed, 22 Oct 2014 23:22:01 +0000 (23:22 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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".

commit | commitdiff | tree

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

commit | commitdiff | tree

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".

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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".

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sanket Padawe [Tue, 21 Oct 2014 21:16:12 +0000 (14:16 -0700)]

Commit with dialog box but using subinfo records

Change-Id: I144aa8899eb050db29a9d78aaf7af4c1f31d9eab

commit | commitdiff | tree

Alexandra Gherghina [Thu, 16 Oct 2014 22:03:10 +0000 (23:03 +0100)]

Move up spinner in apps screen

Bug: 18006320
Change-Id: Ic23c2c3e02a6c6a20b180065975228d42fd91899

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Alexandra Gherghina [Tue, 21 Oct 2014 16:49:23 +0000 (16:49 +0000)]

Merge "Reset spinner selection" into lmp-mr1-dev

commit | commitdiff | tree

Geoff Mendal [Tue, 21 Oct 2014 16:40:56 +0000 (16:40 +0000)]

am eda5136b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit 'eda5136ba2ded67fc82646a63dbd5ab06134adf2':
Import translations. DO NOT MERGE

commit | commitdiff | tree

John Spurlock [Tue, 21 Oct 2014 16:19:46 +0000 (16:19 +0000)]

am 196aaceb: Merge "Settings: Display \'Calls\' category on non-voice devices." into lmp-mr1-dev

* commit '196aacebf9ac9dd4ffedc3012f59285be499e470':
Settings: Display 'Calls' category on non-voice devices.

commit | commitdiff | tree

John Spurlock [Tue, 21 Oct 2014 16:11:11 +0000 (16:11 +0000)]

Merge "Settings: Display 'Calls' category on non-voice devices." into lmp-mr1-dev

commit | commitdiff | tree

Geoff Mendal [Mon, 20 Oct 2014 23:57:55 +0000 (23:57 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

commit | commitdiff | tree

Geoff Mendal [Mon, 20 Oct 2014 23:52:16 +0000 (16:52 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ib689764b81b797eb3dee6a1bd786ef911926adbd
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Mon, 20 Oct 2014 23:51:32 +0000 (23:51 +0000)]

am cd617f6c: (-s ours) am 6acdd044: (-s ours) am 795c8378: (-s ours) Import translations. DO NOT MERGE

* commit 'cd617f6cbef7e3449648b26bf37d44422b719937':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 20 Oct 2014 23:47:51 +0000 (23:47 +0000)]

am 6acdd044: (-s ours) am 795c8378: (-s ours) Import translations. DO NOT MERGE

* commit '6acdd044d7b3f77ff1f47e9addc2acdbc16e5b8d':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 20 Oct 2014 23:47:40 +0000 (23:47 +0000)]

am 50d4d2d3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '50d4d2d39a041fcb2ee0c56d9425650e2f8557bd':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 20 Oct 2014 23:45:43 +0000 (23:45 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

commit | commitdiff | tree

Geoff Mendal [Mon, 20 Oct 2014 23:44:24 +0000 (16:44 -0700)]

Import translations. DO NOT MERGE

Change-Id: Iffd7117e48c6f0fb2120b254bc455b22c8941ae8
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Mon, 20 Oct 2014 23:42:29 +0000 (23:42 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

commit | commitdiff | tree

Geoff Mendal [Mon, 20 Oct 2014 23:41:26 +0000 (23:41 +0000)]

am 795c8378: (-s ours) Import translations. DO NOT MERGE

* commit '795c83780752d0301985d53e2e230c2088af825b':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 20 Oct 2014 23:40:41 +0000 (16:40 -0700)]

Import translations. DO NOT MERGE

Change-Id: I4bcf84faf0b26292a74ed9c833a2e9e48ad795b8
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Mon, 20 Oct 2014 23:33:09 +0000 (16:33 -0700)]

Import translations. DO NOT MERGE

Change-Id: I80fabd3e1f2306d6b9be8973c70aaf5438e58c51
Auto-generated-cl: translation import

commit | commitdiff | tree

Sanket Padawe [Mon, 20 Oct 2014 20:56:27 +0000 (20:56 +0000)]

am fbde7619: am bdedbb85: Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev

* commit 'fbde761930f23efd4102c983b430c35a615b71d9':
Changing settings UI changes related to strings to be displayed

commit | commitdiff | tree

Sanket Padawe [Mon, 20 Oct 2014 20:51:07 +0000 (20:51 +0000)]

am bdedbb85: Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev

* commit 'bdedbb851699016a70eafdb82b038240646358c8':
Changing settings UI changes related to strings to be displayed

commit | commitdiff | tree

Sanket Padawe [Mon, 20 Oct 2014 20:42:57 +0000 (20:42 +0000)]

Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev

commit | commitdiff | tree

Sanket Padawe [Wed, 15 Oct 2014 18:25:34 +0000 (11:25 -0700)]

Changing settings UI changes related to strings to be displayed

Change-Id: I4e722d7cac3914ce93ad28c806787851949028bd

commit | commitdiff | tree

John Spurlock [Mon, 20 Oct 2014 18:22:38 +0000 (14:22 -0400)]

Settings: Display 'Calls' category on non-voice devices.

Since the category applies to any call, include config for
this interruption even on non-voice-capable devices.

Bug: 17666139
Change-Id: I3732246179c527220f8c6bee539ba7bc1e80de18

commit | commitdiff | tree

Baligh Uddin [Sun, 19 Oct 2014 20:09:04 +0000 (20:09 +0000)]

am 1768f1aa: (-s ours) am 96a0370a: (-s ours) am 25149b38: (-s ours) Import translations. DO NOT MERGE

* commit '1768f1aa6398ef2261f85df3b5581568844f39bc':
Import translations. DO NOT MERGE