Joe Onorato 8a5f10b30d resolved conflicts for merge of f7b79151 to master ...

Change-Id: Ia4538f73d8bade9e6565835d484dcb650830feca

2010-06-09 15:07:16 -07:00

..

AccountUnlockScreen.java

Manual integration of I32a7b5 from froyo

2010-05-06 16:31:34 -07:00

GlobalActions.java

Use new vibrate icon in power menu.

2010-03-05 09:34:52 -05:00

IconUtilities.java

Redo the look of the recent apps switcher.

2010-04-05 16:16:40 -05:00

KeyguardScreen.java

auto import from //depot/cupcake/@135843

2009-03-03 19:32:13 -08:00

KeyguardScreenCallback.java

Fix 2428368: Fix most of the lockscreen orientation refresh bugs

2010-03-12 17:35:59 -08:00

KeyguardUpdateMonitor.java

Fix 2428368: Fix most of the lockscreen orientation refresh bugs

2010-03-12 17:35:59 -08:00

KeyguardViewBase.java

Fix typos

2009-05-12 14:15:17 -07:00

KeyguardViewCallback.java

auto import from //depot/cupcake/@135843

2009-03-03 19:32:13 -08:00

KeyguardViewManager.java

Deprecate fill_parent and introduce match_parent.

2010-01-08 15:06:37 -08:00

KeyguardViewMediator.java

The status bar draws its icons now.

2010-06-02 14:48:41 -07:00

KeyguardViewProperties.java

auto import from //depot/cupcake/@135843

2009-03-03 19:32:13 -08:00

KeyguardWindowController.java

auto import from //depot/cupcake/@135843

2009-03-03 19:32:13 -08:00

LockPatternKeyguardView.java

Fix 2677197: Adding minimum complex character support.

2010-05-27 15:27:06 -07:00

LockPatternKeyguardViewProperties.java

Fix 2332563: Add password-lock support to lockscreen

2010-01-11 15:51:43 -08:00

LockScreen.java

Lockscreen improvements from froyo.

2010-04-15 11:37:05 -04:00

package.html

auto import from //depot/cupcake/@135843

2009-03-03 19:32:13 -08:00

PasswordUnlockScreen.java

Fix 2571872: Showing an error message on wrong password/pin entered.

2010-06-01 17:00:47 -07:00

PatternUnlockScreen.java

Policy part of fixing issue #2519590: Lock screen stuck in landscape mode

2010-03-18 01:12:42 -07:00

PhoneLayoutInflater.java

auto import from //depot/cupcake/@135843

2009-03-03 19:32:13 -08:00

PhoneWindow.java

Add Fragment option menu APIs.

2010-06-09 12:26:29 -07:00

PhoneWindowManager.java

Require the STATUS_BAR_SERVICE permission for something to be the status bar.

2010-06-09 14:33:23 -07:00

Policy.java

auto import from //depot/cupcake/@135843

2009-03-03 19:32:13 -08:00

PowerDialog.java

eclair snapshot

2009-11-12 18:46:07 -08:00

RecentApplicationsBackground.java

Redo the look of the recent apps switcher.

2010-04-05 16:16:40 -05:00

RecentApplicationsDialog.java

Integrate a bunch of stuff from Froyo:

2010-04-29 16:50:14 -07:00

ShortcutManager.java

auto import from //depot/cupcake/@135843

2009-03-03 19:32:13 -08:00

SimUnlockScreen.java

Policy part of fixing issue #2519590: Lock screen stuck in landscape mode

2010-03-18 01:12:42 -07:00