OSDN Git Service

android-x86/packages-apps-Settings.git
11 years agoMerge "Align "Make passwords visible" setting." into jb-mr1.1-dev
Jeff Sharkey [Thu, 15 Nov 2012 19:44:37 +0000 (11:44 -0800)]
Merge "Align "Make passwords visible" setting." into jb-mr1.1-dev

11 years agoam add9d21f: Import translations. DO NOT MERGE
Baligh Uddin [Thu, 15 Nov 2012 17:02:00 +0000 (09:02 -0800)]
am add9d21f: Import translations. DO NOT MERGE

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

11 years agoAlign "Make passwords visible" setting.
Jeff Sharkey [Thu, 15 Nov 2012 01:00:12 +0000 (17:00 -0800)]
Align "Make passwords visible" setting.

Bug: 7545894
Change-Id: I46113676c46055bd7468a0aa7289c9475e714232

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 14 Nov 2012 20:43:52 +0000 (12:43 -0800)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 14 Nov 2012 20:41:58 +0000 (12:41 -0800)]
Import translations. DO NOT MERGE

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

11 years agoam a0fbc220: Import translations. DO NOT MERGE
Baligh Uddin [Sat, 10 Nov 2012 00:15:33 +0000 (16:15 -0800)]
am a0fbc220: Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 9 Nov 2012 19:53:40 +0000 (11:53 -0800)]
Import translations. DO NOT MERGE

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

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Thu, 8 Nov 2012 22:19:27 +0000 (14:19 -0800)]
Reconcile with jb-mr1-release - do not merge

Change-Id: Iaa26de823282e7aba1ec495c04de885dd5267982

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 8 Nov 2012 21:54:19 +0000 (13:54 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam d9609fc0: Fix jank after adding a widget for lock screen
Michael Jurka [Thu, 8 Nov 2012 21:10:47 +0000 (13:10 -0800)]
am d9609fc0: Fix jank after adding a widget for lock screen

* commit 'd9609fc0a2be07e9100dbb83f3549dad1d9b3c51':
  Fix jank after adding a widget for lock screen

11 years agoam a108d9fc: Final tweaks to visuals of widget picker
Michael Jurka [Thu, 8 Nov 2012 21:10:46 +0000 (13:10 -0800)]
am a108d9fc: Final tweaks to visuals of widget picker

* commit 'a108d9fc0edd3b4f741fae595e35a246fbc700ff':
  Final tweaks to visuals of widget picker

11 years agoam c74ef2f2: am 7d6a0f9c: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Thu, 8 Nov 2012 02:29:07 +0000 (18:29 -0800)]
am c74ef2f2: am 7d6a0f9c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'c74ef2f28b1b095ecb3dea78ff8d277daec84f58':

11 years agoFix jank after adding a widget for lock screen
Michael Jurka [Thu, 8 Nov 2012 00:54:35 +0000 (16:54 -0800)]
Fix jank after adding a widget for lock screen

After adding a widget, you see a black flash, but
there's also a small sliver of wallpaper left
showing. This change covers up that small bit
of wallpaper.

Bug: 7381803

11 years agoFinal tweaks to visuals of widget picker
Michael Jurka [Wed, 7 Nov 2012 23:31:47 +0000 (15:31 -0800)]
Final tweaks to visuals of widget picker

11 years agoam 7d6a0f9c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Wed, 7 Nov 2012 19:51:32 +0000 (11:51 -0800)]
am 7d6a0f9c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

11 years agoam 7d6a0f9c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Wed, 7 Nov 2012 19:50:53 +0000 (11:50 -0800)]
am 7d6a0f9c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Wed, 7 Nov 2012 19:49:24 +0000 (11:49 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Wed, 7 Nov 2012 19:35:14 +0000 (11:35 -0800)]
Reconcile with jb-mr1-release - do not merge

Change-Id: I0c96fcfe474c0536ddfaaea7705b4956df0e0f43

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 7 Nov 2012 19:18:19 +0000 (11:18 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 9d41995b: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
Baligh Uddin [Wed, 7 Nov 2012 19:11:53 +0000 (11:11 -0800)]
am 9d41995b: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

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

11 years agoam f5336fd1: Allowing rotation while adding lockscreen widgets
Michael Jurka [Wed, 7 Nov 2012 19:11:51 +0000 (11:11 -0800)]
am f5336fd1: Allowing rotation while adding lockscreen widgets

* commit 'f5336fd114e557fce06197041aab70217308fe90':
  Allowing rotation while adding lockscreen widgets

11 years agoam a487bca4: Updated layouts for keyguard widget picker
Michael Jurka [Wed, 7 Nov 2012 19:11:50 +0000 (11:11 -0800)]
am a487bca4: Updated layouts for keyguard widget picker

* commit 'a487bca4700a9dbd5d5d72913d0265ae86815edf':
  Updated layouts for keyguard widget picker

11 years agoam c0fb8a39: Merge "Updated assets." into jb-mr1-lockscreen-dev
Michael Jurka [Wed, 7 Nov 2012 19:11:49 +0000 (11:11 -0800)]
am c0fb8a39: Merge "Updated assets." into jb-mr1-lockscreen-dev

* commit 'c0fb8a399be0b3e4b365682c681ff24264bbef14':
  Updated assets.

11 years agoam 5c5eff45: Pass argument to lock screen to show widget after adding it
Michael Jurka [Wed, 7 Nov 2012 19:11:48 +0000 (11:11 -0800)]
am 5c5eff45: Pass argument to lock screen to show widget after adding it

* commit '5c5eff45e97a2bb1b55befb87eb535a438a7bbf8':
  Pass argument to lock screen to show widget after adding it

11 years agoam 4119788b: Add widget previews to the key guard widget picker
Michael Jurka [Wed, 7 Nov 2012 19:11:47 +0000 (11:11 -0800)]
am 4119788b: Add widget previews to the key guard widget picker

* commit '4119788b1be5d9b51e3c5cfe4e32f2aacc5a2f8f':
  Add widget previews to the key guard widget picker

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
Baligh Uddin [Wed, 7 Nov 2012 18:03:25 +0000 (10:03 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

11 years agoAllowing rotation while adding lockscreen widgets
Michael Jurka [Wed, 7 Nov 2012 09:11:28 +0000 (01:11 -0800)]
Allowing rotation while adding lockscreen widgets

Also cleaning up some unused code

Bug: 7468012

11 years agoUpdated layouts for keyguard widget picker
Michael Jurka [Wed, 7 Nov 2012 05:08:31 +0000 (21:08 -0800)]
Updated layouts for keyguard widget picker

Bug: 7381803

Change-Id: I9a6a8fe3216002b486e7b6ddf7544d9fc4e73de8

11 years agoMerge "Updated assets." into jb-mr1-lockscreen-dev
Michael Jurka [Wed, 7 Nov 2012 05:10:21 +0000 (21:10 -0800)]
Merge "Updated assets." into jb-mr1-lockscreen-dev

11 years agoUpdated assets.
Daniel Sandler [Wed, 7 Nov 2012 05:03:34 +0000 (00:03 -0500)]
Updated assets.

Change-Id: Ib4e02eb1c43523e86ad8828835f76436ebb82506

11 years agoPass argument to lock screen to show widget
Michael Jurka [Wed, 7 Nov 2012 00:22:04 +0000 (16:22 -0800)]
Pass argument to lock screen to show widget
after adding it

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 7 Nov 2012 00:13:52 +0000 (16:13 -0800)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 7 Nov 2012 00:11:40 +0000 (16:11 -0800)]
Import translations. DO NOT MERGE

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

11 years agoAdd widget previews to the key guard widget picker
Michael Jurka [Sat, 3 Nov 2012 06:05:34 +0000 (23:05 -0700)]
Add widget previews to the key guard widget picker

Bug: 7381803

Change-Id: I86946b7d0d75f8a1f89120600be2513bdf9026f0

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Tue, 6 Nov 2012 21:26:57 +0000 (13:26 -0800)]
Reconcile with jb-mr1-release - do not merge

Change-Id: Ibf539c16a9086609d5baf494ea5156c8967d02a5

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 6 Nov 2012 21:13:42 +0000 (13:13 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam ab3472f5: Supporting EXTRA_APPWIDGET_OPTIONS correctly
Michael Jurka [Tue, 6 Nov 2012 20:38:24 +0000 (12:38 -0800)]
am ab3472f5: Supporting EXTRA_APPWIDGET_OPTIONS correctly

* commit 'ab3472f5946c5dc3193c29513e31be7309ece378':
  Supporting EXTRA_APPWIDGET_OPTIONS correctly

11 years agoReconcile with jb-mr1-factory-release jb-mr1-release - do not merge
The Android Open Source Project [Tue, 6 Nov 2012 20:18:44 +0000 (12:18 -0800)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Ic248a0dc1baadcebad816f4870655a826fa7a5d7

11 years agoSupporting EXTRA_APPWIDGET_OPTIONS correctly
Michael Jurka [Tue, 6 Nov 2012 02:56:14 +0000 (18:56 -0800)]
Supporting EXTRA_APPWIDGET_OPTIONS correctly

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 6 Nov 2012 02:39:13 +0000 (18:39 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoMerge "Disable the "none" security selection in settings when there's only 1 user...
Jim Miller [Mon, 5 Nov 2012 02:28:34 +0000 (18:28 -0800)]
Merge "Disable the "none" security selection in settings when there's only 1 user" into jb-mr1-lockscreen-dev

11 years agoam e3a4a5fd: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 5 Nov 2012 01:52:56 +0000 (17:52 -0800)]
am e3a4a5fd: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
Baligh Uddin [Mon, 5 Nov 2012 01:51:14 +0000 (17:51 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 5 Nov 2012 01:50:45 +0000 (17:50 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sat, 3 Nov 2012 00:34:52 +0000 (17:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoDisable the "none" security selection in settings when there's only 1 user
Jim Miller [Fri, 2 Nov 2012 02:39:21 +0000 (19:39 -0700)]
Disable the "none" security selection in settings when there's only 1 user

Fixes bug 7454567

Change-Id: Ifffa1403af8d45bc3c7da1f459b87f0a2c064b80

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 2 Nov 2012 08:42:19 +0000 (01:42 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 2 Nov 2012 08:40:39 +0000 (01:40 -0700)]
Import translations. DO NOT MERGE

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

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 1 Nov 2012 01:34:23 +0000 (18:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoFix issue #7448596: Can't uninstall app that was installed by another user
Dianne Hackborn [Thu, 1 Nov 2012 00:15:58 +0000 (17:15 -0700)]
Fix issue #7448596: Can't uninstall app that was installed by another user

Change-Id: I6614346f8da80ffedd71645ee2920cf85b92c87c

11 years agoNew widget picker for keyguard widgets
Michael Jurka [Tue, 30 Oct 2012 22:32:27 +0000 (15:32 -0700)]
New widget picker for keyguard widgets

New layout for widget picker is still not up to
final design, but this change prepares all the
backend work

Also, remove use of features filter from the
picker, since this is being removed from the API

Change-Id: I9b332e22cf34b98c20c720602c920d28aed01d6c

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 31 Oct 2012 03:12:35 +0000 (20:12 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam f79daa94: Merge "display audio dialog when connecting low end dock" into jb-mr1-dev
Eric Laurent [Tue, 30 Oct 2012 21:14:40 +0000 (14:14 -0700)]
am f79daa94: Merge "display audio dialog when connecting low end dock" into jb-mr1-dev

* commit 'f79daa942005608e56a4a0d7f414fedccd56e467':
  display audio dialog when connecting low end dock

11 years agoMerge "display audio dialog when connecting low end dock" into jb-mr1-dev
Eric Laurent [Tue, 30 Oct 2012 21:12:22 +0000 (14:12 -0700)]
Merge "display audio dialog when connecting low end dock" into jb-mr1-dev

11 years agoam 29c4c88b: Merge "Whoops, missed a \'Sleep Mode\' -> \'Daydream\' string." into...
Justin Ho [Tue, 30 Oct 2012 18:17:54 +0000 (11:17 -0700)]
am 29c4c88b: Merge "Whoops, missed a \'Sleep Mode\' -> \'Daydream\' string." into jb-mr1-dev

* commit '29c4c88be2c2f225a1daff551b4e32ed03cc1bda':
  Whoops, missed a 'Sleep Mode' -> 'Daydream' string.

11 years agoMerge "Whoops, missed a 'Sleep Mode' -> 'Daydream' string." into jb-mr1-dev
Justin Ho [Tue, 30 Oct 2012 18:16:44 +0000 (11:16 -0700)]
Merge "Whoops, missed a 'Sleep Mode' -> 'Daydream' string." into jb-mr1-dev

11 years agodisplay audio dialog when connecting low end dock
Eric Laurent [Tue, 30 Oct 2012 00:56:46 +0000 (17:56 -0700)]
display audio dialog when connecting low end dock

Display a dialog to enable the use of the dock audio connection
when a low end dock is connected for the first time.

Modify DockService to process docked and undocked messages even if
the device indicated is null (meaning the dock is not a bluetooth dock)
only for low end docks.

Bug 7302106.

Change-Id: I331d83a74fecf5f26b24bfc178342df414bd8153

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 30 Oct 2012 15:53:03 +0000 (08:53 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoWhoops, missed a 'Sleep Mode' -> 'Daydream' string.
Daniel Sandler [Tue, 30 Oct 2012 13:59:16 +0000 (09:59 -0400)]
Whoops, missed a 'Sleep Mode' -> 'Daydream' string.

Change-Id: I7ed00811e2c31459aaa32336dba4ff75b095f5ef

11 years agoam c2c9d5bd: Merge "Selectively enable bugreport in power menu." into jb-mr1-dev
Jeff Sharkey [Mon, 29 Oct 2012 23:37:17 +0000 (16:37 -0700)]
am c2c9d5bd: Merge "Selectively enable bugreport in power menu." into jb-mr1-dev

* commit 'c2c9d5bde11113d3fc86f1ea25b41e7446e3d833':
  Selectively enable bugreport in power menu.

11 years agoMerge "Selectively enable bugreport in power menu." into jb-mr1-dev
Jeff Sharkey [Mon, 29 Oct 2012 23:35:07 +0000 (16:35 -0700)]
Merge "Selectively enable bugreport in power menu." into jb-mr1-dev

11 years agoam 2e0679ed: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 29 Oct 2012 22:22:47 +0000 (15:22 -0700)]
am 2e0679ed: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
Baligh Uddin [Mon, 29 Oct 2012 22:20:29 +0000 (15:20 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 29 Oct 2012 22:19:59 +0000 (15:19 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoam 8d028a87: Allow wireless charging during encrypt
Vikram Aggarwal [Mon, 29 Oct 2012 22:14:23 +0000 (15:14 -0700)]
am 8d028a87: Allow wireless charging during encrypt

* commit '8d028a87e97f9420f9db31a6b8aa80859fe393b3':
  Allow wireless charging during encrypt

11 years agoSelectively enable bugreport in power menu.
Jeff Sharkey [Mon, 29 Oct 2012 20:59:07 +0000 (13:59 -0700)]
Selectively enable bugreport in power menu.

The underlying bugreport init service depends on USB debugging being
turned on for user builds.  This change makes the developer options
UI reflect this constraint.

Bug: 7427434
Change-Id: I8dc16cc53ec4a97a3b39ee631694456be3bde081

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Oct 2012 20:31:03 +0000 (13:31 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Oct 2012 20:24:42 +0000 (13:24 -0700)]
Import translations. DO NOT MERGE

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

11 years agoAllow wireless charging during encrypt
Vikram Aggarwal [Mon, 29 Oct 2012 18:00:01 +0000 (11:00 -0700)]
Allow wireless charging during encrypt

Bug: 7426476 Cant Encrypt mako device using Charging pad as charging
             source

Change-Id: I6584a9e7a1533e06f0b0d55c1afd42641ee7ac3d

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Mon, 29 Oct 2012 18:20:23 +0000 (11:20 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam e42e7b85: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Oct 2012 01:36:02 +0000 (18:36 -0700)]
am e42e7b85: (-s ours) Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sun, 28 Oct 2012 19:43:44 +0000 (12:43 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sun, 28 Oct 2012 19:42:08 +0000 (12:42 -0700)]
Import translations. DO NOT MERGE

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

11 years agoMerge "added dock audio settings for non bluetooth docks" into jb-mr1-dev
Eric Laurent [Sat, 27 Oct 2012 21:43:39 +0000 (14:43 -0700)]
Merge "added dock audio settings for non bluetooth docks" into jb-mr1-dev

11 years agoadded dock audio settings for non bluetooth docks
Eric Laurent [Sat, 27 Oct 2012 01:55:16 +0000 (18:55 -0700)]
added dock audio settings for non bluetooth docks

This is a quick implementation allowing support for non bluetooth
audio docks.

Longer term it would be better to generalize DockService to support
all kinds of docks.

Bug 7302106.

Change-Id: I2df31ddbd8057a7297b244ea6a9e2d5a6a39bf7f

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Fri, 26 Oct 2012 23:23:12 +0000 (16:23 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 4cf289ad: Merge "Wording change for Daydream setting" into jb-mr1-dev
Daniel Sandler [Fri, 26 Oct 2012 12:46:14 +0000 (05:46 -0700)]
am 4cf289ad: Merge "Wording change for Daydream setting" into jb-mr1-dev

* commit '4cf289ad4d2d4f6ef0950b8542f53366f7e6f923':
  Wording change for Daydream setting

11 years agoMerge "Wording change for Daydream setting" into jb-mr1-dev
Daniel Sandler [Fri, 26 Oct 2012 11:46:13 +0000 (04:46 -0700)]
Merge "Wording change for Daydream setting" into jb-mr1-dev

11 years agoAdd ability to add clock widget to keyguard
Michael Jurka [Thu, 25 Oct 2012 23:05:10 +0000 (16:05 -0700)]
Add ability to add clock widget to keyguard

Change-Id: I70e6fbb664181efc2906ed33d732695279462a95

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 25 Oct 2012 20:42:45 +0000 (13:42 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam b02771ef: Merge "Reduce jank in security lock selection by finishing on return...
Amith Yamasani [Thu, 25 Oct 2012 05:48:41 +0000 (22:48 -0700)]
am b02771ef: Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev

* commit 'b02771eff35cccf03202e4b8e27a44681a5f7570':
  Reduce jank in security lock selection by finishing on return

11 years agoMerge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev
Amith Yamasani [Thu, 25 Oct 2012 05:47:17 +0000 (22:47 -0700)]
Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev

11 years agoWording change for Daydream setting
Daniel Sandler [Thu, 25 Oct 2012 03:34:28 +0000 (23:34 -0400)]
Wording change for Daydream setting

Bug: 7410881
Change-Id: I5970254f2ffc33ab34fa61c08acaf1564e2556ca

11 years agoMerge "Adding ability to add multiple keyguard widgets" into jb-mr1-lockscreen-dev
Michael Jurka [Thu, 25 Oct 2012 01:28:27 +0000 (18:28 -0700)]
Merge "Adding ability to add multiple keyguard widgets" into jb-mr1-lockscreen-dev

11 years agoAdding ability to add multiple keyguard widgets
Michael Jurka [Wed, 24 Oct 2012 19:26:41 +0000 (12:26 -0700)]
Adding ability to add multiple keyguard widgets

Bug: 7381803

Change-Id: I099f47a5cc43199635fed9ad2c4d03d79004e4f4

11 years agoam b8a97822: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 25 Oct 2012 00:33:28 +0000 (17:33 -0700)]
am b8a97822: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
Baligh Uddin [Thu, 25 Oct 2012 00:32:33 +0000 (17:32 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 25 Oct 2012 00:31:11 +0000 (17:31 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 24 Oct 2012 23:57:17 +0000 (16:57 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Oct 2012 23:19:55 +0000 (16:19 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Oct 2012 23:15:53 +0000 (16:15 -0700)]
Import translations. DO NOT MERGE

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

11 years agoReduce jank in security lock selection by finishing on return
Amith Yamasani [Wed, 24 Oct 2012 17:27:05 +0000 (10:27 -0700)]
Reduce jank in security lock selection by finishing on return

Earlier the finish of the chooser was happening before the pattern/pin chooser
was started, resulting in two transitions.

This change defers the finish to after returning from the other activity. There
is still sometimes a very small glitch on the way back, but much smaller than
the current problem.

Bug: 7342594

Change-Id: I5f4f4393b841ce31dc7236074381283155ebddbd

11 years agoam 5749ce09: Merge "Use given name instead of full name for the initial population...
Amith Yamasani [Wed, 24 Oct 2012 20:29:28 +0000 (13:29 -0700)]
am 5749ce09: Merge "Use given name instead of full name for the initial population of User name." into jb-mr1-dev

* commit '5749ce0903cad3160a5cf907af3a9a4cbc4b1d4e':
  Use given name instead of full name for the initial population of User name.

11 years agoMerge "Use given name instead of full name for the initial population of User name...
Amith Yamasani [Wed, 24 Oct 2012 20:26:38 +0000 (13:26 -0700)]
Merge "Use given name instead of full name for the initial population of User name." into jb-mr1-dev

11 years agoUse given name instead of full name for the initial population of User name.
Amith Yamasani [Tue, 23 Oct 2012 22:36:16 +0000 (15:36 -0700)]
Use given name instead of full name for the initial population of User name.

Bug: 7406217

Change-Id: I5006039ef146369f569445d0fcbaf82fd163343e

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 23 Oct 2012 23:47:32 +0000 (16:47 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoRemove blank translation string from en-GB, so it can show English.
Baligh Uddin [Tue, 23 Oct 2012 20:25:55 +0000 (13:25 -0700)]
Remove blank translation string from en-GB, so it can show English.

Change-Id: I124abc4113f38b8fbd3ff164af5f0d47970f5471

11 years agoManually enter translations for msgid: 9014073093293520112
Baligh Uddin [Mon, 22 Oct 2012 21:42:21 +0000 (14:42 -0700)]
Manually enter translations for msgid: 9014073093293520112

Per discussion with Maarten / pbrady, enter empty string for
untranslated languages.

Bug: 7383934
Change-Id: I0faa661820e1cb39603327f8d7d748535249e75d

Conflicts:

res/values-af/strings.xml
res/values-am/strings.xml
res/values-ar/strings.xml
res/values-be/strings.xml
res/values-bg/strings.xml
res/values-ca/strings.xml
res/values-cs/strings.xml
res/values-da/strings.xml
res/values-de/strings.xml
res/values-el/strings.xml
res/values-en-rGB/strings.xml
res/values-es-rUS/strings.xml
res/values-es/strings.xml
res/values-et/strings.xml
res/values-fa/strings.xml
res/values-fi/strings.xml
res/values-fr/strings.xml
res/values-hi/strings.xml
res/values-hr/strings.xml
res/values-hu/strings.xml
res/values-in/strings.xml
res/values-it/strings.xml
res/values-iw/strings.xml
res/values-ja/strings.xml
res/values-ko/strings.xml
res/values-lt/strings.xml
res/values-lv/strings.xml
res/values-ms/strings.xml
res/values-nb/strings.xml
res/values-nl/strings.xml
res/values-pl/strings.xml
res/values-pt-rPT/strings.xml
res/values-pt/strings.xml
res/values-rm/strings.xml
res/values-ro/strings.xml
res/values-ru/strings.xml
res/values-sk/strings.xml
res/values-sl/strings.xml
res/values-sr/strings.xml
res/values-sv/strings.xml
res/values-sw/strings.xml
res/values-th/strings.xml
res/values-tl/strings.xml
res/values-tr/strings.xml
res/values-uk/strings.xml
res/values-vi/strings.xml
res/values-zh-rCN/strings.xml
res/values-zh-rTW/strings.xml
res/values-zu/strings.xml

11 years agoFix layout with no access points
Russell Brenner [Tue, 23 Oct 2012 17:45:03 +0000 (10:45 -0700)]
Fix layout with no access points

The "Searching for Wi-Fi" message was filling it's view parent,
pushing the "Other network..." option and Skip button out of view.

Bug: 7335738
Change-Id: I6fd1ceff67e04385c6e325ec4bb8a2e30f38c924

11 years agoam e508a26e: Remove blank translation string from en-GB, so it can show English.
Baligh Uddin [Tue, 23 Oct 2012 22:17:59 +0000 (15:17 -0700)]
am e508a26e: Remove blank translation string from en-GB, so it can show English.

* commit 'e508a26e037c1b0a813575f1154da0ede7644979':
  Remove blank translation string from en-GB, so it can show English.