OSDN Git Service

android-x86/packages-apps-Settings.git
10 years agoam cd0726f7: (-s ours) am f06ce4eb: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Wed, 20 Nov 2013 21:19:50 +0000 (13:19 -0800)]
am cd0726f7: (-s ours) am f06ce4eb: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam f06ce4eb: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Wed, 20 Nov 2013 21:15:25 +0000 (13:15 -0800)]
am f06ce4eb: (-s ours) Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 20 Nov 2013 19:27:32 +0000 (11:27 -0800)]
Import translations. DO NOT MERGE

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

10 years agoam 017d2a18: am 130118d4: Add help url for remote display.
Jeff Brown [Tue, 19 Nov 2013 03:09:55 +0000 (19:09 -0800)]
am 017d2a18: am 130118d4: Add help url for remote display.

* commit '017d2a189ac758ad035182a886c4f4e578cee6f2':
  Add help url for remote display.

10 years agoam 130118d4: Add help url for remote display.
Jeff Brown [Tue, 19 Nov 2013 03:07:06 +0000 (19:07 -0800)]
am 130118d4: Add help url for remote display.

* commit '130118d43628c058e3bf82f5d978d383f19390de':
  Add help url for remote display.

10 years agoAdd help url for remote display.
Jeff Brown [Mon, 18 Nov 2013 20:26:16 +0000 (12:26 -0800)]
Add help url for remote display.

Bug: 11736504
Change-Id: I83d278731cf853ff911ff1a8b82a942881cb4727

10 years agoam 6d34b698: (-s ours) am 91c54aa8: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 18 Nov 2013 19:18:59 +0000 (11:18 -0800)]
am 6d34b698: (-s ours) am 91c54aa8: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam 91c54aa8: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 18 Nov 2013 19:15:12 +0000 (11:15 -0800)]
am 91c54aa8: (-s ours) Import translations. DO NOT MERGE

* commit '91c54aa81849fd60839ac62efb005df390c64438':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 18 Nov 2013 19:02:58 +0000 (11:02 -0800)]
Import translations. DO NOT MERGE

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

10 years agoam 9c8a463c: am beb9a03b: Merge "Remove hardcoded msgid. We have already leveraged...
Baligh Uddin [Fri, 15 Nov 2013 19:59:35 +0000 (11:59 -0800)]
am 9c8a463c: am beb9a03b: Merge "Remove hardcoded msgid.  We have already leveraged in TC." into klp-dev

* commit '9c8a463c3005d8b3d96bde28ecc00a5b2788d9e3':
  Remove hardcoded msgid.  We have already leveraged in TC.

10 years agoam beb9a03b: Merge "Remove hardcoded msgid. We have already leveraged in TC." into...
Baligh Uddin [Fri, 15 Nov 2013 19:56:55 +0000 (11:56 -0800)]
am beb9a03b: Merge "Remove hardcoded msgid.  We have already leveraged in TC." into klp-dev

* commit 'beb9a03b716d152ea25813fca3a93a1ec781a685':
  Remove hardcoded msgid.  We have already leveraged in TC.

10 years agoMerge "Remove hardcoded msgid. We have already leveraged in TC." into klp-dev
Baligh Uddin [Fri, 15 Nov 2013 19:52:40 +0000 (19:52 +0000)]
Merge "Remove hardcoded msgid.  We have already leveraged in TC." into klp-dev

10 years agoam 72d674af: (-s ours) am ebf21489: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Nov 2013 19:46:33 +0000 (11:46 -0800)]
am 72d674af: (-s ours) am ebf21489: (-s ours) Import translations. DO NOT MERGE

* commit '72d674af97df6f964f217ad7eddec7ea58612114':
  Import translations. DO NOT MERGE

10 years agoam ebf21489: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Nov 2013 19:42:56 +0000 (11:42 -0800)]
am ebf21489: (-s ours) Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Nov 2013 19:31:33 +0000 (11:31 -0800)]
Import translations. DO NOT MERGE

bug:11696928
Change-Id: I500d2c96aef949f30d9fbabf2777563e9e68dbe6
Auto-generated-cl: translation import

10 years agoRemove hardcoded msgid. We have already leveraged in TC.
Baligh Uddin [Fri, 15 Nov 2013 19:21:11 +0000 (11:21 -0800)]
Remove hardcoded msgid.  We have already leveraged in TC.

bug:11696928
Change-Id: I71beb961ff73902cf5a67c5de1175db30eaa0871

10 years agoam 67a0472f: (-s ours) am 503b6def: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Nov 2013 19:15:23 +0000 (11:15 -0800)]
am 67a0472f: (-s ours) am 503b6def: (-s ours) Import translations. DO NOT MERGE

* commit '67a0472f3f53c924d180fdabe41bb26608219a83':
  Import translations. DO NOT MERGE

10 years agoam 503b6def: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Nov 2013 19:11:55 +0000 (11:11 -0800)]
am 503b6def: (-s ours) Import translations. DO NOT MERGE

* commit '503b6deff226b12450decd5997111c77bd179a88':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Nov 2013 19:04:19 +0000 (11:04 -0800)]
Import translations. DO NOT MERGE

Bug: 11696928
Change-Id: I23f78d9fb53fd5da325f121bac78ac60a9c78bb6
Auto-generated-cl: translation import

10 years agoam 196bc5c6: am e7b781f5: Merge "Show correct message for a print job that is being...
Svetoslav [Fri, 15 Nov 2013 06:30:53 +0000 (22:30 -0800)]
am 196bc5c6: am e7b781f5: Merge "Show correct message for a print job that is being canceled." into klp-dev

* commit '196bc5c63a3f08bc8dc972ee82f7fe98a453b8f5':
  Show correct message for a print job that is being canceled.

10 years agoam e7b781f5: Merge "Show correct message for a print job that is being canceled....
Svetoslav [Fri, 15 Nov 2013 06:27:36 +0000 (22:27 -0800)]
am e7b781f5: Merge "Show correct message for a print job that is being canceled." into klp-dev

* commit 'e7b781f574b8ec957d6254ed9edaef469c7085a5':
  Show correct message for a print job that is being canceled.

10 years agoMerge "Show correct message for a print job that is being canceled." into klp-dev
Svetoslav [Fri, 15 Nov 2013 06:23:54 +0000 (06:23 +0000)]
Merge "Show correct message for a print job that is being canceled." into klp-dev

10 years agoShow correct message for a print job that is being canceled.
Svetoslav [Fri, 15 Nov 2013 02:15:15 +0000 (18:15 -0800)]
Show correct message for a print job that is being canceled.

1. If a print job is being canceled we now show appropriate
   message that matches what the notification shows.

2. If a print job is being canceled we do not show the cancel
   button.

bug:11696928

Change-Id: I0fc4f8226c4aa9acd6a4b65811f4228e56018315

10 years agoam 8174aad5: am 36f98428: Merge "Update cast screen strings." into klp-dev
Jeff Brown [Fri, 15 Nov 2013 01:35:01 +0000 (17:35 -0800)]
am 8174aad5: am 36f98428: Merge "Update cast screen strings." into klp-dev

* commit '8174aad50382280c55a33f2572eb1fcdb53078c1':
  Update cast screen strings.

10 years agoam 36f98428: Merge "Update cast screen strings." into klp-dev
Jeff Brown [Fri, 15 Nov 2013 01:31:33 +0000 (17:31 -0800)]
am 36f98428: Merge "Update cast screen strings." into klp-dev

* commit '36f98428d450226670d67123ce02cc0c0ca75621':
  Update cast screen strings.

10 years agoMerge "Update cast screen strings." into klp-dev
Jeff Brown [Fri, 15 Nov 2013 01:29:05 +0000 (01:29 +0000)]
Merge "Update cast screen strings." into klp-dev

10 years agoam 31ee7e19: am fb3d5cad: Don\'t show keyguard on top of CryptKeeper
Jim Miller [Fri, 15 Nov 2013 00:29:39 +0000 (16:29 -0800)]
am 31ee7e19: am fb3d5cad: Don\'t show keyguard on top of CryptKeeper

* commit '31ee7e19a040ab7660d39a6693f6ed38f7c961ad':
  Don't show keyguard on top of CryptKeeper

10 years agoam fb3d5cad: Don\'t show keyguard on top of CryptKeeper
Jim Miller [Fri, 15 Nov 2013 00:27:24 +0000 (16:27 -0800)]
am fb3d5cad: Don\'t show keyguard on top of CryptKeeper

* commit 'fb3d5cad48876dbd366fd8b562529d355d2428db':
  Don't show keyguard on top of CryptKeeper

10 years agoUpdate cast screen strings.
Jeff Brown [Fri, 15 Nov 2013 00:04:13 +0000 (16:04 -0800)]
Update cast screen strings.

Bug: 11257292
Change-Id: I280f99bb91ebd0badd06b7fdca25aa3f2e96d201

10 years agoDon't show keyguard on top of CryptKeeper
Jim Miller [Thu, 14 Nov 2013 22:40:22 +0000 (14:40 -0800)]
Don't show keyguard on top of CryptKeeper

The fix in Change Ifbe4cdf40e3b76d2069ecace940f85fa58f31187 causes
keyguard to be more aggressive about showing itself.

CryptKeeper itself should explicitly dismiss keyguard.

Fixes bug 11680832

Change-Id: I87287762b73bdffc6f1800379f02f70f4bd873a8

10 years agoam 7ff9f2b4: am b1ded62f: Merge "Update power widget icons and fix location behavior...
David Christie [Thu, 14 Nov 2013 22:20:31 +0000 (14:20 -0800)]
am 7ff9f2b4: am b1ded62f: Merge "Update power widget icons and fix location behavior Bug: 11242129" into klp-dev

* commit '7ff9f2b488e4017c7b3385fb067a14cfc07764fb':
  Update power widget icons and fix location behavior Bug: 11242129

10 years agoam b1ded62f: Merge "Update power widget icons and fix location behavior Bug: 11242129...
David Christie [Thu, 14 Nov 2013 20:16:06 +0000 (12:16 -0800)]
am b1ded62f: Merge "Update power widget icons and fix location behavior Bug: 11242129" into klp-dev

* commit 'b1ded62f3fd8afa2507fc8d284522019dc1e31e2':
  Update power widget icons and fix location behavior Bug: 11242129

10 years agoMerge "Update power widget icons and fix location behavior Bug: 11242129" into klp-dev
David Christie [Thu, 14 Nov 2013 20:12:41 +0000 (20:12 +0000)]
Merge "Update power widget icons and fix location behavior Bug: 11242129" into klp-dev

10 years agoam 2f888a47: (-s ours) am 9b28d5a0: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 14 Nov 2013 02:37:13 +0000 (18:37 -0800)]
am 2f888a47: (-s ours) am 9b28d5a0: (-s ours) Import translations. DO NOT MERGE

* commit '2f888a47522f8dcaad3f7ec32274675dd74c1501':
  Import translations. DO NOT MERGE

10 years agoam 9b28d5a0: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 14 Nov 2013 02:33:06 +0000 (18:33 -0800)]
am 9b28d5a0: (-s ours) Import translations. DO NOT MERGE

* commit '9b28d5a0c3a6ac46a55a5c8c3b10791494fd61c5':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 14 Nov 2013 02:06:51 +0000 (18:06 -0800)]
Import translations. DO NOT MERGE

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

10 years agoam 3aedfdfd: am 81ed0438: Finalize assets for screen cast.
Jeff Brown [Wed, 13 Nov 2013 17:02:20 +0000 (09:02 -0800)]
am 3aedfdfd: am 81ed0438: Finalize assets for screen cast.

* commit '3aedfdfdbfcff15f6b761fca3b6bda8449f11053':
  Finalize assets for screen cast.

10 years agoam 81ed0438: Finalize assets for screen cast.
Jeff Brown [Wed, 13 Nov 2013 16:57:58 +0000 (08:57 -0800)]
am 81ed0438: Finalize assets for screen cast.

* commit '81ed043857dadcb69885c1e2ac37d63925c56c65':
  Finalize assets for screen cast.

10 years agoFinalize assets for screen cast.
Jeff Brown [Wed, 13 Nov 2013 06:04:49 +0000 (22:04 -0800)]
Finalize assets for screen cast.

Bug: 11257292
Change-Id: I483496b4fc92bcf8e2c4f080a5a5d5bf97318b5d

10 years agoam 74a503fd: (-s ours) am 622b5d2a: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Mon, 11 Nov 2013 22:48:31 +0000 (14:48 -0800)]
am 74a503fd: (-s ours) am 622b5d2a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '74a503fddf2626f6aedec486e9b30c4beb6377e2':
  Import translations. DO NOT MERGE

10 years agoam 622b5d2a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 11 Nov 2013 22:44:42 +0000 (14:44 -0800)]
am 622b5d2a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '622b5d2a6af0cda319e4fbe066d62e36b06f7aa3':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 11 Nov 2013 22:41:12 +0000 (22:41 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 11 Nov 2013 18:35:06 +0000 (10:35 -0800)]
Import translations. DO NOT MERGE

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

10 years agoam 2fba8be9: am 4e54c2a1: Integrate remote display routes into screen cast settings UI.
Jeff Brown [Mon, 11 Nov 2013 18:27:24 +0000 (10:27 -0800)]
am 2fba8be9: am 4e54c2a1: Integrate remote display routes into screen cast settings UI.

* commit '2fba8be9c0c9da814e40af00847f3f2d28cf7f01':
  Integrate remote display routes into screen cast settings UI.

10 years agoam 4e54c2a1: Integrate remote display routes into screen cast settings UI.
Jeff Brown [Mon, 11 Nov 2013 18:21:59 +0000 (10:21 -0800)]
am 4e54c2a1: Integrate remote display routes into screen cast settings UI.

* commit '4e54c2a17765aed01ba23c9b0ec4d41e66c698b7':
  Integrate remote display routes into screen cast settings UI.

10 years agoIntegrate remote display routes into screen cast settings UI.
Jeff Brown [Mon, 11 Nov 2013 05:02:20 +0000 (21:02 -0800)]
Integrate remote display routes into screen cast settings UI.

Merged remote display route selection into the existing wifi
display preference UI.  Moved the on/off toggle over to a menu item.

The preference page is now mainly implemented in terms of the
media router.  It only interacts with the display manager for the purpose
of pairing with new devices or making wifi display certification
controls available.

This means that the observed state is now completely consistent across
the system ui, settings, and applications that use the media router.

Bug: 11257292
Change-Id: I3705570812384fef4bfffeccaaccf7895d370d12

10 years agoam 7ebe4c6c: am a27816dc: merge in release branch changes (no-op).
Ed Heyl [Fri, 8 Nov 2013 21:59:55 +0000 (13:59 -0800)]
am 7ebe4c6c: am a27816dc: merge in release branch changes (no-op).

* commit '7ebe4c6c209e983e648e2529d68ebe2c36bf7733':
  Revert "Accessibility: filter touches to Enable button"

10 years agoam a27816dc: merge in release branch changes (no-op).
Ed Heyl [Fri, 8 Nov 2013 21:31:32 +0000 (13:31 -0800)]
am a27816dc: merge in release branch changes (no-op).

* commit 'a27816dc2d72f5757ee5377ccd03798736c96fd8':
  Revert "Accessibility: filter touches to Enable button"

10 years agomerge in release branch changes (no-op).
Ed Heyl [Fri, 8 Nov 2013 21:23:52 +0000 (13:23 -0800)]
merge in release branch changes (no-op).

10 years agoUpdate power widget icons and fix location behavior
David Christie [Thu, 31 Oct 2013 18:03:36 +0000 (11:03 -0700)]
Update power widget icons and fix location behavior
Bug: 11242129

Change-Id: I29f5b4cf914ece4b0991229f384012eb66ba3820

10 years agoam 384bf727: am 29b7a844: Merge "Add batch scan data to power stats." into klp-dev
Robert Greenwalt [Thu, 7 Nov 2013 18:43:11 +0000 (10:43 -0800)]
am 384bf727: am 29b7a844: Merge "Add batch scan data to power stats." into klp-dev

* commit '384bf72708b623bf48a0395a51db94bda055f496':
  Add batch scan data to power stats.

10 years agoam 29b7a844: Merge "Add batch scan data to power stats." into klp-dev
Robert Greenwalt [Thu, 7 Nov 2013 18:32:55 +0000 (10:32 -0800)]
am 29b7a844: Merge "Add batch scan data to power stats." into klp-dev

* commit '29b7a8446a36286bd4311ec2f52281fd1628a86e':
  Add batch scan data to power stats.

10 years agoMerge "Add batch scan data to power stats." into klp-dev
Robert Greenwalt [Thu, 7 Nov 2013 18:31:03 +0000 (18:31 +0000)]
Merge "Add batch scan data to power stats." into klp-dev

10 years agomerge in klp-mr1-release history after reset to klp-dev
The Android Automerger [Thu, 7 Nov 2013 14:01:28 +0000 (06:01 -0800)]
merge in klp-mr1-release history after reset to klp-dev

10 years agoam f9be657a: (-s ours) am 7d716436: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Thu, 7 Nov 2013 04:06:01 +0000 (20:06 -0800)]
am f9be657a: (-s ours) am 7d716436: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

10 years agoam 7d716436: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 7 Nov 2013 04:03:44 +0000 (20:03 -0800)]
am 7d716436: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '7d7164361e3e9cf9198fca4050fca81547053b04':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 7 Nov 2013 04:00:04 +0000 (04:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoam 279c1e15: am d0de39e7: Merge "Revert "Accessibility: filter touches to Enable...
Kenny Root [Wed, 6 Nov 2013 23:14:35 +0000 (15:14 -0800)]
am 279c1e15: am d0de39e7: Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev

* commit '279c1e15d23254728783ad99faff7349d9543ac4':
  Revert "Accessibility: filter touches to Enable button"

10 years agoRevert "Accessibility: filter touches to Enable button"
Kenny Root [Wed, 6 Nov 2013 22:03:52 +0000 (22:03 +0000)]
Revert "Accessibility: filter touches to Enable button"

This reverts commit 94d4f23dccee1e27fdb360b1886327565b66aa91.

Change-Id: I26a77faed6798e5bf1d51048ffde4aa8b35aae2f

10 years agoam d0de39e7: Merge "Revert "Accessibility: filter touches to Enable button"" into...
Kenny Root [Wed, 6 Nov 2013 23:11:14 +0000 (15:11 -0800)]
am d0de39e7: Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev

* commit 'd0de39e716c7d93beeb83f9b442af437be651e55':
  Revert "Accessibility: filter touches to Enable button"

10 years agoMerge "Revert "Accessibility: filter touches to Enable button"" into klp-dev
Kenny Root [Wed, 6 Nov 2013 23:09:05 +0000 (23:09 +0000)]
Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 6 Nov 2013 22:34:35 +0000 (14:34 -0800)]
Import translations. DO NOT MERGE

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

10 years agoRevert "Accessibility: filter touches to Enable button"
Kenny Root [Wed, 6 Nov 2013 22:03:52 +0000 (22:03 +0000)]
Revert "Accessibility: filter touches to Enable button"

This reverts commit 94d4f23dccee1e27fdb360b1886327565b66aa91.

Change-Id: I26a77faed6798e5bf1d51048ffde4aa8b35aae2f

10 years agoam 5b68e4c8: am 741bc054: Merge "Shows LGAAYL when launching Location Settings" into...
Lifu Tang [Wed, 6 Nov 2013 06:26:19 +0000 (22:26 -0800)]
am 5b68e4c8: am 741bc054: Merge "Shows LGAAYL when launching Location Settings" into klp-dev

* commit '5b68e4c8d09d9c0cc864e32970c9af925dd0d643':
  Shows LGAAYL when launching Location Settings

10 years agoam 741bc054: Merge "Shows LGAAYL when launching Location Settings" into klp-dev
Lifu Tang [Wed, 6 Nov 2013 06:23:01 +0000 (22:23 -0800)]
am 741bc054: Merge "Shows LGAAYL when launching Location Settings" into klp-dev

* commit '741bc054243576dcfff17bf3a807dc8732bca332':
  Shows LGAAYL when launching Location Settings

10 years agoMerge "Shows LGAAYL when launching Location Settings" into klp-dev
Lifu Tang [Wed, 6 Nov 2013 06:20:56 +0000 (06:20 +0000)]
Merge "Shows LGAAYL when launching Location Settings" into klp-dev

10 years agoam 36ddea8c: am 5b7111d0: Merge "Remove line break." into klp-dev
Geoffrey Borggaard [Wed, 6 Nov 2013 02:56:59 +0000 (18:56 -0800)]
am 36ddea8c: am 5b7111d0: Merge "Remove line break." into klp-dev

* commit '36ddea8c212b21dc24e270ce7d20023db1477a32':
  Remove line break.

10 years agoam c85359ef: am 4e42c808: Merge "Add PAC UI to Wi-Fi Settings" into klp-dev
Jason Monk [Wed, 6 Nov 2013 02:56:49 +0000 (18:56 -0800)]
am c85359ef: am 4e42c808: Merge "Add PAC UI to Wi-Fi Settings" into klp-dev

* commit 'c85359ef11221c09e7a5d55692ffda0f98b8e00c':
  Add PAC UI to Wi-Fi Settings

10 years agoam 5b7111d0: Merge "Remove line break." into klp-dev
Geoffrey Borggaard [Wed, 6 Nov 2013 02:39:31 +0000 (18:39 -0800)]
am 5b7111d0: Merge "Remove line break." into klp-dev

* commit '5b7111d05db50d479290517b1b459dbcfc178a7f':
  Remove line break.

10 years agoMerge "Remove line break." into klp-dev
Geoffrey Borggaard [Wed, 6 Nov 2013 02:37:48 +0000 (02:37 +0000)]
Merge "Remove line break." into klp-dev

10 years agoam 4e42c808: Merge "Add PAC UI to Wi-Fi Settings" into klp-dev
Jason Monk [Wed, 6 Nov 2013 02:22:58 +0000 (18:22 -0800)]
am 4e42c808: Merge "Add PAC UI to Wi-Fi Settings" into klp-dev

* commit '4e42c80872e3543247913afd270fe5b9950b2969':
  Add PAC UI to Wi-Fi Settings

10 years agoMerge "Add PAC UI to Wi-Fi Settings" into klp-dev
Jason Monk [Wed, 6 Nov 2013 02:20:49 +0000 (02:20 +0000)]
Merge "Add PAC UI to Wi-Fi Settings" into klp-dev

10 years agoam e202393f: (-s ours) am 1bfd3541: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Tue, 5 Nov 2013 23:49:37 +0000 (15:49 -0800)]
am e202393f: (-s ours) am 1bfd3541: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

10 years agoam f7f6e4bf: am 060d5fd1: Merge "Adjust power control widget minWidth to occupy 4...
Amith Yamasani [Tue, 5 Nov 2013 23:49:25 +0000 (15:49 -0800)]
am f7f6e4bf: am 060d5fd1: Merge "Adjust power control widget minWidth to occupy 4 cells." into klp-dev

* commit 'f7f6e4bfc6e9dbfb8b2b22875e62a5bfa8e1a82a':
  Adjust power control widget minWidth to occupy 4 cells.

10 years agoam 1bfd3541: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 5 Nov 2013 23:15:23 +0000 (15:15 -0800)]
am 1bfd3541: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 5 Nov 2013 23:12:13 +0000 (23:12 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoam 060d5fd1: Merge "Adjust power control widget minWidth to occupy 4 cells." into...
Amith Yamasani [Tue, 5 Nov 2013 21:54:00 +0000 (13:54 -0800)]
am 060d5fd1: Merge "Adjust power control widget minWidth to occupy 4 cells." into klp-dev

* commit '060d5fd1727b087094e295481b2633deb33a6616':
  Adjust power control widget minWidth to occupy 4 cells.

10 years agoMerge "Adjust power control widget minWidth to occupy 4 cells." into klp-dev
Amith Yamasani [Tue, 5 Nov 2013 21:51:43 +0000 (21:51 +0000)]
Merge "Adjust power control widget minWidth to occupy 4 cells." into klp-dev

10 years agoAdd PAC UI to Wi-Fi Settings
Jason Monk [Tue, 5 Nov 2013 16:54:48 +0000 (11:54 -0500)]
Add PAC UI to Wi-Fi Settings

Now when a PAC URL is set it shows it in settings rather than the proxy
spinner set to None.  This should only be visible in EDU users as only EDU
has PAC.

Bug: 11528608
Change-Id: Ie4bad8ea935f0a8f1bb7877eb2be146e06d71c2d

10 years agoam 98f5e186: am c3a6cd6e: Merge "Move a line into try block"
Elliott Hughes [Tue, 5 Nov 2013 18:35:25 +0000 (10:35 -0800)]
am 98f5e186: am c3a6cd6e: Merge "Move a line into try block"

* commit '98f5e1861da4d708e7199b5d563895cf4d2c8db7':
  Move a line into try block

10 years agoam c3a6cd6e: Merge "Move a line into try block"
Elliott Hughes [Tue, 5 Nov 2013 18:30:01 +0000 (10:30 -0800)]
am c3a6cd6e: Merge "Move a line into try block"

* commit 'c3a6cd6ee531c81f776551caa40b63732115e971':
  Move a line into try block

10 years agoRemove line break.
Geoffrey Borggaard [Tue, 5 Nov 2013 18:10:49 +0000 (13:10 -0500)]
Remove line break.

The "network may be monitored" message had an extra line break.
Bug: 11534572

Change-Id: I7a0e9845413f2e5787ca60ad9e2f8988eed207a6

10 years agoMerge "Move a line into try block"
Elliott Hughes [Tue, 5 Nov 2013 16:48:46 +0000 (16:48 +0000)]
Merge "Move a line into try block"

10 years agoam 18964c90: am 8cc60da4: Merge "Accessibility: filter touches to Enable button"...
Kenny Root [Tue, 5 Nov 2013 05:55:21 +0000 (21:55 -0800)]
am 18964c90: am 8cc60da4: Merge "Accessibility: filter touches to Enable button" into klp-dev

* commit '18964c90638dd6d2cdaaaed3001aec40482f45b1':
  Accessibility: filter touches to Enable button

10 years agoam 8cc60da4: Merge "Accessibility: filter touches to Enable button" into klp-dev
Kenny Root [Tue, 5 Nov 2013 00:16:08 +0000 (16:16 -0800)]
am 8cc60da4: Merge "Accessibility: filter touches to Enable button" into klp-dev

* commit '8cc60da4c91c38f7f37561ff3bbb128dcb7456d8':
  Accessibility: filter touches to Enable button

10 years agoMerge "Accessibility: filter touches to Enable button" into klp-dev
Kenny Root [Tue, 5 Nov 2013 00:12:19 +0000 (00:12 +0000)]
Merge "Accessibility: filter touches to Enable button" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 4 Nov 2013 23:23:56 +0000 (15:23 -0800)]
Import translations. DO NOT MERGE

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

10 years agoShows LGAAYL when launching Location Settings
Lifu Tang [Mon, 4 Nov 2013 06:36:00 +0000 (22:36 -0800)]
Shows LGAAYL when launching Location Settings

- Partial fix of b/10897468

Change-Id: Iec96909b87e71869c5a020ce848c6cf4fada3616

10 years agoAdjust power control widget minWidth to occupy 4 cells.
Amith Yamasani [Sat, 2 Nov 2013 00:17:08 +0000 (17:17 -0700)]
Adjust power control widget minWidth to occupy 4 cells.

Bug: 10561000
Change-Id: I9a4312d956581059ea43077c5228e43e2bd1c7a5

10 years agoam 8fe316ca: (-s ours) am e2b0278f: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Fri, 1 Nov 2013 14:49:47 +0000 (07:49 -0700)]
am 8fe316ca: (-s ours) am e2b0278f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

10 years agoam e2b0278f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Fri, 1 Nov 2013 14:47:57 +0000 (07:47 -0700)]
am e2b0278f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Fri, 1 Nov 2013 14:46:21 +0000 (14:46 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoMove a line into try block
Shuhrat Dehkanov [Fri, 1 Nov 2013 08:39:44 +0000 (17:39 +0900)]
Move a line into try block

Currently, NumberFormatException is never handled as
Integer.parseInt() is called outside try block.
This moves that line inside try block.

Change-Id: I54544f5a665ca0f821de5351001755cb965078dc
Signed-off-by: Shuhrat Dehkanov <k@efir.uz>
10 years agoam 2cab1344: am aa4fa0ea: Fix a bug on updating enabled IMEs
Satoshi Kataoka [Thu, 31 Oct 2013 22:10:17 +0000 (15:10 -0700)]
am 2cab1344: am aa4fa0ea: Fix a bug on updating enabled IMEs

* commit '2cab1344037ada26710047138b59c2f8f0f4dfee':
  Fix a bug on updating enabled IMEs

10 years agoam aa4fa0ea: Fix a bug on updating enabled IMEs
Satoshi Kataoka [Thu, 31 Oct 2013 22:07:11 +0000 (15:07 -0700)]
am aa4fa0ea: Fix a bug on updating enabled IMEs

* commit 'aa4fa0ea0950ecd61af64a6bdeea109cfed64362':
  Fix a bug on updating enabled IMEs

10 years agoFix a bug on updating enabled IMEs
Satoshi Kataoka [Wed, 30 Oct 2013 20:35:45 +0000 (13:35 -0700)]
Fix a bug on updating enabled IMEs

Bug: 11354619
Change-Id: Ie33630b3dc150536bc0325ad6116ea5fdcf60740

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 30 Oct 2013 18:23:02 +0000 (11:23 -0700)]
Import translations. DO NOT MERGE

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

10 years agoam 455bf4d3: am 1630ef4f: remove lockscreen widget checkbox when there\'s no lockscreen.
Chris Wren [Tue, 29 Oct 2013 19:01:47 +0000 (12:01 -0700)]
am 455bf4d3: am 1630ef4f: remove lockscreen widget checkbox when there\'s no lockscreen.

* commit '455bf4d3395e828dfbeca1f2ef5696e960874ad1':
  remove lockscreen widget checkbox when there's no lockscreen.

10 years agoam 1630ef4f: remove lockscreen widget checkbox when there\'s no lockscreen.
Chris Wren [Tue, 29 Oct 2013 18:59:53 +0000 (11:59 -0700)]
am 1630ef4f: remove lockscreen widget checkbox when there\'s no lockscreen.

* commit '1630ef4fc5f4131d7d7ef823ba5afba3b5b3fa72':
  remove lockscreen widget checkbox when there's no lockscreen.

10 years agoremove lockscreen widget checkbox when there's no lockscreen.
Chris Wren [Tue, 29 Oct 2013 16:30:35 +0000 (12:30 -0400)]
remove lockscreen widget checkbox when there's no lockscreen.

Bug: 11190345
Change-Id: I1b48e7a6a70226b103d8a6a27bd3374ff8349b3f