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

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

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: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

commit | commitdiff | tree

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

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:40:30 +0000 (21:40 +0000)]

am 828f5df0: am 9fbff5a3: am 59dc8d1d: SIM settings display name changes

* commit '828f5df065320b3f798f64a8b032e5b7c0534a4c':
SIM settings display name changes

commit | commitdiff | tree

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

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: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

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

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

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

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

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:19:36 +0000 (22:19 +0000)]

am 7574ee6a: am aadc070a: Move up spinner in apps screen

* commit '7574ee6a257b7d24447a9ec9767b8d985baaafcf':
Move up spinner in apps screen

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:58:22 +0000 (16:58 +0000)]

am 8af56164: am 2f90c4cd: Merge "Reset spinner selection" into lmp-mr1-dev

* commit '8af561648450062dcd536eed44b3b774565f3356':
Reset spinner selection

commit | commitdiff | tree

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

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:32:29 +0000 (16:32 +0000)]

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

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

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:57:34 +0000 (23:57 +0000)]

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

* commit '46de83aa1c9f34e76706ba4250c69f2933a5d3c0':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

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

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

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:49:08 +0000 (23:49 +0000)]

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

* commit 'c25c92cccda2f8b1bb02c99f2cf596a703e6c2ce':
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 21:01:53 +0000 (21:01 +0000)]

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

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

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:16:23 +0000 (20:16 +0000)]

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

* commit '5e9e0f0b74298d0992be36a371090f6879e0da92':
Import translations. DO NOT MERGE

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

am 3d3c8703: am 456b866c: am aa037675: Fix bad string in EncryptionInterstitial
automerge: c8b2003

* commit 'c8b20033de1af626d68ca049077e327e839fbb5b':
Fix bad string in EncryptionInterstitial

am 138d7b62: am bc0e5e26: am 47adff0a: Show warning dialog when Accessibility is enabled
automerge: 06810c4

* commit '06810c482834a27975da050db32f3d2c27fbe793':
Show warning dialog when Accessibility is enabled

am 3d3c8703: am 456b866c: am aa037675: Fix bad string in EncryptionInterstitial

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

am 456b866c: am aa037675: Fix bad string in EncryptionInterstitial

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

am aa037675: Fix bad string in EncryptionInterstitial

* commit 'aa0376759873893197a0109025fd4ec8beca5929':
Fix bad string in EncryptionInterstitial

am 138d7b62: am bc0e5e26: am 47adff0a: Show warning dialog when Accessibility is enabled

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

am bc0e5e26: am 47adff0a: Show warning dialog when Accessibility is enabled

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

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

am 47adff0a: Show warning dialog when Accessibility is enabled

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

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

am 05656a36: am 3221a342: am ba1b3340: am 602d559d: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev

* commit '05656a369d2fc22bd5abff16a49556a57a5abc3f':
Several fixes to new EncryptionInterstitial dialog.

am 3221a342: am ba1b3340: am 602d559d: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev

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

am ba1b3340: am 602d559d: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev

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

am 602d559d: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev

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