OSDN Git Service

android-x86/packages-apps-Settings.git
9 years agoam 40f84ca0: (-s ours) Import translations. DO NOT MERGE
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

9 years agoImport translations. DO NOT MERGE
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

9 years agoImport translations. DO NOT MERGE
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

9 years agoam dd932476: Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev
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

9 years agoMerge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev
Jim Miller [Sat, 25 Oct 2014 01:01:16 +0000 (01:01 +0000)]
Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev

9 years agoam ca6bc2ae: Skip Misc/Overcounted battery stats in release builds. automerge: f7a501...
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.

9 years agoMinor cleanup in EncryptionInterstitial
Jim Miller [Fri, 24 Oct 2014 22:41:44 +0000 (15:41 -0700)]
Minor cleanup in EncryptionInterstitial

Fixes bug 18037481

Change-Id: I4e9dcc86a2d3db5c9311d5f743f03db19ca164e6

9 years agoSkip Misc/Overcounted battery stats in release builds. automerge: f7a5017
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.

9 years agoSkip 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.

9 years agoSkip Misc/Overcounted battery stats in release builds.
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

9 years agoDefault sim name set to carrier name in sim settings
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

9 years agoDefault 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

9 years agoam 22eb414b: 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

9 years agoSet 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

9 years agoam 7ff1718e: am 5fd97c55: Merge "WIP support icon" into lmp-sprout-dev
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

9 years agoam 5fd97c55: Merge "WIP support icon" into lmp-sprout-dev
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

9 years agoMerge "WIP support icon" into lmp-sprout-dev
Sanket Padawe [Fri, 24 Oct 2014 17:34:23 +0000 (17:34 +0000)]
Merge "WIP support icon" into lmp-sprout-dev

9 years agoWIP support icon
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

9 years agoam 52e57d2d: (-s ours) am cc5b08b6: (-s ours) am 8d7fdc61: (-s ours) Import translati...
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

9 years agoam 0e64404a: am 526e4b41: am c1dc8752: Merge "Disable factory reset for secondary...
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

9 years agoam f62af382: (-s ours) am 5b7e25aa: (-s ours) Merge "Import translations. DO NOT...
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

9 years agoam cc5b08b6: (-s ours) am 8d7fdc61: (-s ours) 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

9 years agoam 526e4b41: am c1dc8752: Merge "Disable factory reset for secondary users" into...
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

9 years agoam 8d7fdc61: (-s ours) Import translations. DO NOT MERGE
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

9 years agoImport 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

9 years agoam 5b7e25aa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
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

9 years agoam c1dc8752: Merge "Disable factory reset for secondary users" into lmp-dev
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

9 years agoMerge "Disable factory reset for secondary users" into lmp-dev
Amith Yamasani [Wed, 22 Oct 2014 23:59:18 +0000 (23:59 +0000)]
Merge "Disable factory reset for secondary users" into lmp-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Wed, 22 Oct 2014 23:57:24 +0000 (23:57 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-ub-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

9 years agoam 8e2fb4c9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-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

9 years agoImport translations. DO NOT MERGE
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

9 years agoImport translations. DO NOT MERGE
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

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Wed, 22 Oct 2014 23:22:01 +0000 (23:22 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

9 years agoImport translations. DO NOT MERGE
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

9 years agoam 9fbff5a3: am 59dc8d1d: SIM settings display name changes
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

9 years agoam 246273ae: am a1640daf: am d9b8d180: Merge "Launch browser directly when user selec...
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".

9 years agoam 59dc8d1d: SIM settings display name changes
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

9 years agoam a1640daf: am d9b8d180: Merge "Launch browser directly when user selects "Mobile...
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".

9 years agoam 286e3c46: am 266e4296: Merge "Commit with dialog box but using subinfo records...
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

9 years agoDisable factory reset for secondary users
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

9 years agoam 266e4296: Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev
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

9 years agoSIM settings display name changes
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

9 years agoam d9b8d180: Merge "Launch browser directly when user selects "Mobile Plan"." into...
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".

9 years agoMerge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev
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

9 years agoam 2ae90864: 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.

9 years agoSettings: 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

9 years agoam 2625d8ed: Merge "Adjust caption preset picker items dimens for Material" into...
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

9 years agoMerge "Adjust caption preset picker items dimens for Material" into lmp-mr1-dev
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

9 years agoAdjust caption preset picker items dimens for Material
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

9 years agoam b9d05d6c: Merge "Fix user spinner anchor following system ui changes" into lmp...
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

9 years agoMerge "Fix user spinner anchor following system ui changes" into lmp-mr1-dev
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

9 years agoam aadc070a: 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

9 years agoMerge "Commit with dialog box but using subinfo records" into lmp-sprout-dev
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

9 years agoCommit with dialog box but using subinfo records
Sanket Padawe [Tue, 21 Oct 2014 21:16:12 +0000 (14:16 -0700)]
Commit with dialog box but using subinfo records

Change-Id: I144aa8899eb050db29a9d78aaf7af4c1f31d9eab

9 years agoMove up spinner in apps screen
Alexandra Gherghina [Thu, 16 Oct 2014 22:03:10 +0000 (23:03 +0100)]
Move up spinner in apps screen

Bug: 18006320
Change-Id: Ic23c2c3e02a6c6a20b180065975228d42fd91899

9 years agoam 2f90c4cd: Merge "Reset spinner selection" into lmp-mr1-dev
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

9 years agoam c69ed5e0: (-s ours) am eda5136b: (-s ours) Merge "Import translations. DO NOT...
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

9 years agoMerge "Reset spinner selection" into lmp-mr1-dev
Alexandra Gherghina [Tue, 21 Oct 2014 16:49:23 +0000 (16:49 +0000)]
Merge "Reset spinner selection" into lmp-mr1-dev

9 years agoam eda5136b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
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

9 years agoam 196aaceb: Merge "Settings: Display \'Calls\' category on non-voice devices." into...
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.

9 years agoMerge "Settings: Display 'Calls' category on non-voice devices." into lmp-mr1-dev
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

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Mon, 20 Oct 2014 23:57:55 +0000 (23:57 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

9 years agoImport translations. DO NOT MERGE
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

9 years agoam cd617f6c: (-s ours) am 6acdd044: (-s ours) am 795c8378: (-s ours) Import translati...
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

9 years agoam 6acdd044: (-s ours) am 795c8378: (-s ours) Import translations. DO NOT MERGE
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

9 years agoam 50d4d2d3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
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

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 20 Oct 2014 23:45:43 +0000 (23:45 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

9 years agoImport translations. DO NOT MERGE
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

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Mon, 20 Oct 2014 23:42:29 +0000 (23:42 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

9 years agoam 795c8378: (-s ours) Import translations. DO NOT MERGE
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

9 years agoImport translations. DO NOT MERGE
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

9 years agoImport translations. DO NOT MERGE
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

9 years agoam fbde7619: am bdedbb85: Merge "Changing settings UI changes related to strings...
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

9 years agoam bdedbb85: Merge "Changing settings UI changes related to strings to be displayed...
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

9 years agoMerge "Changing settings UI changes related to strings to be displayed" into lmp...
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

9 years agoChanging settings UI changes related to strings to be displayed
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

9 years agoSettings: Display 'Calls' category on non-voice devices.
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

9 years agoam 1768f1aa: (-s ours) am 96a0370a: (-s ours) am 25149b38: (-s ours) Import translati...
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

9 years agoam 96a0370a: (-s ours) am 25149b38: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 20:02:59 +0000 (20:02 +0000)]
am 96a0370a: (-s ours) am 25149b38: (-s ours) Import translations. DO NOT MERGE

* commit '96a0370a2b893fb8acb1c1bd6873cecf05da7942':
  Import translations. DO NOT MERGE

9 years agoam 25149b38: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 19:57:23 +0000 (19:57 +0000)]
am 25149b38: (-s ours) Import translations. DO NOT MERGE

* commit '25149b389501afc817f1248d704def0b4c5b5c04':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 17:10:53 +0000 (10:10 -0700)]
Import translations. DO NOT MERGE

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

9 years agoLaunch browser directly when user selects "Mobile Plan".
Paul Jensen [Sat, 18 Oct 2014 02:09:37 +0000 (22:09 -0400)]
Launch browser directly when user selects "Mobile Plan".

Previously this used to send a broadcast to ConnectivityService
which would in turn launch the web browser.  The ConnectivityService
code has since been removed, so just launch the browser directly.

bug:17472930
Change-Id: I5d419348efbb56b6c3c0fdbb8663efd0cfb2dde9

9 years agoam 3d3c8703: am 456b866c: am aa037675: Fix bad string in EncryptionInterstitial
Jim Miller [Sat, 18 Oct 2014 02:35:43 +0000 (02:35 +0000)]
am 3d3c8703: am 456b866c: am aa037675: Fix bad string in EncryptionInterstitial

* commit '3d3c870374584d542e7722da44a1b5e3cbffa401':
  Fix bad string in EncryptionInterstitial

9 years agoam 456b866c: am aa037675: Fix bad string in EncryptionInterstitial
Jim Miller [Sat, 18 Oct 2014 02:20:59 +0000 (02:20 +0000)]
am 456b866c: am aa037675: Fix bad string in EncryptionInterstitial

* commit '456b866c09f88d4fd15c9650d2ee882be9dca8ec':
  Fix bad string in EncryptionInterstitial

9 years agoam aa037675: Fix bad string in EncryptionInterstitial
Jim Miller [Sat, 18 Oct 2014 02:09:26 +0000 (02:09 +0000)]
am aa037675: Fix bad string in EncryptionInterstitial

* commit 'aa0376759873893197a0109025fd4ec8beca5929':
  Fix bad string in EncryptionInterstitial

9 years agoam 138d7b62: am bc0e5e26: am 47adff0a: Show warning dialog when Accessibility is...
Jim Miller [Sat, 18 Oct 2014 01:45:40 +0000 (01:45 +0000)]
am 138d7b62: am bc0e5e26: am 47adff0a: Show warning dialog when Accessibility is enabled

* commit '138d7b6273bdf2f9eb6eb2a55eeae3d6d5c93cf6':
  Show warning dialog when Accessibility is enabled

9 years agoam bc0e5e26: am 47adff0a: Show warning dialog when Accessibility is enabled
Jim Miller [Sat, 18 Oct 2014 01:31:03 +0000 (01:31 +0000)]
am bc0e5e26: am 47adff0a: Show warning dialog when Accessibility is enabled

* commit 'bc0e5e2684d9e08f55aa9eb5f36edabd096e541d':
  Show warning dialog when Accessibility is enabled

9 years agoFix bad string in EncryptionInterstitial
Jim Miller [Sat, 18 Oct 2014 01:28:52 +0000 (18:28 -0700)]
Fix bad string in EncryptionInterstitial

The string contains "Talkback", but it should grab one of
the installed Accessibility services so it works on 3rd party
devices.

Fixes bug 17881324

Change-Id: Iee2d8d4ce93c851badc59b5ef21462213f530a96

9 years agoam 47adff0a: Show warning dialog when Accessibility is enabled
Jim Miller [Sat, 18 Oct 2014 01:20:53 +0000 (01:20 +0000)]
am 47adff0a: Show warning dialog when Accessibility is enabled

* commit '47adff0a8bb4aeeefe6e3d3efc0b2579f6754af0':
  Show warning dialog when Accessibility is enabled

9 years agoShow warning dialog when Accessibility is enabled
Jim Miller [Sat, 18 Oct 2014 00:43:18 +0000 (17:43 -0700)]
Show warning dialog when Accessibility is enabled

This shows a warning dialog in EncryptionInterstitial when the
user selects "Require password".

Fixes bug 17881324

Change-Id: Id9336f1f14d38f169205cc72cc42be8de94fae71

9 years agoam 3221a342: am ba1b3340: am 602d559d: Merge "Several fixes to new EncryptionIntersti...
Jim Miller [Sat, 18 Oct 2014 00:03:07 +0000 (00:03 +0000)]
am 3221a342: am ba1b3340: am 602d559d: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev

* commit '3221a342117bc3fd366e3f6520db0cb0672bb1f1':
  Several fixes to new EncryptionInterstitial dialog.

9 years agoam ba1b3340: am 602d559d: Merge "Several fixes to new EncryptionInterstitial dialog...
Jim Miller [Fri, 17 Oct 2014 23:57:34 +0000 (23:57 +0000)]
am ba1b3340: am 602d559d: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev

* commit 'ba1b33407d66289a2367caab3141a3555f1fdcf7':
  Several fixes to new EncryptionInterstitial dialog.

9 years agoam 602d559d: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev
Jim Miller [Fri, 17 Oct 2014 23:52:42 +0000 (23:52 +0000)]
am 602d559d: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev

* commit '602d559d9c59074664ad684579dc3d14a09219cb':
  Several fixes to new EncryptionInterstitial dialog.

9 years agoMerge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev
Jim Miller [Fri, 17 Oct 2014 23:48:34 +0000 (23:48 +0000)]
Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev

9 years agoam 1f39d6a6: am edbada7a: am ba202e9f: Merge "Accessibility no longer overrides stron...
Svetoslav [Fri, 17 Oct 2014 23:19:09 +0000 (23:19 +0000)]
am 1f39d6a6: am edbada7a: am ba202e9f: Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev

* commit '1f39d6a6e78d5fd0595306d1ed38a8f7ac04e3fe':
  Accessibility no longer overrides strong encryption (Settings).

9 years agoam edbada7a: am ba202e9f: Merge "Accessibility no longer overrides strong encryption...
Svetoslav [Fri, 17 Oct 2014 23:14:01 +0000 (23:14 +0000)]
am edbada7a: am ba202e9f: Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev

* commit 'edbada7acd2d40db1c472e291f3191c6f26d980a':
  Accessibility no longer overrides strong encryption (Settings).

9 years agoSeveral fixes to new EncryptionInterstitial dialog.
Jim Miller [Fri, 17 Oct 2014 02:49:07 +0000 (19:49 -0700)]
Several fixes to new EncryptionInterstitial dialog.

The code now observes whether accessibility is turned on when
deciding the default state.

Additionally, it fixes a bug where the user can back out of
EncryptionInterstitial and leave the setting in a bad state.
We now propagate the state until the place where it ultimately
gets stored.

Also fixes problem where Encryption was ignoring the state
where the device was already encrypted.

Fixes bug 17881324

Change-Id: Iec09e4464832a506bb2a78bb14a38b3531971fa0

9 years agoam ba202e9f: Merge "Accessibility no longer overrides strong encryption (Settings...
Svetoslav [Fri, 17 Oct 2014 23:08:40 +0000 (23:08 +0000)]
am ba202e9f: Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev

* commit 'ba202e9fb299f4557190dbad5ed989a9c83a4380':
  Accessibility no longer overrides strong encryption (Settings).

9 years agoMerge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev
Svetoslav [Fri, 17 Oct 2014 22:59:42 +0000 (22:59 +0000)]
Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev