OSDN Git Service

android-x86/packages-apps-Settings.git
10 years agoam 1f2779f2: Merge "Fixed the widget location toggle button" into klp-dev
Lifu Tang [Thu, 29 Aug 2013 18:33:18 +0000 (11:33 -0700)]
am 1f2779f2: Merge "Fixed the widget location toggle button" into klp-dev

* commit '1f2779f2c46ab14e4f912a5f330b26c0a59ec137':
  Fixed the widget location toggle button

10 years agoMerge "Fixed the widget location toggle button" into klp-dev
Lifu Tang [Thu, 29 Aug 2013 18:31:27 +0000 (18:31 +0000)]
Merge "Fixed the widget location toggle button" into klp-dev

10 years agoam da1f8abd: (-s ours) am f7b5ad80: (-s ours) am da7395d6: (-s ours) am c7902845...
Baligh Uddin [Thu, 29 Aug 2013 15:04:27 +0000 (08:04 -0700)]
am da1f8abd: (-s ours) am f7b5ad80: (-s ours) am da7395d6: (-s ours) am c7902845: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam 0aad9801: (-s ours) am 439b1543: (-s ours) am 17d0af91: (-s ours) Import translati...
Baligh Uddin [Thu, 29 Aug 2013 15:00:59 +0000 (08:00 -0700)]
am 0aad9801: (-s ours) am 439b1543: (-s ours) am 17d0af91: (-s ours) Import translations. DO NOT MERGE

* commit '0aad9801705675c246fe548f687ed14359b53f78':
  Import translations. DO NOT MERGE

10 years agoam f7b5ad80: (-s ours) am da7395d6: (-s ours) am c7902845: (-s ours) Import translati...
Baligh Uddin [Thu, 29 Aug 2013 14:59:30 +0000 (07:59 -0700)]
am f7b5ad80: (-s ours) am da7395d6: (-s ours) am c7902845: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam da7395d6: (-s ours) am c7902845: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 14:57:04 +0000 (07:57 -0700)]
am da7395d6: (-s ours) am c7902845: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam 439b1543: (-s ours) am 17d0af91: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 14:56:04 +0000 (07:56 -0700)]
am 439b1543: (-s ours) am 17d0af91: (-s ours) Import translations. DO NOT MERGE

* commit '439b1543119fd97d134c602d92fc6ce9a517be20':
  Import translations. DO NOT MERGE

10 years agoam 02f3f202: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 29 Aug 2013 14:54:22 +0000 (07:54 -0700)]
am 02f3f202: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '02f3f2028fbd50ad39936e5b295d89039469fb7c':
  Import translations. DO NOT MERGE

10 years agoam c7902845: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 14:53:56 +0000 (07:53 -0700)]
am c7902845: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam 17d0af91: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 14:53:47 +0000 (07:53 -0700)]
am 17d0af91: (-s ours) Import translations. DO NOT MERGE

* commit '17d0af9160697f0fcb2d33ed4b4e91ad6769141c':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 29 Aug 2013 14:50:25 +0000 (14:50 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 06:36:55 +0000 (23:36 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 06:33:19 +0000 (23:33 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 06:32:03 +0000 (23:32 -0700)]
Import translations. DO NOT MERGE

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

10 years agoam 6760f923: Merge "Fix RTL layout of text in Battery history screen" into klp-dev
Amith Yamasani [Thu, 29 Aug 2013 01:07:51 +0000 (18:07 -0700)]
am 6760f923: Merge "Fix RTL layout of text in Battery history screen" into klp-dev

* commit '6760f92321d2013676863b533606563ed2041648':
  Fix RTL layout of text in Battery history screen

10 years agoMerge "Fix RTL layout of text in Battery history screen" into klp-dev
Amith Yamasani [Thu, 29 Aug 2013 01:04:10 +0000 (01:04 +0000)]
Merge "Fix RTL layout of text in Battery history screen" into klp-dev

10 years agoFixed the widget location toggle button
Lifu Tang [Wed, 28 Aug 2013 22:55:49 +0000 (15:55 -0700)]
Fixed the widget location toggle button

- Fix b/10531669

Change-Id: Iba08d515119c42e5c4de4ee02d6dd8aea404fc69

10 years agoam dcf2509e: Merge "Disallows setting when user restriction applies" into klp-dev
Lifu Tang [Wed, 28 Aug 2013 22:38:24 +0000 (15:38 -0700)]
am dcf2509e: Merge "Disallows setting when user restriction applies" into klp-dev

* commit 'dcf2509e75059fcf3f34f82226597681107efb09':
  Disallows setting when user restriction applies

10 years agoMerge "Disallows setting when user restriction applies" into klp-dev
Lifu Tang [Wed, 28 Aug 2013 22:29:54 +0000 (22:29 +0000)]
Merge "Disallows setting when user restriction applies" into klp-dev

10 years agoFix RTL layout of text in Battery history screen
Amith Yamasani [Wed, 28 Aug 2013 21:15:52 +0000 (14:15 -0700)]
Fix RTL layout of text in Battery history screen

Change the anchor position and alignment direction for text.

Bug: 10447666
Change-Id: Ida4161c738cf9a32cc8ff98037f3755046e64e33

10 years agoam 079c412d: Merge "Add more fragments to valid list for Wifi activity" into klp-dev
Amith Yamasani [Wed, 28 Aug 2013 21:54:34 +0000 (14:54 -0700)]
am 079c412d: Merge "Add more fragments to valid list for Wifi activity" into klp-dev

* commit '079c412def3472fc37750b7f778be3bb03114e38':
  Add more fragments to valid list for Wifi activity

10 years agoMerge "Add more fragments to valid list for Wifi activity" into klp-dev
Amith Yamasani [Wed, 28 Aug 2013 21:52:59 +0000 (21:52 +0000)]
Merge "Add more fragments to valid list for Wifi activity" into klp-dev

10 years agoDisallows setting when user restriction applies
Lifu Tang [Wed, 28 Aug 2013 00:09:55 +0000 (17:09 -0700)]
Disallows setting when user restriction applies

- Fix b/10116533

Change-Id: Ib171f9545c1651fb36c408decefa47b3d82ba3ab

10 years agoAdd more fragments to valid list for Wifi activity
Amith Yamasani [Wed, 28 Aug 2013 19:38:46 +0000 (12:38 -0700)]
Add more fragments to valid list for Wifi activity

Bug: 10508371
Change-Id: Ic2d2128433ae26ea6750281b978781cb56b97036

10 years agoam 8df4caf1: (-s ours) am d866be38: (-s ours) am 1caeb5a1: (-s ours) am d8c9c146...
Baligh Uddin [Wed, 28 Aug 2013 02:43:39 +0000 (19:43 -0700)]
am 8df4caf1: (-s ours) am d866be38: (-s ours) am 1caeb5a1: (-s ours) am d8c9c146: (-s ours) Import translations. DO NOT MERGE

* commit '8df4caf168a793d7f17b31ba50e37479b0404022':
  Import translations. DO NOT MERGE

10 years agoam 26a4b208: (-s ours) am 56fc8b77: (-s ours) am 04a25289: (-s ours) Import translati...
Baligh Uddin [Wed, 28 Aug 2013 02:43:37 +0000 (19:43 -0700)]
am 26a4b208: (-s ours) am 56fc8b77: (-s ours) am 04a25289: (-s ours) Import translations. DO NOT MERGE

* commit '26a4b208ef141b64e6cb629c4e7151e365f1c227':
  Import translations. DO NOT MERGE

10 years agoam d866be38: (-s ours) am 1caeb5a1: (-s ours) am d8c9c146: (-s ours) Import translati...
Baligh Uddin [Wed, 28 Aug 2013 02:42:22 +0000 (19:42 -0700)]
am d866be38: (-s ours) am 1caeb5a1: (-s ours) am d8c9c146: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam 1caeb5a1: (-s ours) am d8c9c146: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Wed, 28 Aug 2013 02:40:21 +0000 (19:40 -0700)]
am 1caeb5a1: (-s ours) am d8c9c146: (-s ours) Import translations. DO NOT MERGE

* commit '1caeb5a11d4846c5db9741c914b1ba53b0af6dc9':
  Import translations. DO NOT MERGE

10 years agoam 56fc8b77: (-s ours) am 04a25289: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Wed, 28 Aug 2013 02:39:03 +0000 (19:39 -0700)]
am 56fc8b77: (-s ours) am 04a25289: (-s ours) Import translations. DO NOT MERGE

* commit '56fc8b77643411ca8c43b0f3d178c3804de7093b':
  Import translations. DO NOT MERGE

10 years agoam 04a25289: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Wed, 28 Aug 2013 02:37:03 +0000 (19:37 -0700)]
am 04a25289: (-s ours) Import translations. DO NOT MERGE

* commit '04a252899bdd8a798d1a9c90c2ab45f9efdba5a8':
  Import translations. DO NOT MERGE

10 years agoam f92ee425: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Wed, 28 Aug 2013 02:36:55 +0000 (19:36 -0700)]
am f92ee425: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

10 years agoam d8c9c146: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Wed, 28 Aug 2013 02:36:48 +0000 (19:36 -0700)]
am d8c9c146: (-s ours) Import translations. DO NOT MERGE

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

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Wed, 28 Aug 2013 02:34:24 +0000 (02:34 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoam 9506d857: Merge "Fix NPE in SecuritySettings.onResume()" into klp-dev
Maggie Benthall [Wed, 28 Aug 2013 00:03:31 +0000 (17:03 -0700)]
am 9506d857: Merge "Fix NPE in SecuritySettings.onResume()" into klp-dev

* commit '9506d857cbc87a3dcedc8c3599f1d45ac6fe995e':
  Fix NPE in SecuritySettings.onResume()

10 years agoMerge "Fix NPE in SecuritySettings.onResume()" into klp-dev
Maggie Benthall [Wed, 28 Aug 2013 00:00:00 +0000 (00:00 +0000)]
Merge "Fix NPE in SecuritySettings.onResume()" into klp-dev

10 years agoam cb6ba728: Merge "Don\'t list apps that are disabled by the system" into klp-dev
Amith Yamasani [Tue, 27 Aug 2013 21:45:57 +0000 (14:45 -0700)]
am cb6ba728: Merge "Don\'t list apps that are disabled by the system" into klp-dev

* commit 'cb6ba728c5f872bc66e3b8ac3682b350cb7501f0':
  Don't list apps that are disabled by the system

10 years agoMerge "Don't list apps that are disabled by the system" into klp-dev
Amith Yamasani [Tue, 27 Aug 2013 21:42:57 +0000 (21:42 +0000)]
Merge "Don't list apps that are disabled by the system" into klp-dev

10 years agoam 9066b914: Merge "Switch to new location mode API recommended by API council" into...
Tom O'Neill [Tue, 27 Aug 2013 15:51:04 +0000 (08:51 -0700)]
am 9066b914: Merge "Switch to new location mode API recommended by API council" into klp-dev

* commit '9066b9140c376cb1b66a3eee830d9dfa177c6056':
  Switch to new location mode API recommended by API council

10 years agoMerge "Switch to new location mode API recommended by API council" into klp-dev
Tom O'Neill [Tue, 27 Aug 2013 15:48:34 +0000 (15:48 +0000)]
Merge "Switch to new location mode API recommended by API council" into klp-dev

10 years agoam 5d821bed: Merge "Adapt to SettingsInjectorService API changes" into klp-dev
Tom O'Neill [Tue, 27 Aug 2013 14:42:52 +0000 (07:42 -0700)]
am 5d821bed: Merge "Adapt to SettingsInjectorService API changes" into klp-dev

* commit '5d821bedb1f065702b9920fe15a6f81bc19ba36b':
  Adapt to SettingsInjectorService API changes

10 years agoMerge "Adapt to SettingsInjectorService API changes" into klp-dev
Tom O'Neill [Tue, 27 Aug 2013 14:38:07 +0000 (14:38 +0000)]
Merge "Adapt to SettingsInjectorService API changes" into klp-dev

10 years agoam 0f9a405f: Fix APN preference style
Alan Viverette [Mon, 26 Aug 2013 22:05:38 +0000 (15:05 -0700)]
am 0f9a405f: Fix APN preference style

* commit '0f9a405fd58f8f5d30fbbe975e063e324d46a1f2':
  Fix APN preference style

10 years agoam cbf589e7: Merge "Handle races caused by rapid settings changed broadcasts" into...
Tom O'Neill [Mon, 26 Aug 2013 22:03:54 +0000 (15:03 -0700)]
am cbf589e7: Merge "Handle races caused by rapid settings changed broadcasts" into klp-dev

* commit 'cbf589e73cd8b9a62c413c804b698e489f44c403':
  Handle races caused by rapid settings changed broadcasts

10 years agoam f6794f95: Merge "Add setting to disable keyguard widgets" into klp-dev
Jim Miller [Mon, 26 Aug 2013 22:03:23 +0000 (15:03 -0700)]
am f6794f95: Merge "Add setting to disable keyguard widgets" into klp-dev

* commit 'f6794f95d19306e0f8a1edf02670d8dabd6daa5f':
  Add setting to disable keyguard widgets

10 years agoam 2a570787: Merge "Fix incorrect comparison" into klp-dev
Amith Yamasani [Mon, 26 Aug 2013 22:03:22 +0000 (15:03 -0700)]
am 2a570787: Merge "Fix incorrect comparison" into klp-dev

* commit '2a5707874b6ec39798421f77e0ccf38dbaa1e65f':
  Fix incorrect comparison

10 years agoam 85dfc900: Merge "Allows multi-line message on small-screen devices" into klp-dev
Lifu Tang [Mon, 26 Aug 2013 22:03:19 +0000 (15:03 -0700)]
am 85dfc900: Merge "Allows multi-line message on small-screen devices" into klp-dev

* commit '85dfc9009fdad338cdda62cbcc549fde8479bdce':
  Allows multi-line message on small-screen devices

10 years agoam 5114444e: Merge "wifi-display: add certification options" into klp-dev
Chong Zhang [Mon, 26 Aug 2013 22:03:07 +0000 (15:03 -0700)]
am 5114444e: Merge "wifi-display: add certification options" into klp-dev

* commit '5114444eca4e62f32cc85b9740dc0c66f87d5d99':
  wifi-display: add certification options

10 years agoam a0aee43e: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 26 Aug 2013 22:00:50 +0000 (15:00 -0700)]
am a0aee43e: (-s ours) Import translations. DO NOT MERGE

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

10 years agoSwitch to new location mode API recommended by API council
Tom O'Neill [Mon, 26 Aug 2013 21:40:54 +0000 (14:40 -0700)]
Switch to new location mode API recommended by API council

- Part of b/10461763 fix

Change-Id: I202ce4c817f24a1682796e92fed9cc3efcc31a81

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 26 Aug 2013 20:59:51 +0000 (13:59 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 26 Aug 2013 20:55:54 +0000 (13:55 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 26 Aug 2013 20:54:28 +0000 (13:54 -0700)]
Import translations. DO NOT MERGE

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

10 years agoFix APN preference style
Alan Viverette [Mon, 26 Aug 2013 20:25:59 +0000 (13:25 -0700)]
Fix APN preference style

BUG: 10445477
Change-Id: Ie1ce786ce49e1b68ffd38f6908189b8241773838

10 years agoAdapt to SettingsInjectorService API changes
Tom O'Neill [Mon, 26 Aug 2013 16:47:55 +0000 (09:47 -0700)]
Adapt to SettingsInjectorService API changes

- Part of fix for b/10461474

Change-Id: Ia37f444afc822a42ec21ebd2beae7aef8642547a

10 years agoMerge "Handle races caused by rapid settings changed broadcasts" into klp-dev
Tom O'Neill [Mon, 26 Aug 2013 14:33:37 +0000 (14:33 +0000)]
Merge "Handle races caused by rapid settings changed broadcasts" into klp-dev

11 years agoMerge "Add setting to disable keyguard widgets" into klp-dev
Jim Miller [Sat, 24 Aug 2013 01:28:39 +0000 (01:28 +0000)]
Merge "Add setting to disable keyguard widgets" into klp-dev

11 years agoMerge "Fix incorrect comparison" into klp-dev
Amith Yamasani [Sat, 24 Aug 2013 01:23:06 +0000 (01:23 +0000)]
Merge "Fix incorrect comparison" into klp-dev

11 years agoFix incorrect comparison
Amith Yamasani [Sat, 24 Aug 2013 01:07:30 +0000 (18:07 -0700)]
Fix incorrect comparison

Bug: 10446469

Screen lock options should have been locked down when encryption is
enabled. An incorrect comparison (== instead of equals) caused it
to always bypass encryption quality check.

Change-Id: I7f3856146181a92183555f30bbc50d58bfe0c3d5

11 years agoMerge "Allows multi-line message on small-screen devices" into klp-dev
Lifu Tang [Sat, 24 Aug 2013 00:00:34 +0000 (00:00 +0000)]
Merge "Allows multi-line message on small-screen devices" into klp-dev

11 years agoMerge "wifi-display: add certification options" into klp-dev
Chong Zhang [Fri, 23 Aug 2013 23:19:18 +0000 (23:19 +0000)]
Merge "wifi-display: add certification options" into klp-dev

11 years agoAllows multi-line message on small-screen devices
Lifu Tang [Fri, 23 Aug 2013 22:18:38 +0000 (15:18 -0700)]
Allows multi-line message on small-screen devices

Change-Id: Ief7e152165059cea165f1271ab27a8a42537db8f

11 years agoHandle races caused by rapid settings changed broadcasts
Tom O'Neill [Fri, 23 Aug 2013 22:23:12 +0000 (15:23 -0700)]
Handle races caused by rapid settings changed broadcasts

- Fix b/10447517

Change-Id: I63ef98c9023cee1a15be61b966aed06dc35e9bd5

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 23 Aug 2013 17:21:09 +0000 (10:21 -0700)]
Import translations. DO NOT MERGE

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

11 years agowifi-display: add certification options
Chong Zhang [Thu, 6 Jun 2013 19:42:24 +0000 (12:42 -0700)]
wifi-display: add certification options

- Checkbox to show certification menu in "Developer options"

- Certification menu to Wireless Display Settings, providing
  misc control options required to certify

Bug: 9371882
Change-Id: Icf74d1122a9dc813b2cf95b6606a8a600a6b9cd1

11 years agoam 32e016b5: Reloads status messages for injected items
Lifu Tang [Fri, 23 Aug 2013 01:26:49 +0000 (18:26 -0700)]
am 32e016b5: Reloads status messages for injected items

* commit '32e016b5fae1f4caf673ff1f062869dce0e94757':
  Reloads status messages for injected items

11 years agoReloads status messages for injected items
Lifu Tang [Fri, 23 Aug 2013 00:43:19 +0000 (17:43 -0700)]
Reloads status messages for injected items

Change-Id: I6bb95c4b7ff4118074fb51aeed31596eab1e7eef

11 years agoam be9ebb44: Merge "Minor UI tweakings" into klp-dev
Lifu Tang [Thu, 22 Aug 2013 21:48:10 +0000 (14:48 -0700)]
am be9ebb44: Merge "Minor UI tweakings" into klp-dev

* commit 'be9ebb4436678ab5afecccc8a4bb7b9be6af370a':
  Minor UI tweakings

11 years agoMerge "Minor UI tweakings" into klp-dev
Lifu Tang [Thu, 22 Aug 2013 21:46:34 +0000 (21:46 +0000)]
Merge "Minor UI tweakings" into klp-dev

11 years agoMinor UI tweakings
Lifu Tang [Thu, 22 Aug 2013 02:31:15 +0000 (19:31 -0700)]
Minor UI tweakings

* Changed PreferenceScreen to Preference.

* Adjusted the "No recent app" message layout.

* No "Location services" category when empty.

* Removed "Under Construction" finally, hooray!

Change-Id: I83fd1d7a1b0235ad21b3a5c54542e937b60b3940

11 years agoam 8c89872a: Merge "Fix custom restrictions launch mechanism" into klp-dev
Amith Yamasani [Thu, 22 Aug 2013 18:10:07 +0000 (11:10 -0700)]
am 8c89872a: Merge "Fix custom restrictions launch mechanism" into klp-dev

* commit '8c89872a21859f413c139b232ee31d004fe24ebb':
  Fix custom restrictions launch mechanism

11 years agoMerge "Fix custom restrictions launch mechanism" into klp-dev
Amith Yamasani [Thu, 22 Aug 2013 18:06:59 +0000 (18:06 +0000)]
Merge "Fix custom restrictions launch mechanism" into klp-dev

11 years agoam 6c523b73: (-s ours) am 06de3680: (-s ours) am 56c597c1: (-s ours) am bf65bf49...
Baligh Uddin [Thu, 22 Aug 2013 18:06:40 +0000 (11:06 -0700)]
am 6c523b73: (-s ours) am 06de3680: (-s ours) am 56c597c1: (-s ours) am bf65bf49: (-s ours) Import translations. DO NOT MERGE

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

11 years agoam e863b94b: (-s ours) am f3381a80: (-s ours) am f23da91e: (-s ours) Import translati...
Baligh Uddin [Thu, 22 Aug 2013 18:02:57 +0000 (11:02 -0700)]
am e863b94b: (-s ours) am f3381a80: (-s ours) am f23da91e: (-s ours) Import translations. DO NOT MERGE

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

11 years agoam 06de3680: (-s ours) am 56c597c1: (-s ours) am bf65bf49: (-s ours) Import translati...
Baligh Uddin [Thu, 22 Aug 2013 18:02:26 +0000 (11:02 -0700)]
am 06de3680: (-s ours) am 56c597c1: (-s ours) am bf65bf49: (-s ours) Import translations. DO NOT MERGE

* commit '06de3680673eef2ac62dd4e17bb5ce118e88d5aa':
  Import translations. DO NOT MERGE

11 years agoam f3381a80: (-s ours) am f23da91e: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 Aug 2013 17:59:08 +0000 (10:59 -0700)]
am f3381a80: (-s ours) am f23da91e: (-s ours) Import translations. DO NOT MERGE

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

11 years agoam 56c597c1: (-s ours) am bf65bf49: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 Aug 2013 17:59:01 +0000 (10:59 -0700)]
am 56c597c1: (-s ours) am bf65bf49: (-s ours) Import translations. DO NOT MERGE

* commit '56c597c1b3c5a7d7d2f4e6e26c76c77b9e36120e':
  Import translations. DO NOT MERGE

11 years agoam 81eab3f0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 22 Aug 2013 17:55:51 +0000 (10:55 -0700)]
am 81eab3f0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '81eab3f04a8daacbb0a771229ccb44338ea00747':
  Import translations. DO NOT MERGE

11 years agoam bf65bf49: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 Aug 2013 17:55:45 +0000 (10:55 -0700)]
am bf65bf49: (-s ours) Import translations. DO NOT MERGE

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

11 years agoam f23da91e: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 Aug 2013 17:55:44 +0000 (10:55 -0700)]
am f23da91e: (-s ours) Import translations. DO NOT MERGE

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

11 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 22 Aug 2013 17:52:33 +0000 (17:52 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

11 years agoam f3267d9f: Merge "Add an Are you Sure to experiemental webview" into klp-dev
Jonathan Dixon [Thu, 22 Aug 2013 05:02:52 +0000 (22:02 -0700)]
am f3267d9f: Merge "Add an Are you Sure to experiemental webview" into klp-dev

* commit 'f3267d9fee8f2dd675d66b00a566da06717f8664':
  Add an Are you Sure to experiemental webview

11 years agoMerge "Add an Are you Sure to experiemental webview" into klp-dev
Jonathan Dixon [Thu, 22 Aug 2013 05:00:20 +0000 (05:00 +0000)]
Merge "Add an Are you Sure to experiemental webview" into klp-dev

11 years agoam 9fb0ab85: Merge "Update power widget to represent gps instead of location master...
David Christie [Thu, 22 Aug 2013 04:17:53 +0000 (21:17 -0700)]
am 9fb0ab85: Merge "Update power widget to represent gps instead of location " into klp-dev

* commit '9fb0ab85a2a6fba39a19d86361f31a693163402a':
  Update power widget to represent gps instead of location master.

11 years agoMerge "Update power widget to represent gps instead of location master." into klp-dev
David Christie [Thu, 22 Aug 2013 04:14:56 +0000 (04:14 +0000)]
Merge "Update power widget to represent gps instead of location " into klp-dev

11 years agoAdd an Are you Sure to experiemental webview
Jonathan Dixon [Thu, 22 Aug 2013 00:21:27 +0000 (17:21 -0700)]
Add an Are you Sure to experiemental webview

Bug: 10427705

Not bothering to translate strings as this will be deleted soon

Change-Id: I26721e606649d267d1b6507bc1a16ce91a63276a

11 years agoUpdate power widget to represent gps instead of location master.
David Christie [Thu, 22 Aug 2013 00:18:51 +0000 (17:18 -0700)]
Update power widget to represent gps instead of location 

Change-Id: I62f701b612db2e31f9ad8b016dbf37ed7fd4ef26

11 years agoam 25518c3b: Sort "Location services" alphabetically
Lifu Tang [Thu, 22 Aug 2013 00:06:44 +0000 (17:06 -0700)]
am 25518c3b: Sort "Location services" alphabetically

* commit '25518c3b45827537b2b2c2b35fdc86bc8bd60502':
  Sort "Location services" alphabetically

11 years agoSort "Location services" alphabetically
Lifu Tang [Wed, 21 Aug 2013 02:40:44 +0000 (19:40 -0700)]
Sort "Location services" alphabetically

* Sort "Location services" items by title

* Throttle the rate of loading status messages

Change-Id: Iecb039a4ab94a810e11ef3e426e4a4b5c8c75c37

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 21 Aug 2013 23:08:45 +0000 (16:08 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 21 Aug 2013 23:04:35 +0000 (16:04 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 21 Aug 2013 23:03:04 +0000 (16:03 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam e873aeb3: Update caption preferences to use SubtitleView
Alan Viverette [Wed, 21 Aug 2013 21:12:28 +0000 (14:12 -0700)]
am e873aeb3: Update caption preferences to use SubtitleView

* commit 'e873aeb3a659ac970609cebb5ec2f460afd1206a':
  Update caption preferences to use SubtitleView

11 years agoUpdate caption preferences to use SubtitleView
Alan Viverette [Wed, 21 Aug 2013 20:58:07 +0000 (13:58 -0700)]
Update caption preferences to use SubtitleView

Change-Id: I02230669c5e7be36006e04bb7110446265f122d9

11 years agoam 821496bf: Add Deuteranomaly color set to overdraw debugging
Romain Guy [Wed, 21 Aug 2013 19:00:09 +0000 (12:00 -0700)]
am 821496bf: Add Deuteranomaly color set to overdraw debugging

* commit '821496bf4ac2dc6dada222606525115e8600288c':
  Add Deuteranomaly color set to overdraw debugging

11 years agoAdd Deuteranomaly color set to overdraw debugging
Romain Guy [Wed, 21 Aug 2013 18:54:29 +0000 (11:54 -0700)]
Add Deuteranomaly color set to overdraw debugging

Change-Id: I27e48f54653f24383ab85c0e500fdd79cec28cc3

11 years agoam ae95da41: Merge "Switch location Settings and Power widget to use new Settings...
David Christie [Wed, 21 Aug 2013 17:45:08 +0000 (10:45 -0700)]
am ae95da41: Merge "Switch location Settings and Power widget to use new Settings api." into klp-dev

* commit 'ae95da417ce5c88127ae806994491a49885066ab':
  Switch location Settings and Power widget to use new Settings api.

11 years agoMerge "Switch location Settings and Power widget to use new Settings api." into klp-dev
David Christie [Wed, 21 Aug 2013 17:40:56 +0000 (17:40 +0000)]
Merge "Switch location Settings and Power widget to use new Settings api." into klp-dev

11 years agoam 9facc23c: Merge "Move UPDATE_INTENT to SettingsInjectorService" into klp-dev
Tom O'Neill [Wed, 21 Aug 2013 14:55:42 +0000 (07:55 -0700)]
am 9facc23c: Merge "Move UPDATE_INTENT to SettingsInjectorService" into klp-dev

* commit '9facc23cd8341d579c44af51a2be87effee8618e':
  Move UPDATE_INTENT to SettingsInjectorService

11 years agoMerge "Move UPDATE_INTENT to SettingsInjectorService" into klp-dev
Tom O'Neill [Wed, 21 Aug 2013 14:53:18 +0000 (14:53 +0000)]
Merge "Move UPDATE_INTENT to SettingsInjectorService" into klp-dev

11 years agoAdd setting to disable keyguard widgets
Jim Miller [Wed, 21 Aug 2013 02:03:30 +0000 (19:03 -0700)]
Add setting to disable keyguard widgets

This allows disabling keyguard widgets through Settings.
On new devices, the setting is turned off by default.  If the
user currently has widgets in keyguard, then we keep them
and re-enable the setting.

Change-Id: I25f0756ac72227e13dcb491694b3ec3c2bf1d293