diff options
158 files changed, 1591 insertions, 848 deletions
diff --git a/core/java/android/hardware/LegacySensorManager.java b/core/java/android/hardware/LegacySensorManager.java index 62c194f0005d..f95909385fb9 100644 --- a/core/java/android/hardware/LegacySensorManager.java +++ b/core/java/android/hardware/LegacySensorManager.java @@ -371,7 +371,7 @@ final class LegacySensorManager { private static final float PREDICTION_RATIO = 1.0f/3.0f; private static final float PREDICTION_TIME = (SENSORS_RATE_MS*COUNT/1000.0f)*PREDICTION_RATIO; private float mV[] = new float[COUNT*2]; - private float mT[] = new float[COUNT*2]; + private long mT[] = new long[COUNT*2]; private int mIndex; public LmsFilter() { @@ -381,7 +381,6 @@ final class LegacySensorManager { public float filter(long time, float in) { float v = in; final float ns = 1.0f / 1000000000.0f; - final float t = time*ns; float v1 = mV[mIndex]; if ((v-v1) > 180) { v -= 360; @@ -396,9 +395,9 @@ final class LegacySensorManager { if (mIndex >= COUNT*2) mIndex = COUNT; mV[mIndex] = v; - mT[mIndex] = t; + mT[mIndex] = time; mV[mIndex-COUNT] = v; - mT[mIndex-COUNT] = t; + mT[mIndex-COUNT] = time; float A, B, C, D, E; float a, b; @@ -408,8 +407,8 @@ final class LegacySensorManager { for (i=0 ; i<COUNT-1 ; i++) { final int j = mIndex - 1 - i; final float Z = mV[j]; - final float T = 0.5f*(mT[j] + mT[j+1]) - t; - float dT = mT[j] - mT[j+1]; + final float T = (mT[j]/2 + mT[j+1]/2 - time)*ns; + float dT = (mT[j] - mT[j+1])*ns; dT *= dT; A += Z*dT; B += T*(T*dT); diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java index c08bfeb17d54..e50c94813a74 100644 --- a/core/java/android/os/Debug.java +++ b/core/java/android/os/Debug.java @@ -1363,6 +1363,23 @@ href="{@docRoot}guide/developing/tools/traceview.html">Traceview: A Graphical Lo } /** + * Like {@link #getCallers(int)}, but each location is append to the string + * as a new line with <var>linePrefix</var> in front of it. + * @param depth the number of levels to return, starting with the immediate caller. + * @param linePrefix prefix to put in front of each location. + * @return a string describing the call stack. + * {@hide} + */ + public static String getCallers(final int depth, String linePrefix) { + final StackTraceElement[] callStack = Thread.currentThread().getStackTrace(); + StringBuffer sb = new StringBuffer(); + for (int i = 0; i < depth; i++) { + sb.append(linePrefix).append(getCaller(callStack, i)).append("\n"); + } + return sb.toString(); + } + + /** * @return a String describing the immediate caller of the calling function. * {@hide} */ diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 23c12f6f57c5..f482335721ff 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -3216,20 +3216,27 @@ public final class Settings { /** - * This preference contains the string that shows for owner info on LockScren. + * This preference contains the string that shows for owner info on LockScreen. * @hide */ public static final String LOCK_SCREEN_OWNER_INFO = "lock_screen_owner_info"; /** - * Id of the user-selected appwidget on the lockscreen, or -1 if none + * Ids of the user-selected appwidgets on the lockscreen (comma-delimited). * @hide */ public static final String LOCK_SCREEN_APPWIDGET_IDS = "lock_screen_appwidget_ids"; /** - * This preference enables showing the owner info on LockScren. + * Index of the lockscreen appwidget to restore, -1 if none. + * @hide + */ + public static final String LOCK_SCREEN_STICKY_APPWIDGET = + "lock_screen_sticky_appwidget"; + + /** + * This preference enables showing the owner info on LockScreen. * @hide */ public static final String LOCK_SCREEN_OWNER_INFO_ENABLED = diff --git a/core/java/android/server/search/SearchManagerService.java b/core/java/android/server/search/SearchManagerService.java index affeb9005018..4a2137461801 100644 --- a/core/java/android/server/search/SearchManagerService.java +++ b/core/java/android/server/search/SearchManagerService.java @@ -74,7 +74,7 @@ public class SearchManagerService extends ISearchManager.Stub { mContext = context; mContext.registerReceiver(new BootCompletedReceiver(), new IntentFilter(Intent.ACTION_BOOT_COMPLETED)); - mContext.registerReceiver(new UserReceiver(), + mContext.registerReceiver(new UserReceiver(), new IntentFilter(Intent.ACTION_USER_REMOVED)); new MyPackageMonitor().register(context, null, UserHandle.ALL, true); } @@ -161,7 +161,8 @@ public class SearchManagerService extends ISearchManager.Stub { } // Inform all listeners that the list of searchables has been updated. Intent intent = new Intent(SearchManager.INTENT_ACTION_SEARCHABLES_CHANGED); - intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING); + intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING + | Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT); mContext.sendBroadcastAsUser(intent, new UserHandle(changingUserId)); } } diff --git a/core/java/com/android/internal/policy/IFaceLockInterface.aidl b/core/java/com/android/internal/policy/IFaceLockInterface.aidl index 017801bbf886..a017722439d4 100644 --- a/core/java/com/android/internal/policy/IFaceLockInterface.aidl +++ b/core/java/com/android/internal/policy/IFaceLockInterface.aidl @@ -23,6 +23,7 @@ interface IFaceLockInterface { void startUi(IBinder containingWindowToken, int x, int y, int width, int height, boolean useLiveliness); void stopUi(); + void makeInvisible(); void registerCallback(IFaceLockCallback cb); void unregisterCallback(IFaceLockCallback cb); } diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java index f6ae83ca19af..f8c3b4deb4ef 100644 --- a/core/java/com/android/internal/widget/LockPatternUtils.java +++ b/core/java/com/android/internal/widget/LockPatternUtils.java @@ -150,7 +150,6 @@ public class LockPatternUtils { private final ContentResolver mContentResolver; private DevicePolicyManager mDevicePolicyManager; private ILockSettings mLockSettingsService; - private int mStickyWidgetIndex = -1; // The current user is set by KeyguardViewMediator and shared by all LockPatternUtils. private static volatile int sCurrentUserId = UserHandle.USER_NULL; @@ -1162,6 +1161,21 @@ public class LockPatternUtils { return true; } + public int getStickyAppWidgetIndex() { + return Settings.Secure.getIntForUser( + mContentResolver, + Settings.Secure.LOCK_SCREEN_STICKY_APPWIDGET, + -1, + UserHandle.USER_CURRENT); + } + + public void setStickyAppWidgetIndex(int value) { + Settings.Secure.putIntForUser(mContentResolver, + Settings.Secure.LOCK_SCREEN_STICKY_APPWIDGET, + value, + UserHandle.USER_CURRENT); + } + private long getLong(String secureSettingKey, long defaultValue) { try { return getLockSettings().getLong(secureSettingKey, defaultValue, @@ -1311,12 +1325,4 @@ public class LockPatternUtils { return getBoolean(LOCKSCREEN_POWER_BUTTON_INSTANTLY_LOCKS, true); } - public int getStickyWidgetIndex() { - return mStickyWidgetIndex; - } - - public void setStickyWidgetIndex(int stickyWidgetIndex) { - mStickyWidgetIndex = stickyWidgetIndex; - } - } diff --git a/core/java/com/android/internal/widget/multiwaveview/GlowPadView.java b/core/java/com/android/internal/widget/multiwaveview/GlowPadView.java index b7f64ece50bd..209bd3cb1424 100644 --- a/core/java/com/android/internal/widget/multiwaveview/GlowPadView.java +++ b/core/java/com/android/internal/widget/multiwaveview/GlowPadView.java @@ -116,6 +116,8 @@ public class GlowPadView extends View { private float mOuterRadius = 0.0f; private float mSnapMargin = 0.0f; + private float mFirstItemOffset = 0.0f; + private boolean mMagneticTargets = false; private boolean mDragging; private int mNewTargetResources; @@ -212,6 +214,9 @@ public class GlowPadView extends View { mInnerRadius = a.getDimension(R.styleable.GlowPadView_innerRadius, mInnerRadius); mOuterRadius = a.getDimension(R.styleable.GlowPadView_outerRadius, mOuterRadius); mSnapMargin = a.getDimension(R.styleable.GlowPadView_snapMargin, mSnapMargin); + mFirstItemOffset = (float) Math.toRadians( + a.getFloat(R.styleable.GlowPadView_firstItemOffset, + (float) Math.toDegrees(mFirstItemOffset))); mVibrationDuration = a.getInt(R.styleable.GlowPadView_vibrationDuration, mVibrationDuration); mFeedbackCount = a.getInt(R.styleable.GlowPadView_feedbackCount, @@ -223,6 +228,7 @@ public class GlowPadView extends View { getResourceId(a, R.styleable.GlowPadView_outerRingDrawable)); mAlwaysTrackFinger = a.getBoolean(R.styleable.GlowPadView_alwaysTrackFinger, false); + mMagneticTargets = a.getBoolean(R.styleable.GlowPadView_magneticTargets, mMagneticTargets); int pointId = getResourceId(a, R.styleable.GlowPadView_pointDrawable); Drawable pointDrawable = pointId != 0 ? res.getDrawable(pointId) : null; @@ -820,6 +826,7 @@ public class GlowPadView extends View { int ntargets = targets.size(); float x = 0.0f; float y = 0.0f; + float activeAngle = 0.0f; int actionIndex = event.findPointerIndex(mPointerId); if (actionIndex == -1) { @@ -852,15 +859,18 @@ public class GlowPadView extends View { for (int i = 0; i < ntargets; i++) { TargetDrawable target = targets.get(i); - double targetMinRad = (i - 0.5) * 2 * Math.PI / ntargets; - double targetMaxRad = (i + 0.5) * 2 * Math.PI / ntargets; + double targetMinRad = mFirstItemOffset + (i - 0.5) * 2 * Math.PI / ntargets; + double targetMaxRad = mFirstItemOffset + (i + 0.5) * 2 * Math.PI / ntargets; if (target.isEnabled()) { boolean angleMatches = (angleRad > targetMinRad && angleRad <= targetMaxRad) || (angleRad + 2 * Math.PI > targetMinRad && - angleRad + 2 * Math.PI <= targetMaxRad); + angleRad + 2 * Math.PI <= targetMaxRad) || + (angleRad - 2 * Math.PI > targetMinRad && + angleRad - 2 * Math.PI <= targetMaxRad); if (angleMatches && (dist2(tx, ty) > snapDistance2)) { activeTarget = i; + activeAngle = (float) -angleRad; } } } @@ -888,6 +898,9 @@ public class GlowPadView extends View { if (target.hasState(TargetDrawable.STATE_FOCUSED)) { target.setState(TargetDrawable.STATE_INACTIVE); } + if (mMagneticTargets) { + updateTargetPosition(mActiveTarget, mWaveCenterX, mWaveCenterY); + } } // Focus the new target if (activeTarget != -1) { @@ -895,6 +908,9 @@ public class GlowPadView extends View { if (target.hasState(TargetDrawable.STATE_FOCUSED)) { target.setState(TargetDrawable.STATE_FOCUSED); } + if (mMagneticTargets) { + updateTargetPosition(activeTarget, mWaveCenterX, mWaveCenterY, activeAngle); + } if (AccessibilityManager.getInstance(mContext).isEnabled()) { String targetContentDescription = getTargetDescription(activeTarget); announceForAccessibility(targetContentDescription); @@ -1039,14 +1055,15 @@ public class GlowPadView extends View { if (DEBUG) dump(); } - private void updateTargetPositions(float centerX, float centerY) { - // Reposition the target drawables if the view changed. - ArrayList<TargetDrawable> targets = mTargetDrawables; - final int size = targets.size(); - final float alpha = (float) (-2.0f * Math.PI / size); - for (int i = 0; i < size; i++) { + private void updateTargetPosition(int i, float centerX, float centerY) { + final float angle = getAngle(getSliceAngle(), i); + updateTargetPosition(i, centerX, centerY, angle); + } + + private void updateTargetPosition(int i, float centerX, float centerY, float angle) { + if (i >= 0) { + ArrayList<TargetDrawable> targets = mTargetDrawables; final TargetDrawable targetIcon = targets.get(i); - final float angle = alpha * i; targetIcon.setPositionX(centerX); targetIcon.setPositionY(centerY); targetIcon.setX(mOuterRadius * (float) Math.cos(angle)); @@ -1054,6 +1071,29 @@ public class GlowPadView extends View { } } + private void updateTargetPositions(float centerX, float centerY) { + updateTargetPositions(centerX, centerY, false); + } + + private void updateTargetPositions(float centerX, float centerY, boolean skipActive) { + final int size = mTargetDrawables.size(); + final float alpha = getSliceAngle(); + // Reposition the target drawables if the view changed. + for (int i = 0; i < size; i++) { + if (!skipActive || i != mActiveTarget) { + updateTargetPosition(i, centerX, centerY, getAngle(alpha, i)); + } + } + } + + private float getAngle(float alpha, int i) { + return mFirstItemOffset + alpha * i; + } + + private float getSliceAngle() { + return (float) (-2.0f * Math.PI / mTargetDrawables.size()); + } + private void updatePointCloudPosition(float centerX, float centerY) { mPointCloud.setCenter(centerX, centerY); } diff --git a/core/res/res/drawable-hdpi/add_widget.png b/core/res/res/drawable-hdpi/add_widget.png Binary files differdeleted file mode 100644 index fb64a52b08e8..000000000000 --- a/core/res/res/drawable-hdpi/add_widget.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/kg_add_widget.png b/core/res/res/drawable-hdpi/kg_add_widget.png Binary files differnew file mode 100644 index 000000000000..7456705b402f --- /dev/null +++ b/core/res/res/drawable-hdpi/kg_add_widget.png diff --git a/core/res/res/drawable-hdpi/kg_bouncer_bg_white.9.png b/core/res/res/drawable-hdpi/kg_bouncer_bg_white.9.png Binary files differindex c34fe207fcae..cfd5db357dc4 100644 --- a/core/res/res/drawable-hdpi/kg_bouncer_bg_white.9.png +++ b/core/res/res/drawable-hdpi/kg_bouncer_bg_white.9.png diff --git a/core/res/res/drawable-hdpi/kg_security_grip.9.png b/core/res/res/drawable-hdpi/kg_security_grip.9.png Binary files differindex fb1c86655b5f..1e40aef33699 100644 --- a/core/res/res/drawable-hdpi/kg_security_grip.9.png +++ b/core/res/res/drawable-hdpi/kg_security_grip.9.png diff --git a/core/res/res/drawable-hdpi/kg_security_lock.png b/core/res/res/drawable-hdpi/kg_security_lock.png Binary files differindex 136d3adfa80d..c3c94c464bf8 100644 --- a/core/res/res/drawable-hdpi/kg_security_lock.png +++ b/core/res/res/drawable-hdpi/kg_security_lock.png diff --git a/core/res/res/drawable-hdpi/security_frame.9.png b/core/res/res/drawable-hdpi/security_frame.9.png Binary files differdeleted file mode 100644 index 9eeadc4d118f..000000000000 --- a/core/res/res/drawable-hdpi/security_frame.9.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/security_handle.png b/core/res/res/drawable-hdpi/security_handle.png Binary files differdeleted file mode 100644 index bd4640f7228c..000000000000 --- a/core/res/res/drawable-hdpi/security_handle.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/add_widget.png b/core/res/res/drawable-mdpi/add_widget.png Binary files differdeleted file mode 100644 index ae2678770678..000000000000 --- a/core/res/res/drawable-mdpi/add_widget.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/kg_add_widget.png b/core/res/res/drawable-mdpi/kg_add_widget.png Binary files differnew file mode 100644 index 000000000000..1cab0d9328fb --- /dev/null +++ b/core/res/res/drawable-mdpi/kg_add_widget.png diff --git a/core/res/res/drawable-mdpi/kg_bouncer_bg_white.9.png b/core/res/res/drawable-mdpi/kg_bouncer_bg_white.9.png Binary files differindex f63652429be7..e3cb6db09736 100644 --- a/core/res/res/drawable-mdpi/kg_bouncer_bg_white.9.png +++ b/core/res/res/drawable-mdpi/kg_bouncer_bg_white.9.png diff --git a/core/res/res/drawable-mdpi/kg_security_grip.9.png b/core/res/res/drawable-mdpi/kg_security_grip.9.png Binary files differindex 25beb2b08ef2..334a39b5c9a2 100644 --- a/core/res/res/drawable-mdpi/kg_security_grip.9.png +++ b/core/res/res/drawable-mdpi/kg_security_grip.9.png diff --git a/core/res/res/drawable-mdpi/kg_security_lock.png b/core/res/res/drawable-mdpi/kg_security_lock.png Binary files differindex 861760da8d1b..a39f38002e5d 100644 --- a/core/res/res/drawable-mdpi/kg_security_lock.png +++ b/core/res/res/drawable-mdpi/kg_security_lock.png diff --git a/core/res/res/drawable-mdpi/security_frame.9.png b/core/res/res/drawable-mdpi/security_frame.9.png Binary files differdeleted file mode 100644 index 9eeadc4d118f..000000000000 --- a/core/res/res/drawable-mdpi/security_frame.9.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/security_handle.png b/core/res/res/drawable-mdpi/security_handle.png Binary files differdeleted file mode 100644 index bd4640f7228c..000000000000 --- a/core/res/res/drawable-mdpi/security_handle.png +++ /dev/null diff --git a/core/res/res/drawable-xhdpi/add_widget.png b/core/res/res/drawable-xhdpi/add_widget.png Binary files differdeleted file mode 100644 index c02700cb519d..000000000000 --- a/core/res/res/drawable-xhdpi/add_widget.png +++ /dev/null diff --git a/core/res/res/drawable-xhdpi/kg_add_widget.png b/core/res/res/drawable-xhdpi/kg_add_widget.png Binary files differnew file mode 100644 index 000000000000..d71905f8ff78 --- /dev/null +++ b/core/res/res/drawable-xhdpi/kg_add_widget.png diff --git a/core/res/res/drawable-xhdpi/kg_bouncer_bg_white.9.png b/core/res/res/drawable-xhdpi/kg_bouncer_bg_white.9.png Binary files differindex 9c4a603f6756..b9e30e20a952 100644 --- a/core/res/res/drawable-xhdpi/kg_bouncer_bg_white.9.png +++ b/core/res/res/drawable-xhdpi/kg_bouncer_bg_white.9.png diff --git a/core/res/res/drawable-xhdpi/kg_security_grip.9.png b/core/res/res/drawable-xhdpi/kg_security_grip.9.png Binary files differindex b5cd13425cec..c33b9d3471bc 100644 --- a/core/res/res/drawable-xhdpi/kg_security_grip.9.png +++ b/core/res/res/drawable-xhdpi/kg_security_grip.9.png diff --git a/core/res/res/drawable-xhdpi/kg_security_lock.png b/core/res/res/drawable-xhdpi/kg_security_lock.png Binary files differindex 45445845d015..81d577e328d6 100644 --- a/core/res/res/drawable-xhdpi/kg_security_lock.png +++ b/core/res/res/drawable-xhdpi/kg_security_lock.png diff --git a/core/res/res/drawable-xhdpi/security_frame.9.png b/core/res/res/drawable-xhdpi/security_frame.9.png Binary files differdeleted file mode 100644 index 9eeadc4d118f..000000000000 --- a/core/res/res/drawable-xhdpi/security_frame.9.png +++ /dev/null diff --git a/core/res/res/drawable-xhdpi/security_handle.png b/core/res/res/drawable-xhdpi/security_handle.png Binary files differdeleted file mode 100644 index bd4640f7228c..000000000000 --- a/core/res/res/drawable-xhdpi/security_handle.png +++ /dev/null diff --git a/core/res/res/layout-land/keyguard_widget_pager.xml b/core/res/res/layout-land/keyguard_widget_pager.xml index 8b7b9a3fabcc..975288fa4cc2 100644 --- a/core/res/res/layout-land/keyguard_widget_pager.xml +++ b/core/res/res/layout-land/keyguard_widget_pager.xml @@ -28,4 +28,4 @@ android:clipChildren="false" android:clipToPadding="false" androidprv:pageSpacing="10dp"> -</com.android.internal.policy.impl.keyguard.KeyguardWidgetCarousel> +</com.android.internal.policy.impl.keyguard.KeyguardWidgetCarousel>
\ No newline at end of file diff --git a/core/res/res/layout-port/keyguard_host_view.xml b/core/res/res/layout-port/keyguard_host_view.xml index 15e984443092..ed55e61ce5b2 100644 --- a/core/res/res/layout-port/keyguard_host_view.xml +++ b/core/res/res/layout-port/keyguard_host_view.xml @@ -32,7 +32,6 @@ android:id="@+id/sliding_layout" android:layout_width="match_parent" android:layout_height="match_parent" - androidprv:dragHandle="@drawable/kg_security_grip" androidprv:dragIcon="@drawable/kg_security_lock"> <FrameLayout @@ -68,7 +67,6 @@ android:paddingLeft="@dimen/keyguard_security_view_margin" android:paddingTop="@dimen/keyguard_security_view_margin" android:paddingRight="@dimen/keyguard_security_view_margin" - android:paddingBottom="@dimen/keyguard_security_view_margin" android:gravity="center"> </com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper> </com.android.internal.policy.impl.keyguard.KeyguardSecurityContainer> diff --git a/core/res/res/layout-port/keyguard_widget_pager.xml b/core/res/res/layout-port/keyguard_widget_pager.xml index 6662f83ce62b..3b29db8516e6 100644 --- a/core/res/res/layout-port/keyguard_widget_pager.xml +++ b/core/res/res/layout-port/keyguard_widget_pager.xml @@ -25,7 +25,7 @@ android:paddingLeft="25dp" android:paddingRight="25dp" android:paddingTop="25dp" - android:paddingBottom="25dp" + android:paddingBottom="64dp" android:clipChildren="false" android:clipToPadding="false" androidprv:pageSpacing="10dp"> diff --git a/core/res/res/layout/keyguard_account_view.xml b/core/res/res/layout/keyguard_account_view.xml index d1f9225ece83..78adfe754917 100644 --- a/core/res/res/layout/keyguard_account_view.xml +++ b/core/res/res/layout/keyguard_account_view.xml @@ -23,7 +23,9 @@ android:layout_height="match_parent" android:orientation="vertical"> - <include layout="@layout/keyguard_sim_puk_pin_account_navigation"/> + <include layout="@layout/keyguard_message_area" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> <RelativeLayout android:layout_width="match_parent" diff --git a/core/res/res/layout/keyguard_add_widget.xml b/core/res/res/layout/keyguard_add_widget.xml index fa811d7bc9db..fd5e565faa0f 100644 --- a/core/res/res/layout/keyguard_add_widget.xml +++ b/core/res/res/layout/keyguard_add_widget.xml @@ -35,6 +35,6 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:padding="24dp" - android:src="@drawable/add_widget" /> + android:src="@drawable/kg_add_widget" /> </FrameLayout> -</com.android.internal.policy.impl.keyguard.KeyguardWidgetFrame>
\ No newline at end of file +</com.android.internal.policy.impl.keyguard.KeyguardWidgetFrame> diff --git a/core/res/res/layout/keyguard_emergency_carrier_area.xml b/core/res/res/layout/keyguard_emergency_carrier_area.xml index f9a593fd5038..655b77dbf718 100644 --- a/core/res/res/layout/keyguard_emergency_carrier_area.xml +++ b/core/res/res/layout/keyguard_emergency_carrier_area.xml @@ -36,16 +36,39 @@ android:textSize="@dimen/kg_status_line_font_size" android:textColor="?android:attr/textColorSecondary"/> - <com.android.internal.policy.impl.keyguard.EmergencyButton - android:id="@+id/emergency_call_button" - android:layout_width="wrap_content" + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:drawableLeft="@*android:drawable/lockscreen_emergency_button" - android:text="@string/kg_emergency_call_label" - style="?android:attr/buttonBarButtonStyle" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="@dimen/kg_status_line_font_size" - android:textColor="?android:attr/textColorSecondary" - android:drawablePadding="8dip" /> + android:layout_marginTop="-10dip" + style="?android:attr/buttonBarStyle" + android:orientation="horizontal" + android:gravity="center" + android:weightSum="2"> + + <com.android.internal.policy.impl.keyguard.EmergencyButton + android:id="@+id/emergency_call_button" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:drawableLeft="@*android:drawable/lockscreen_emergency_button" + android:text="@string/kg_emergency_call_label" + style="?android:attr/buttonBarButtonStyle" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textSize="@dimen/kg_status_line_font_size" + android:textColor="?android:attr/textColorSecondary" + android:drawablePadding="8dip" /> + + <Button android:id="@+id/forgot_password_button" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:drawableLeft="@*android:drawable/lockscreen_forgot_password_button" + style="?android:attr/buttonBarButtonStyle" + android:textSize="@dimen/kg_status_line_font_size" + android:textColor="?android:attr/textColorSecondary" + android:textAppearance="?android:attr/textAppearanceMedium" + android:drawablePadding="8dip" + android:visibility="gone"/> + </LinearLayout> </LinearLayout> diff --git a/core/res/res/layout/keyguard_emergency_carrier_area_and_recovery.xml b/core/res/res/layout/keyguard_emergency_carrier_area_and_recovery.xml deleted file mode 100644 index eeb4178af956..000000000000 --- a/core/res/res/layout/keyguard_emergency_carrier_area_and_recovery.xml +++ /dev/null @@ -1,73 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -** -** Copyright 2012, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License") -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> - -<!-- This contains emergency call button and carrier as shared by pin/pattern/password screens --> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:gravity="center" - android:layout_gravity="center_horizontal" - android:layout_alignParentBottom="true"> - - <com.android.internal.policy.impl.keyguard.CarrierText - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:singleLine="true" - android:ellipsize="marquee" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="@dimen/kg_status_line_font_size" - android:textColor="?android:attr/textColorSecondary"/> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - style="?android:attr/buttonBarStyle" - android:orientation="horizontal" - android:gravity="center" - android:weightSum="2"> - - <com.android.internal.policy.impl.keyguard.EmergencyButton - android:id="@+id/emergency_call_button" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:drawableLeft="@*android:drawable/lockscreen_emergency_button" - android:text="@string/kg_emergency_call_label" - style="?android:attr/buttonBarButtonStyle" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="@dimen/kg_status_line_font_size" - android:textColor="?android:attr/textColorSecondary" - android:drawablePadding="8dip" /> - - <Button android:id="@+id/forgot_password_button" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:drawableLeft="@*android:drawable/lockscreen_forgot_password_button" - style="?android:attr/buttonBarButtonStyle" - android:textSize="@dimen/kg_status_line_font_size" - android:textColor="?android:attr/textColorSecondary" - android:textAppearance="?android:attr/textAppearanceMedium" - android:drawablePadding="8dip" - android:visibility="gone"/> - </LinearLayout> - -</LinearLayout> diff --git a/core/res/res/layout/keyguard_face_unlock_view.xml b/core/res/res/layout/keyguard_face_unlock_view.xml index 00f14f5c7290..ae7984c78333 100644 --- a/core/res/res/layout/keyguard_face_unlock_view.xml +++ b/core/res/res/layout/keyguard_face_unlock_view.xml @@ -25,7 +25,10 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <include layout="@layout/keyguard_navigation"/> + <include layout="@layout/keyguard_message_area" + android:layout_width="match_parent" + android:layout_height="wrap_content" + /> <RelativeLayout android:id="@+id/face_unlock_area_view" diff --git a/core/res/res/layout/keyguard_glow_pad_view.xml b/core/res/res/layout/keyguard_glow_pad_view.xml index 509e77b95bb1..a416a777cefd 100644 --- a/core/res/res/layout/keyguard_glow_pad_view.xml +++ b/core/res/res/layout/keyguard_glow_pad_view.xml @@ -29,14 +29,16 @@ android:gravity="@integer/kg_selector_gravity" android:focusable="true" - prvandroid:targetDrawables="@*android:array/lockscreen_targets_with_camera" - prvandroid:targetDescriptions="@*android:array/lockscreen_target_descriptions_with_camera" + prvandroid:targetDrawables="@array/lockscreen_targets_unlock_only" + prvandroid:targetDescriptions="@array/lockscreen_target_descriptions_unlock_only" prvandroid:directionDescriptions="@*android:array/lockscreen_direction_descriptions" prvandroid:handleDrawable="@*android:drawable/ic_lockscreen_handle" prvandroid:outerRingDrawable="@*android:drawable/ic_lockscreen_outerring" prvandroid:outerRadius="@*android:dimen/glowpadview_target_placement_radius" prvandroid:innerRadius="@*android:dimen/glowpadview_inner_radius" prvandroid:snapMargin="@*android:dimen/glowpadview_snap_margin" + prvandroid:firstItemOffset="@integer/kg_glowpad_rotation_offset" + prvandroid:magneticTargets="true" prvandroid:feedbackCount="1" prvandroid:vibrationDuration="20" prvandroid:glowRadius="@*android:dimen/glowpadview_glow_radius" diff --git a/core/res/res/layout/keyguard_navigation.xml b/core/res/res/layout/keyguard_message_area.xml index 8230c523c103..9f11a2c4705f 100644 --- a/core/res/res/layout/keyguard_navigation.xml +++ b/core/res/res/layout/keyguard_message_area.xml @@ -16,6 +16,17 @@ ** limitations under the License. */ --> -<merge xmlns:android="http://schemas.android.com/apk/res/android"> - <include layout="@layout/empty_navigation" /> -</merge> + +<!-- This contains emergency call button and carrier as shared by pin/pattern/password screens --> +<com.android.internal.policy.impl.keyguard.KeyguardMessageArea + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center" + android:id="@+id/keyguard_message_area" + android:singleLine="true" + android:ellipsize="marquee" + android:textAppearance="?android:attr/textAppearance" + android:textSize="@dimen/kg_status_line_font_size" + android:textColor="?android:attr/textColorSecondary" /> + diff --git a/core/res/res/layout/empty_navigation.xml b/core/res/res/layout/keyguard_message_area_large.xml index 642207066b80..584cec4e5a47 100644 --- a/core/res/res/layout/empty_navigation.xml +++ b/core/res/res/layout/keyguard_message_area_large.xml @@ -16,4 +16,16 @@ ** limitations under the License. */ --> -<merge xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file + +<!-- This contains emergency call button and carrier as shared by pin/pattern/password screens --> +<com.android.internal.policy.impl.keyguard.KeyguardMessageArea + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center" + android:id="@+id/keyguard_message_area" + android:maxLines="4" + android:textAppearance="?android:attr/textAppearance" + android:textSize="@dimen/kg_status_line_font_size" + android:textColor="?android:attr/textColorSecondary" /> + diff --git a/core/res/res/layout/keyguard_password_view.xml b/core/res/res/layout/keyguard_password_view.xml index e28f2ac38bba..a184415919f6 100644 --- a/core/res/res/layout/keyguard_password_view.xml +++ b/core/res/res/layout/keyguard_password_view.xml @@ -29,6 +29,11 @@ android:layout_height="0dp" android:layout_weight="1"> + <include layout="@layout/keyguard_message_area" + android:layout_width="match_parent" + android:layout_height="wrap_content" + /> + <LinearLayout android:layout_height="wrap_content" android:layout_width="match_parent" @@ -36,14 +41,6 @@ android:layout_gravity="center"> <LinearLayout - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:orientation="vertical" - android:gravity="center"> - <include layout="@layout/keyguard_navigation"/> - </LinearLayout> - - <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> diff --git a/core/res/res/layout/keyguard_pattern_view.xml b/core/res/res/layout/keyguard_pattern_view.xml index bec03b41173d..0f6256a20ad9 100644 --- a/core/res/res/layout/keyguard_pattern_view.xml +++ b/core/res/res/layout/keyguard_pattern_view.xml @@ -32,14 +32,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + <include layout="@layout/keyguard_message_area" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + <LinearLayout android:layout_height="wrap_content" android:layout_width="wrap_content" android:orientation="vertical" android:layout_gravity="center"> - <include layout="@layout/keyguard_navigation"/> - <!-- We need MATCH_PARENT here only to force the size of the parent to be passed to the pattern view for it to compute its size. This is an unusual case, caused by LockPatternView's requirement to maintain a square aspect ratio based on the width @@ -55,7 +57,7 @@ android:layout_gravity="center_horizontal" android:gravity="center" /> - <include layout="@layout/keyguard_emergency_carrier_area_and_recovery" + <include layout="@layout/keyguard_emergency_carrier_area" android:id="@+id/keyguard_selector_fade_container" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/core/res/res/layout/keyguard_pin_view.xml b/core/res/res/layout/keyguard_pin_view.xml index 9b883afee9b1..d62570b4a857 100644 --- a/core/res/res/layout/keyguard_pin_view.xml +++ b/core/res/res/layout/keyguard_pin_view.xml @@ -25,6 +25,10 @@ android:layout_height="350dp" android:orientation="vertical" > + <include layout="@layout/keyguard_message_area" + android:layout_width="match_parent" + android:layout_height="wrap_content" + /> <LinearLayout android:layout_width="match_parent" android:layout_height="0dp" @@ -186,7 +190,7 @@ /> <ImageButton android:id="@+id/key_enter" - style="@android:style/Widget.Button.NumPadKey" + style="@style/Widget.Button.NumPadKey" android:gravity="center" android:layout_width="0px" android:layout_height="match_parent" @@ -195,7 +199,7 @@ /> </LinearLayout> - <include layout="@layout/keyguard_emergency_carrier_area_and_recovery" + <include layout="@layout/keyguard_emergency_carrier_area" android:id="@+id/keyguard_selector_fade_container" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/core/res/res/layout/keyguard_selector_view.xml b/core/res/res/layout/keyguard_selector_view.xml index daaf35bcdf5e..74034082747c 100644 --- a/core/res/res/layout/keyguard_selector_view.xml +++ b/core/res/res/layout/keyguard_selector_view.xml @@ -36,6 +36,10 @@ android:clipToPadding="false" android:gravity="center"> + <include layout="@layout/keyguard_message_area" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + <include layout="@layout/keyguard_glow_pad_container" /> <include layout="@layout/keyguard_emergency_carrier_area" diff --git a/core/res/res/layout/keyguard_sim_pin_view.xml b/core/res/res/layout/keyguard_sim_pin_view.xml index ae59d1de99ec..ad617091b18d 100644 --- a/core/res/res/layout/keyguard_sim_pin_view.xml +++ b/core/res/res/layout/keyguard_sim_pin_view.xml @@ -43,7 +43,10 @@ android:layout_height="wrap_content" android:src="@drawable/ic_lockscreen_sim"/> - <include layout="@layout/keyguard_sim_puk_pin_account_navigation"/> + <include layout="@layout/keyguard_message_area_large" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + </LinearLayout> <!-- Password entry field --> diff --git a/core/res/res/layout/keyguard_sim_puk_view.xml b/core/res/res/layout/keyguard_sim_puk_view.xml index 414806fb4097..cc97005a6907 100644 --- a/core/res/res/layout/keyguard_sim_puk_view.xml +++ b/core/res/res/layout/keyguard_sim_puk_view.xml @@ -44,7 +44,9 @@ android:layout_height="wrap_content" android:src="@drawable/ic_lockscreen_sim"/> - <include layout="@layout/keyguard_sim_puk_pin_account_navigation"/> + <include layout="@layout/keyguard_message_area_large" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> </LinearLayout> diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index d2a78ee29705..fe77b054ae46 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"Laat die program toe om nuwe woorde in die gebruikerwoordeboek te skryf."</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"toets toegang tot beskermde berging"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"toets toegang tot beskermde berging"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"Laat die program toe om \'n toestemming te toets vir USB-berging wat op toekomstige toestelle beskikbaar sal wees."</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"Laat die program toe om \'n toestemming vir die SD-kaart wat op toekomstige toestelle beskikbaar sal wees, te toets."</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"verander of vee die inhoud van jou USB-berging uit"</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"Verander of vee die inhoud van jou SD-kaart uit"</string> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index 21f01d90ccb0..5bd5f28fdb89 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"للسماح للتطبيق بكتابة كلمات جديدة في قاموس المستخدم."</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"اختبار إمكانية الدخول إلى وحدة تخزين محمية"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"اختبار إمكانية الدخول إلى وحدة تخزين محمية"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"للسماح للتطبيق باختبار إذن لوحدة تخزين USB التي ستتوفر على أجهزة مستقبلية."</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"للسماح للتطبيق باختبار إذن لبطاقة SD سيتم توفيرها على أجهزة مستقبلية."</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"تعديل محتويات وحدة تخزين USB أو حذفها"</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"تعديل محتويات بطاقة SD أو حذفها"</string> diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml index cb4adbf1d2c9..5d7009bdb3f3 100644 --- a/core/res/res/values-be/strings.xml +++ b/core/res/res/values-be/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"Дазваляе прыкладанням запісваць новыя словы ў карыстальніцкі слоўнік."</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"выпрабавальны доступ да абароненага сховiшча"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"выпрабавальны доступ да абароненага сховiшча"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"Дазваляе прыкладанню правяраць дазвол на USB-назапашвальнiк, якi будзе даступны для прылад у будучынi."</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"Дазваляе прыкладанню правяраць дазвол на SD-карту, якая будзе даступна для прылад у будучынi."</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"зм. або выд. змес. USB-назап."</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"змяніць або выдаліць змесціва SD-карты"</string> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index 11dfb9c1174f..df2d08566e77 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"Permet que l\'aplicació escrigui paraules noves al diccionari de l\'usuari."</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"accés de prova a emmagatzematge protegit"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"accés de prova a emmagatzematge protegit"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"Permet que l\'aplicació provi un permís per a emmagatzematge USB que estarà disponible a propers dispositius."</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"Permet que l\'aplicació provi un permís per a la targeta SD que estarà disponible als dispositius en el futur."</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"modificació o supressió del contingut de l\'emmagatzematge USB"</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"modifica o suprimeix el contingut de la targeta SD"</string> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index 3382eb504176..d7af330b8954 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"Umožňuje aplikaci zapisovat nová slova do uživatelského slovníku."</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"testování přístupu do chráněného úložiště"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"testování přístupu do chráněného úložiště"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"Umožňuje aplikaci testovat oprávnění pro úložiště USB, které bude dostupné v budoucích zařízeních."</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"Umožňuje aplikaci testovat oprávnění pro kartu SD, která bude dostupná v budoucích zařízeních."</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"úprava nebo smazání obsahu v úložišti USB"</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"úprava nebo smazání obsahu na kartě SD"</string> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index 22085ed85bc8..0fa14b342f71 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"Ermöglicht der App, dem Nutzerwörterbuch neue Einträge hinzuzufügen"</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"Zugriff auf geschützten Speicher testen"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"Zugriff auf geschützten Speicher testen"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"Ermöglicht der App, eine Berechtigung für USB-Speicher zu testen, die künftig auf neuen Geräten verfügbar sein wird"</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"Ermöglicht der App, eine Berechtigung für SD-Karten zu testen, die künftig auf neuen Geräten verfügbar sein wird"</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"USB-Speicherinhalte ändern oder löschen"</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"SD-Karteninhalte ändern oder löschen"</string> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index cb5421b84731..33899baf7f83 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"Επιτρέπει στην εφαρμογή την εγγραφή νέων λέξεων στο λεξικό χρήστη."</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"δοκιμή πρόσβασης σε προστατευμένο χώρο αποθήκευσης"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"δοκιμή πρόσβασης σε προστατευμένο χώρο αποθήκευσης"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"Επιτρ.στην εφαρμ. τη δοκ.άδειας αποθ. χώρ.USB που θα διατ. σε μελλ.συσκ."</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"Επιτρέπει στην εφαρμογή τη δοκιμή μια άδειας για την κάρτα SD που θα διατίθεται σε μελλοντικές συσκευές."</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"τροπ. ή διαγρ. περιεχ. αποθ. χώρ. USB"</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"τροποποίηση ή διαγραφή των περιεχομένων της κάρτας SD"</string> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index 941ee387622d..1267b14ab5ab 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"Allows the app to write new words into the user dictionary."</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"test access to protected storage"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"test access to protected storage"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"Allows the app to test a permission for USB storage that will be available on future devices."</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"Allows the app to test a permission for the SD card that will be available on future devices."</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"modify or delete the contents of your USB storage"</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"modify or delete the contents of your SD card"</string> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index c45d3895cd4b..3ea30d14bd68 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"Permite que la aplicación escriba palabras nuevas en el diccionario de usuario."</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"probar acceso a almacenamiento protegido"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"probar acceso a almacenamiento protegido"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"Probar permiso USB para futuros dispositivos"</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"Permite que la aplicación pruebe un permiso para la tarjeta SD que estará disponible en futuros dispositivos."</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"editar o borrar contenido de USB"</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"modificar o eliminar el contenido de la tarjeta SD"</string> diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml index 9ac64bc031fa..03fcfbbee8a6 100644 --- a/core/res/res/values-et/strings.xml +++ b/core/res/res/values-et/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"Võimaldab rakendusel kirjutada kasutajasõnastikku uusi sõnu."</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"kaitstud salvestusruumi juurdepääsu katsetamine"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"kaitstud salvestusruumi juurdepääsu katsetamine"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"Võimaldab rakendusel testida luba USB-salvestuseks, mis on saadaval tulevastes seadmetes."</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"Võimaldab rakendusel katsetada SD-kaardi luba, mis on saadaval tulevastel seadmetel."</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"muutke, kustut. USB-ruumi sisu"</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"SD-kaardi sisu muutmine või kustutamine"</string> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index ca94ec3d3849..de1e9a9ef6d5 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"به برنامه اجازه میدهد تا کلمات جدید را در فهرست کاربر بنویسد."</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"تست کردن دسترسی به حافظهٔ محافظتشده"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"تست کردن دسترسی به حافظهٔ محافظتشده"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"به برنامه اجازه میدهد یک مجوز را برای حافظه USB که در دستگاههای آتی ارائه خواهد شد، تست کند."</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"به برنامه اجازه میدهد یک مجوز را برای کارت SD که در دستگاههای آتی موجود خواهد بود تست کند."</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"اصلاح یا حذف محتویات حافظهٔ USB شما"</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"محتوای کارت SD شما را اصلاح کرده یا تغییر دهد"</string> @@ -1426,5 +1425,5 @@ <string name="accessibility_enabled" msgid="1381972048564547685">"قابلیت دسترسی فعال شد."</string> <string name="enable_accessibility_canceled" msgid="3833923257966635673">"قابلیت دسترسی لغو شد."</string> <string name="user_switched" msgid="3768006783166984410">"کاربر کنونی <xliff:g id="NAME">%1$s</xliff:g>."</string> - <string name="owner_name" msgid="2716755460376028154">"مالک"</string> + <string name="owner_name" msgid="2716755460376028154">"دارنده"</string> </resources> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index b33ccf38f352..ec48526bbbc5 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"Antaa sovelluksen kirjoittaa uusia sanoja käyttäjän sanakirjaan."</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"suojatun tallennustilan käyttöoikeuden testaus"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"suojatun tallennustilan käyttöoikeuden testaus"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"Antaa sovelluksen testata tulevien laitteiden USB-tallennustilan käyttölupaa."</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"Antaa sovelluksen testata muiden laitteiden käyttämän SD-kortin käyttölupaa."</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"muokkaa tai poista USB:n sis."</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"muokkaa tai poista SD-kortin sisältöä"</string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index 18671431da3b..912bda059dba 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"Permet à l\'application d\'enregistrer de nouveaux mots dans le dictionnaire personnel de l\'utilisateur."</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"tester l\'accès à la mémoire de stockage protégée"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"tester l\'accès à la mémoire de stockage protégée"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"Permet à l\'application de tester une autorisation pour la mémoire de stockage USB qui sera ensuite proposée sur les futurs appareils."</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"Permet à l\'application de tester une autorisation pour la carte SD qui sera ensuite proposée sur les futurs appareils."</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"modifier ou supprimer le contenu de la mémoire USB"</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"modifier ou supprimer le contenu de la carte SD"</string> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index 377ff327f94a..67148f1bc2fc 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"एप्लिकेशन को उपयोगकर्ता डिक्शनरी में नए शब्द लिखने देता है."</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"संरक्षित संग्रहण पर पहुंच का परीक्षण करें"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"संरक्षित संग्रहण पर पहुंच का परीक्षण करें"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"एप्लि. को USB संग्रहण अनुमति का परीक्षण करने देता है जो भविष्य के उपकरणों में उपलब्ध होगा."</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"एप्लिकेशन को SD कार्ड के लिए किसी अनुमति का परीक्षण करने देता है जो भविष्य के उपकरणों में उपलब्ध होगा."</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"अपने USB संग्रहण की सामग्री बदलें या हटाएं"</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"अपने SD कार्ड की सामग्री बदलें या हटाएं"</string> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index 4e1334c5566b..131445838bf8 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"Aplikaciji omogućuje pisanje novih riječi u korisnički rječnik."</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"testiranje pristupa zaštićenoj pohrani"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"testiranje pristupa zaštićenoj pohrani"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"Aplikaciji omogućuje testiranje dozvole za USB pohranu koja će biti dostupna na budućim uređajima."</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"Aplikaciji omogućuje testiranje dozvole za SD karticu koja će biti dostupna na budućim uređajima."</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"izmjena/brisanje sadrž. USB-a"</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"izmjena ili brisanje sadržaja SD kartice"</string> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index bef035c48a50..6a9e54df6d3e 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"Lehetővé teszi az alkalmazás számára, hogy új szavakat írjon a felhasználói szótárba."</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"védett tárhelyhez való hozzáférés tesztelése"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"védett tárhelyhez való hozzáférés tesztelése"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"Lehetővé teszi az alkalmazás számára egy olyan USB-háttértár engedélyének tesztelését, amely későbbi eszközökön lesz elérhető."</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"Lehetővé teszi az alkalmazás számára egy olyan SD-kártya engedélyének tesztelését, amely későbbi eszközökön lesz elérhető."</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"USB-tár törlése/módosítása"</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"SD-kártya tartalmának módosítása vagy törlése"</string> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index 746944c2f9c9..8822ec19472a 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"Mengizinkan apl menulis kata-kata baru ke dalam kamus pengguna."</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"akses uji coba ke penyimpanan yang dilindungi"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"akses uji coba ke penyimpanan yang dilindungi"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"Memungkinkan aplikasi menguji izin penyimpanan USB yang akan tersedia di perangkat mendatang."</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"Memungkinkan aplikasi menguji izin untuk kartu SD yang akan tersedia pada perangkat yang akan datang."</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"ubah/hapus konten pympanan USB"</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"mengubah atau menghapus konten kartu SD Anda"</string> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index 591b8ad30e7e..214876fe1fff 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"Consente all\'applicazione di scrivere nuove parole nel dizionario utente."</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"test dell\'accesso all\'archivio protetto"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"test dell\'accesso all\'archivio protetto"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"Consente all\'applicazione di testare un\'autorizzazione relativa all\'archivio USB che sarà disponibile su dispositivi futuri."</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"Consente all\'applicazione di testare un\'autorizzazione relativa alla scheda SD che sarà disponibile su dispositivi futuri."</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"mod./elimin. cont. archivio USB"</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"modifica o eliminazione dei contenuti della scheda SD"</string> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index 04dfd2310721..34dc52a88f84 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"単語リストに新しい語句を書き込むことをアプリに許可します。"</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"保護されたストレージへのテストアクセス"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"保護されたストレージへのテストアクセス"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"今後追加する端末で使用できるUSBストレージの権限のテストをアプリに許可します。"</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"今後追加するデバイスで使用できるSDカードの権限のテストをアプリに許可します。"</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"USBストレージのコンテンツの変更または削除"</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"SDカードのコンテンツの変更または削除"</string> diff --git a/core/res/res/values-land/integers.xml b/core/res/res/values-land/integers.xml index 6613d6897ac3..020fd23cec81 100644 --- a/core/res/res/values-land/integers.xml +++ b/core/res/res/values-land/integers.xml @@ -22,4 +22,5 @@ <integer name="kg_selector_gravity">0x13</integer> <integer name="kg_widget_region_weight">45</integer> <integer name="kg_security_flipper_weight">55</integer> -</resources>
\ No newline at end of file + <integer name="kg_glowpad_rotation_offset">-90</integer> +</resources> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index 3a435041744f..0de01b243300 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"Leidžiama programai rašyti naujus žodžius į naudotojo žodyną."</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"prieigos prie apsaugotos saugyklos tikrinimas"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"prieigos prie apsaugotos saugyklos tikrinimas"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"Leidžia progr. tikr. leidimą USB atm., kuri bus vėlesn. įreng."</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"Leidžiama programai tikrinti SD kortelės, kuri bus pasiekiama ateityje naudojant kitus įrenginius, leidimą."</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"keisti / trinti USB atm. turinį"</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"keisti arba trinti SD kortelės turinį"</string> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index 58f8aa9e8df6..0b1519edf14f 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"Ļauj lietotnei rakstīt jaunus vārdus lietotāja vārdnīcā."</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"aizsargātai krātuvei pieejamas piekļuves pārbaude"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"aizsargātai krātuvei pieejamas piekļuves pārbaude"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"Ļauj lietotnei pārbaudīt atļauju USB krātuvei, kas būs pieejama turpmākajās ierīcēs."</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"Ļauj lietotnei pārbaudīt atļauju SD kartei, kas būs pieejama turpmākajās ierīcēs."</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"mainīt vai dzēst USB atm. sat."</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"SD kartes satura pārveidošana vai dzēšana"</string> diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml index 6dbbf0ecdff4..704a0fdb0880 100644 --- a/core/res/res/values-ms/strings.xml +++ b/core/res/res/values-ms/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"Membenarkan apl menulis perkataan baharu ke dalam kamus pengguna."</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"uji akses ke storan dilindungi"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"uji akses ke storan dilindungi"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"Apl boleh uji kebenaran USB."</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"Membenarkan apl menguji kebenaran untuk kad SD yang akan tersedia pada peranti akan datang."</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"ubah suai atau padam kandungan storan USB anda"</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"ubah suai atau padam kandungan kad SD anda"</string> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index d25e8b21057d..bb48630bb56e 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"Hiermee kan de app nieuwe woorden schrijven naar het gebruikerswoordenboek."</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"testtoegang tot beveiligde opslag"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"testtoegang tot beveiligde opslag"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"Hiermee kan de app toestemming testen voor USB-opslag op toekomstige apparaten."</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"Hiermee kan de app toestemming testen voor de SD-kaart die beschikbaar komt op toekomstige apparaten."</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"de inhoud van uw USB-opslag aanpassen of verwijderen"</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"de inhoud van uw SD-kaart aanpassen of verwijderen"</string> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index f51d96ebb99a..da09bcb154ad 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"Pozwala aplikacji na zapisywanie nowych słów do słownika użytkownika."</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"testowanie dostępu do chronionej pamięci"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"testowanie dostępu do chronionej pamięci"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"Aplikacja może testować uprawnienie do pamięci USB, dostępne w przyszłych urządzeniach."</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"Pozwala aplikacji na testowanie uprawnienia do karty SD, które będzie dostępne w przyszłych urządzeniach."</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"modyfikowanie i usuwanie zawartości pamięci USB"</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"modyfikowanie i usuwanie zawartości karty SD"</string> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index bc455219e35c..7ce4a34979db 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"Permite à aplicação escrever novas palavras no dicionário do utilizador."</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"testar o acesso a armazenamento protegido"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"testar o acesso a armazenamento protegido"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"Permite que a aplicação teste uma autorização para a memória USB que irá estar disponível em dispositivos futuros."</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"Permite que a aplicação teste uma autorização para o cartão SD que irá estar disponível em dispositivos futuros."</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"modificar ou eliminar os conteúdos da memória USB"</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"modificar ou eliminar os conteúdos do cartão SD"</string> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index 8ae3c10d6ca7..07806305eefc 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"Permite que o aplicativo grave novas palavras no dicionário do usuário."</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"testar o acesso ao armazenamento protegido"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"testar o acesso ao armazenamento protegido"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"Permite que o aplicativo teste uma permissão para o armazenamento USB que estará disponível em dispositivos futuros."</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"Permite que o aplicativo teste uma permissão para o cartão SD que estará disponível em dispositivos futuros."</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"modif ou excl cont. armaz USB"</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"modificar ou excluir o conteúdo do cartão SD"</string> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index 5a27c2058bf7..85136590ad0c 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -426,7 +426,7 @@ <string name="permlab_writeCalendar" msgid="8438874755193825647">"Добавление/изменение мероприятий и отправление гостям эл. сообщений без предупреждения владельца календаря"</string> <string name="permdesc_writeCalendar" product="tablet" msgid="6679035520113668528">"Приложение сможет добавлять, удалять и изменять мероприятия, доступные для редактирования на вашем планшетном ПК, включая мероприятия, добавленные другими людьми. Так приложение сможет рассылать сообщения от имени владельца календаря и изменять мероприятия без его ведома."</string> <string name="permdesc_writeCalendar" product="default" msgid="2324469496327249376">"Приложение сможет добавлять, удалять и изменять мероприятия, доступные для редактирования на вашем телефоне, включая мероприятия, добавленные другими людьми. Так приложение сможет рассылать сообщения от имени владельца календаря и изменять мероприятия без его ведома."</string> - <string name="permlab_accessMockLocation" msgid="8688334974036823330">"копировать источники мест для проверки"</string> + <string name="permlab_accessMockLocation" msgid="8688334974036823330">"Установка фиктивного местоположения для отладки"</string> <string name="permdesc_accessMockLocation" msgid="5808711039482051824">"Приложение сможет создавать фиктивные местоположения для тестирования или установки нового источника геоданных и переопределять местоположение и/или статус, возвращаемые другими источниками, такими как система GPS."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"получать доступ к дополнительным командам источника данных о местоположении"</string> <string name="permdesc_accessLocationExtraCommands" msgid="5945166642335800763">"Приложение получит доступ к дополнительным командам управления источниками геоданных и сможет вмешиваться в работу системы GPS или других источников геоданных."</string> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index 7da6f3e9e449..3dda747f0530 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"Programu omogoča pisanje nove besede v uporabniški slovar."</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"preskus dostopa do zaščitene shrambe"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"preskus dostopa do zaščitene shrambe"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"Aplikaciji omogoča preskušanje dovoljenja za shrambo USB, ki bo na voljo v prihodnjih napravah."</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"Aplikaciji omogoča preskušanje dovoljenja za kartico SD, ki bo na voljo v prihodnjih napravah."</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"spr. ali bris. vseb. pomn. USB"</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"spreminjanje ali brisanje vsebine kartice SD"</string> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index 963933d133cf..92d8acb2c708 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"Дозвољава апликацији да уписује нове речи у кориснички речник."</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"тестирање приступа заштићеној меморији"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"тестирање приступа заштићеној меморији"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"Дозвољава апликацији да тестира дозволу за USB меморију која ће бити доступна на будућим уређајима."</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"Дозвољава апликацији да тестира дозволу за SD картицу која ће бити доступна на будућим уређајима."</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"измена или брисање садржаја USB меморије"</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"мењање или брисање садржаја SD картице"</string> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index 198afaf7d00d..97760297bfb9 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"Tillåter att appen anger nya ord i användarordlistan."</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"testa åtkomst till skyddad lagringsenhet"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"testa åtkomst till skyddad lagringsenhet"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"Tillåter att appen testar behörighet till USB-enheter för användning på framtida enheter."</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"Tillåter appen att testa behörighet till SD-kortet för användning på framtida enheter."</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"ändra eller ta bort innehållet"</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"ändra eller ta bort innehåll på SD-kortet"</string> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index 104df821cac6..cd397fc8a983 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"Inaruhusu programu kuandika maneno mapya katika kamusi ya mtumiaji."</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"jaribu mfikio kwa hifadhi iliyolindwa"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"jaribu mfikio kwa hifadhi iliyolindwa"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"Inaruhusu programu kujaribu idhini ya hifadhi ya USB itakayopatikana kwenye vifaa vya baadaye."</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"Inaruhusu programu kujaribu idhini ya kadi ya SD itakayokuwa kwenye vifaa vya baadaye."</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"rekebisha au ufute maudhui ya hifadhi yako ya USB"</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"rekebisha au ufute maudhui ya kadi yako ya SD"</string> diff --git a/core/res/res/values-sw600dp-land/integers.xml b/core/res/res/values-sw600dp-land/integers.xml index 5f5d263b29dd..b724c9099d87 100644 --- a/core/res/res/values-sw600dp-land/integers.xml +++ b/core/res/res/values-sw600dp-land/integers.xml @@ -19,4 +19,5 @@ <resources> <integer name="kg_widget_region_weight">50</integer> <integer name="kg_security_flipper_weight">50</integer> -</resources>
\ No newline at end of file + <integer name="kg_glowpad_rotation_offset">0</integer> +</resources> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index a98b45f95d5d..5609a77f690c 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"อนุญาตให้แอปพลิเคชันเขียนคำใหม่ลงในพจนานุกรมผู้ใช้"</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"ทดสอบการเข้าถึงที่จัดเก็บข้อมูลที่มีการป้องกัน"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"ทดสอบการเข้าถึงที่จัดเก็บข้อมูลที่มีการป้องกัน"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"อนุญาตให้แอปพลิเคชันทดสอบการอนุญาตสำหรับที่จัดเก็บข้อมููล USB ที่จะสามารถใช้งานได้ในอุปกรณ์ในอนาคต"</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"อนุญาตให้แอปพลิเคชันทดสอบการอนุญาตสำหรับการ์ด SD ที่จะสามารถใช้งานได้ในอุปกรณ์ในอนาคต"</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"แก้ไขหรือลบเนื้อหาใน USB"</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"แก้ไขหรือลบเนื้อหาในการ์ด SD ของคุณ"</string> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index 2a1431211eaa..cf6314fbf6c9 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"Pinapayagan ang app na magsulat ng mga bagong salita sa diksyunaryo ng user."</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"subukan ang access sa pinoprotektahang storage"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"subukan ang access sa pinoprotektahang storage"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"Binibigyang-daan ang app na subukan ang isang pagpapahintulot para sa USB storage na magiging availabe sa mga device sa hinaharap."</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"Pinapayagan ang app na subukan ang isang pahintulot para sa SD card na magiging available sa mga device sa hinaharap."</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"bago tanggal laman USB storage"</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"baguhin o tanggalin ang mga nilalaman ng iyong SD card"</string> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index 506661129db0..8ce89f28b8ee 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"Дозволяє програмі писати нові слова в словник користувача."</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"тестувати доступ до захищеної пам’яті"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"тестувати доступ до захищеної пам’яті"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"Дозволяє програмі тестувати дозвіл для носія USB, який буде доступний на майбутніх пристроях."</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"Дозволяє програмі тестувати дозвіл для карти SD, яка буде доступна на майбутніх пристроях."</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"змінювати чи видаляти вміст USB"</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"змінювати чи видаляти вміст на карті SD"</string> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index f05190cf996f..160dda7b916a 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"Cho phép ứng dụng ghi từ mới vào từ điển của người dùng."</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"kiểm tra quyền truy cập vào bộ nhớ được bảo vệ"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"kiểm tra quyền truy cập vào bộ nhớ được bảo vệ"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"Cho phép ứng dụng kiểm tra quyền của bộ lưu trữ USB trên các thiết bị trong tương lai."</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"Cho phép ứng dụng kiểm tra quyền cho thẻ SD sẽ các thiết bị trong tương lai."</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"sửa đổi hoặc xóa nội dung của bộ lưu trữ USB của bạn"</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"sửa đổi hoặc xóa nội dung của thẻ SD của bạn"</string> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index 1a7367af0682..10af434423c3 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"允許應用程式將新字詞寫入使用者的字典。"</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"測試能否存取受保護的儲存裝置"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"測試能否存取受保護的儲存裝置"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"允許應用程式測試未來裝置將支援的 USB 儲存裝置權限。"</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"允許應用程式測試未來裝置將支援的 SD 卡權限。"</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"修改或刪除 USB 儲存裝置的內容"</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"修改或刪除 SD 卡的內容"</string> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index 0ae3778b03aa..02f97053b4c2 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -585,8 +585,7 @@ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"Ivumela insiza ukuthi ibhale amagama amasha esichazinimazwi."</string> <string name="permlab_sdcardRead" product="nosdcard" msgid="8235341515605559677">"ukufinyelela kokuhlola esilondolozini esivikelekile"</string> <string name="permlab_sdcardRead" product="default" msgid="8235341515605559677">"ukufinyelela kokuhlola esilondolozini esivikelekile"</string> - <!-- no translation found for permdesc_sdcardRead (3642473292348132072) --> - <skip /> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3642473292348132072">"Ivumela uhlelo lokusebenza ukuhlola imvume yokugciniwe okufinyeleleka nge-USB okuzotholakala kumadivayisi alandelayo."</string> <string name="permdesc_sdcardRead" product="default" msgid="5914402684685848828">"Ivumela uhlelo lokusebenza ukuhlola imvume yekhadi le-SD okuzotholakala kumadivayisi alandelayo."</string> <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"guqula noma ususe okuqukethwe kwakho okugciniwe okufinyeleleka nge-USB"</string> <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"shintsha noma ususe okuqukethwe ekhadini lakho le-SD"</string> diff --git a/core/res/res/values/arrays.xml b/core/res/res/values/arrays.xml index 8744bfe8c1c6..1e966f7cc508 100644 --- a/core/res/res/values/arrays.xml +++ b/core/res/res/values/arrays.xml @@ -398,6 +398,14 @@ <item>@null</item> </array> + <array name="lockscreen_targets_unlock_only"> + <item>@*android:drawable/ic_lockscreen_unlock</item> + </array> + + <array name="lockscreen_target_descriptions_unlock_only"> + <item>@*android:string/description_target_unlock</item> + </array> + <!-- list of 3- or 4-letter mnemonics for a 10-key numeric keypad --> <string-array translatable="false" name="lockscreen_num_pad_klondike"> <item></item><!-- 0 --> diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 48d47458e34c..d186c4a85f66 100755 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -5465,6 +5465,12 @@ <!-- Used when the handle shouldn't wait to be hit before following the finger --> <attr name="alwaysTrackFinger"/> + <!-- Location along the circle of the first item, in degrees.--> + <attr name="firstItemOffset" format="float" /> + + <!-- Causes targets to snap to the finger location on activation. --> + <attr name="magneticTargets" format="boolean" /> + <attr name="gravity" /> </declare-styleable> diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml index 8a7632c1ec12..b830e798f613 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml @@ -266,7 +266,7 @@ <!-- Size of margin on the right of keyguard's status view --> <dimen name="kg_status_line_font_right_margin">16dp</dimen> - <!-- Top margin for the clock view --> + <!-- Top margin for the clock view --> <dimen name="kg_clock_top_margin">-16dp</dimen> <!-- Horizontal gap between keys in PIN and SIM PIN numeric keyboards in keyguard --> diff --git a/core/res/res/values/integers.xml b/core/res/res/values/integers.xml index 91ad5d8eecf1..d1df2a4ca318 100644 --- a/core/res/res/values/integers.xml +++ b/core/res/res/values/integers.xml @@ -20,4 +20,5 @@ <integer name="kg_carousel_angle">75</integer> <integer name="kg_security_flip_duration">75</integer> <integer name="kg_security_fade_duration">75</integer> + <integer name="kg_glowpad_rotation_offset">0</integer> </resources> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 47a8fc5af7f1..159eec181275 100755 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -2272,12 +2272,24 @@ <!-- Accessibility description sent when user completes drawing a pattern. [CHAR LIMIT=NONE] --> <string name="lockscreen_access_pattern_detected">Pattern completed</string> - <!-- Accessibility description sent when user changes the current lock screen widget. [CHAR_LIMIT=none] --> - <string name="keyguard_accessibility_widget_changed">%1$s. Widget %2$d of %3$d.</string> + <!-- Accessibility description of the add widget button. [CHAR_LIMIT=none] --> + <string name="keyguard_accessibility_add_widget">Add widget.</string> + <!-- Accessibility description of the empty sidget slot (place holder for a new widget). [CHAR_LIMIT=none] --> + <string name="keyguard_accessibility_widget_empty_slot">Empty</string> + <!-- Accessibility description of the unlock area. [CHAR_LIMIT=none] --> + <string name="keyguard_accessibility_unlock_area">Unlock area.</string> + <!-- Accessibility description of the event of expanding an unlock area. [CHAR_LIMIT=none] --> + <string name="keyguard_accessibility_unlock_area_expanded">Unlock area expanded.</string> + <!-- Accessibility description of the event of collapsing an unlock area. [CHAR_LIMIT=none] --> + <string name="keyguard_accessibility_unlock_area_collapsed">Unlock area collapsed.</string> + <!-- Accessibility description of a lock screen widget. [CHAR_LIMIT=none] --> + <string name="keyguard_accessibility_widget">%1$s widget.</string> <!-- Accessibility description of the lock screen user selector widget. [CHAR_LIMIT=none] --> <string name="keyguard_accessibility_user_selector">User selector</string> <!-- Accessibility description of the lock screen status widget. [CHAR_LIMIT=none] --> <string name="keyguard_accessibility_status">Status</string> + <!-- Accessibility description of the camera widget. [CHAR_LIMIT=none] --> + <string name="keyguard_accessibility_camera">Camera</string> <!-- Accessibility description of the lock media control widget. [CHAR_LIMIT=none] --> <string name="keygaurd_accessibility_media_controls">Media controls</string> diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index da26e6a1c996..180f864bb3c4 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -2503,4 +2503,5 @@ please see styles_device_defaults.xml. <item name="android:textStyle">normal</item> <item name="android:textColor">#80ffffff</item> </style> + </resources> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 60a2e9139cf5..7ebf7e7bfd6b 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1234,7 +1234,7 @@ <java-symbol type="drawable" name="magnified_region_frame" /> <java-symbol type="drawable" name="menu_background" /> <java-symbol type="drawable" name="stat_sys_secure" /> - <java-symbol type="drawable" name="security_frame" /> + <java-symbol type="drawable" name="kg_bouncer_bg_white" /> <java-symbol type="id" name="action_mode_bar_stub" /> <java-symbol type="id" name="alarm_status" /> <java-symbol type="id" name="backspace" /> diff --git a/docs/html/distribute/googleplay/publish/preparing.jd b/docs/html/distribute/googleplay/publish/preparing.jd index 463343d2d7e5..a3538a95c0ee 100644 --- a/docs/html/distribute/googleplay/publish/preparing.jd +++ b/docs/html/distribute/googleplay/publish/preparing.jd @@ -15,7 +15,7 @@ page.title=Publishing Checklist for Google Play <li><a href="#inapp-billing">9. Consider In-app Billing</a></li> <li><a href="#pricing">10. Set prices for your apps</a></li> <li><a href="#localize">11. Start localization early</a></li> -<li><a href="#localize">12. Prepare promotional graphics</a></li> +<li><a href="#graphics">12. Prepare promotional graphics</a></li> <li><a href="#apk">13. Build the release-ready APK</a></li> <li><a href="#product-page">14. Complete the product details</a></li> <li><a href="#badges">15. Use Google Play badges</a></li> diff --git a/docs/html/distribute/promote/device-art-resources/nexus_10/land_back.png b/docs/html/distribute/promote/device-art-resources/nexus_10/land_back.png Binary files differnew file mode 100644 index 000000000000..71bb52d29e26 --- /dev/null +++ b/docs/html/distribute/promote/device-art-resources/nexus_10/land_back.png diff --git a/docs/html/distribute/promote/device-art-resources/nexus_10/land_fore.png b/docs/html/distribute/promote/device-art-resources/nexus_10/land_fore.png Binary files differnew file mode 100644 index 000000000000..d29f818b906e --- /dev/null +++ b/docs/html/distribute/promote/device-art-resources/nexus_10/land_fore.png diff --git a/docs/html/distribute/promote/device-art-resources/nexus_10/land_shadow.png b/docs/html/distribute/promote/device-art-resources/nexus_10/land_shadow.png Binary files differnew file mode 100644 index 000000000000..af1a2490d38b --- /dev/null +++ b/docs/html/distribute/promote/device-art-resources/nexus_10/land_shadow.png diff --git a/docs/html/distribute/promote/device-art-resources/nexus_10/port_back.png b/docs/html/distribute/promote/device-art-resources/nexus_10/port_back.png Binary files differnew file mode 100644 index 000000000000..501690bde142 --- /dev/null +++ b/docs/html/distribute/promote/device-art-resources/nexus_10/port_back.png diff --git a/docs/html/distribute/promote/device-art-resources/nexus_10/port_fore.png b/docs/html/distribute/promote/device-art-resources/nexus_10/port_fore.png Binary files differnew file mode 100644 index 000000000000..689a72a376a5 --- /dev/null +++ b/docs/html/distribute/promote/device-art-resources/nexus_10/port_fore.png diff --git a/docs/html/distribute/promote/device-art-resources/nexus_10/port_shadow.png b/docs/html/distribute/promote/device-art-resources/nexus_10/port_shadow.png Binary files differnew file mode 100644 index 000000000000..b2265ef90bfb --- /dev/null +++ b/docs/html/distribute/promote/device-art-resources/nexus_10/port_shadow.png diff --git a/docs/html/distribute/promote/device-art-resources/nexus_10/thumb.png b/docs/html/distribute/promote/device-art-resources/nexus_10/thumb.png Binary files differnew file mode 100644 index 000000000000..8d8dee97e01c --- /dev/null +++ b/docs/html/distribute/promote/device-art-resources/nexus_10/thumb.png diff --git a/docs/html/distribute/promote/device-art-resources/nexus_4/land_back.png b/docs/html/distribute/promote/device-art-resources/nexus_4/land_back.png Binary files differnew file mode 100644 index 000000000000..57a011a7e67b --- /dev/null +++ b/docs/html/distribute/promote/device-art-resources/nexus_4/land_back.png diff --git a/docs/html/distribute/promote/device-art-resources/nexus_4/land_fore.png b/docs/html/distribute/promote/device-art-resources/nexus_4/land_fore.png Binary files differnew file mode 100644 index 000000000000..72c9654681ae --- /dev/null +++ b/docs/html/distribute/promote/device-art-resources/nexus_4/land_fore.png diff --git a/docs/html/distribute/promote/device-art-resources/nexus_4/land_shadow.png b/docs/html/distribute/promote/device-art-resources/nexus_4/land_shadow.png Binary files differnew file mode 100644 index 000000000000..d80a5fd89637 --- /dev/null +++ b/docs/html/distribute/promote/device-art-resources/nexus_4/land_shadow.png diff --git a/docs/html/distribute/promote/device-art-resources/nexus_4/port_back.png b/docs/html/distribute/promote/device-art-resources/nexus_4/port_back.png Binary files differnew file mode 100644 index 000000000000..e64fae465079 --- /dev/null +++ b/docs/html/distribute/promote/device-art-resources/nexus_4/port_back.png diff --git a/docs/html/distribute/promote/device-art-resources/nexus_4/port_fore.png b/docs/html/distribute/promote/device-art-resources/nexus_4/port_fore.png Binary files differnew file mode 100644 index 000000000000..c9fb0629030e --- /dev/null +++ b/docs/html/distribute/promote/device-art-resources/nexus_4/port_fore.png diff --git a/docs/html/distribute/promote/device-art-resources/nexus_4/port_shadow.png b/docs/html/distribute/promote/device-art-resources/nexus_4/port_shadow.png Binary files differnew file mode 100644 index 000000000000..b2064a358b48 --- /dev/null +++ b/docs/html/distribute/promote/device-art-resources/nexus_4/port_shadow.png diff --git a/docs/html/distribute/promote/device-art-resources/nexus_4/thumb.png b/docs/html/distribute/promote/device-art-resources/nexus_4/thumb.png Binary files differnew file mode 100644 index 000000000000..2988dc951244 --- /dev/null +++ b/docs/html/distribute/promote/device-art-resources/nexus_4/thumb.png diff --git a/docs/html/distribute/promote/device-art-resources/nexus_7/land_back.png b/docs/html/distribute/promote/device-art-resources/nexus_7/land_back.png Binary files differindex 2999f3563061..697fb7dfede2 100644 --- a/docs/html/distribute/promote/device-art-resources/nexus_7/land_back.png +++ b/docs/html/distribute/promote/device-art-resources/nexus_7/land_back.png diff --git a/docs/html/distribute/promote/device-art-resources/nexus_7/land_fore.png b/docs/html/distribute/promote/device-art-resources/nexus_7/land_fore.png Binary files differindex cefdd35199bb..735262f696e4 100644 --- a/docs/html/distribute/promote/device-art-resources/nexus_7/land_fore.png +++ b/docs/html/distribute/promote/device-art-resources/nexus_7/land_fore.png diff --git a/docs/html/distribute/promote/device-art-resources/nexus_7/land_shadow.png b/docs/html/distribute/promote/device-art-resources/nexus_7/land_shadow.png Binary files differindex 8f7aec726fdf..cfb7952d4b7d 100644 --- a/docs/html/distribute/promote/device-art-resources/nexus_7/land_shadow.png +++ b/docs/html/distribute/promote/device-art-resources/nexus_7/land_shadow.png diff --git a/docs/html/distribute/promote/device-art-resources/nexus_7/port_back.png b/docs/html/distribute/promote/device-art-resources/nexus_7/port_back.png Binary files differindex b2908a86a4a3..5bb815a57f3d 100644 --- a/docs/html/distribute/promote/device-art-resources/nexus_7/port_back.png +++ b/docs/html/distribute/promote/device-art-resources/nexus_7/port_back.png diff --git a/docs/html/distribute/promote/device-art-resources/nexus_7/port_fore.png b/docs/html/distribute/promote/device-art-resources/nexus_7/port_fore.png Binary files differindex 7f4b0b41e641..1be3b210a77d 100644 --- a/docs/html/distribute/promote/device-art-resources/nexus_7/port_fore.png +++ b/docs/html/distribute/promote/device-art-resources/nexus_7/port_fore.png diff --git a/docs/html/distribute/promote/device-art-resources/nexus_7/port_shadow.png b/docs/html/distribute/promote/device-art-resources/nexus_7/port_shadow.png Binary files differindex c10bd533cb5f..7e8aff2bfa7e 100644 --- a/docs/html/distribute/promote/device-art-resources/nexus_7/port_shadow.png +++ b/docs/html/distribute/promote/device-art-resources/nexus_7/port_shadow.png diff --git a/docs/html/distribute/promote/device-art-resources/nexus_7/thumb.png b/docs/html/distribute/promote/device-art-resources/nexus_7/thumb.png Binary files differindex 8b5cc5ab3005..b5db82e3f462 100644 --- a/docs/html/distribute/promote/device-art-resources/nexus_7/thumb.png +++ b/docs/html/distribute/promote/device-art-resources/nexus_7/thumb.png diff --git a/docs/html/distribute/promote/device-art.jd b/docs/html/distribute/promote/device-art.jd index 93f772a5cdd3..55b846ecd9a3 100644 --- a/docs/html/distribute/promote/device-art.jd +++ b/docs/html/distribute/promote/device-art.jd @@ -18,7 +18,9 @@ feature image or screenshots for your Google Play app listing.</p> <p>Drag a screenshot from your desktop onto a device to the right.</p> </div> <div class="layout-content-col span-10"> - <ul id="device-list"></ul> + <ul class="device-list primary"></ul> + <a href="#" id="archive-expando">Older devices</a> + <ul class="device-list archive"></ul> </div> </div> @@ -57,12 +59,12 @@ feature image or screenshots for your Google Play app listing.</p> text-transform: uppercase; } - #device-list { + .device-list { padding: 0; margin: 0; } - #device-list li { + .device-list li { display: inline-block; vertical-align: bottom; margin: 0; @@ -70,11 +72,11 @@ feature image or screenshots for your Google Play app listing.</p> text-align: center; } - #device-list li .thumb-container { + .device-list li .thumb-container { display: inline-block; } - #device-list li .thumb-container img { + .device-list li .thumb-container img { margin-bottom: 8px; opacity: 0.6; @@ -83,7 +85,7 @@ feature image or screenshots for your Google Play app listing.</p> transition: transform 0.2s, opacity 0.2s; } - #device-list li.drag-hover .thumb-container img { + .device-list li.drag-hover .thumb-container img { opacity: 1; -webkit-transform: scale(1.1); @@ -91,16 +93,35 @@ feature image or screenshots for your Google Play app listing.</p> transform: scale(1.1); } - #device-list li .device-details { + .device-list li .device-details { font-size: 13px; line-height: 16px; color: #888; } - #device-list li .device-url { + .device-list li .device-url { font-weight: bold; } + #archive-expando { + display: block; + font-size: 13px; + font-weight: bold; + color: #333; + text-transform: uppercase; + margin-top: 16px; + padding-top: 16px; + padding-left: 28px; + border-top: 1px solid transparent; + background: transparent url({@docRoot}assets/images/styles/disclosure_down.png) + no-repeat scroll 0 8px; + } + + #archive-expando.expanded { + background-image: url({@docRoot}assets/images/styles/disclosure_up.png); + border-top: 1px solid #ccc; + } + #output { color: #f44; font-style: italic; @@ -117,7 +138,7 @@ feature image or screenshots for your Google Play app listing.</p> // Global constants var MSG_INVALID_INPUT_IMAGE = 'Invalid screenshot provided. Screenshots must be PNG files ' - + 'matching the target device\'s screen resolution in either portrait or landscape.'; + + 'matching the target device\'s screen aspect ratio in either portrait or landscape.'; var MSG_NO_INPUT_IMAGE = 'Drag a screenshot (in PNG format) from your desktop onto a ' + 'target device above.' var MSG_GENERATING_IMAGE = 'Generating device art…'; @@ -127,17 +148,44 @@ feature image or screenshots for your Google Play app listing.</p> // Device manifest. var DEVICES = [ { + id: 'nexus_4', + title: 'Nexus 4', + url: 'http://www.google.com/nexus/4/', + physicalSize: 4.7, + physicalHeight: 5.23, + density: 'XHDPI', + landRes: ['shadow', 'back', 'fore'], + landOffset: [349,214], + portRes: ['shadow', 'back', 'fore'], + portOffset: [213,350], + portSize: [768,1280] + }, + { id: 'nexus_7', title: 'Nexus 7', - url: 'http://www.android.com/devices/detail/nexus-7', + url: 'http://www.google.com/nexus/7/', physicalSize: 7, physicalHeight: 7.81, - density: 213, + density: '213dpi', landRes: ['shadow', 'back', 'fore'], - landOffset: [363,260], + landOffset: [315,270], portRes: ['shadow', 'back', 'fore'], - portOffset: [265,341], - portSize: [800,1280], + portOffset: [264,311], + portSize: [800,1280] + }, + { + id: 'nexus_10', + title: 'Nexus 10', + url: 'http://www.google.com/nexus/10/', + physicalSize: 10, + physicalHeight: 7, + actualResolution: [1600,2560], + density: 'XHDPI', + landRes: ['shadow', 'back', 'fore'], + landOffset: [227,217], + portRes: ['shadow', 'back', 'fore'], + portOffset: [217,223], + portSize: [800,1280] }, { id: 'xoom', @@ -145,12 +193,13 @@ feature image or screenshots for your Google Play app listing.</p> url: 'http://www.google.com/phone/detail/motorola-xoom', physicalSize: 10, physicalHeight: 6.61, - density: 160, + density: 'MDPI', landRes: ['shadow', 'back', 'fore'], landOffset: [218,191], portRes: ['shadow', 'back', 'fore'], portOffset: [199,200], portSize: [800,1280], + archived: true }, { id: 'galaxy_nexus', @@ -158,12 +207,13 @@ feature image or screenshots for your Google Play app listing.</p> url: 'http://www.android.com/devices/detail/galaxy-nexus', physicalSize: 4.65, physicalHeight: 5.33, - density: 320, + density: 'XHDPI', landRes: ['shadow', 'back', 'fore'], landOffset: [371,199], portRes: ['shadow', 'back', 'fore'], portOffset: [216,353], portSize: [720,1280], + archived: true }, { id: 'nexus_s', @@ -171,12 +221,13 @@ feature image or screenshots for your Google Play app listing.</p> url: 'http://www.google.com/phone/detail/nexus-s', physicalSize: 4.0, physicalHeight: 4.88, - density: 240, + density: 'HDPI', landRes: ['shadow', 'back', 'fore'], landOffset: [247,135], portRes: ['shadow', 'back', 'fore'], portOffset: [134,247], portSize: [480,800], + archived: true } ]; @@ -250,13 +301,23 @@ feature image or screenshots for your Google Play app listing.</p> $('#output').html(MSG_NO_INPUT_IMAGE); $('#frame-customizations').hide(); + $('.device-list.archive').hide(); $('#output-shadow, #output-glare').click(function() { - createFrame(g_currentDevice, g_currentImage); + createFrame(); }); // Build device list. $.each(DEVICES, function() { + var resolution = this.actualResolution || this.portSize; + var scaleFactorText = ''; + if (resolution[0] != this.portSize[0]) { + scaleFactorText = '<br>' + (100 * (this.portSize[0] / resolution[0])).toFixed(0) + + '% size output'; + } else { + scaleFactorText = '<br> '; + } + $('<li>') .append($('<div>') .addClass('thumb-container') @@ -269,14 +330,26 @@ feature image or screenshots for your Google Play app listing.</p> .html((this.url ? ('<a class="device-url" href="' + this.url + '">' + this.title + '</a>') : this.title) + - '<br>' + this.physicalSize + '" @ ' + this.density + 'dpi' + - '<br>' + this.portSize[0] + 'x' + this.portSize[1])) + '<br>' + this.physicalSize + '" @ ' + this.density + + '<br>' + (resolution[0] + 'x' + resolution[1]) + scaleFactorText)) .data('deviceId', this.id) - .appendTo('#device-list'); + .appendTo(this.archived ? '.device-list.archive' : '.device-list.primary'); + }); + + // Set up "older devices" expando. + $('#archive-expando').click(function() { + if ($(this).hasClass('expanded')) { + $(this).removeClass('expanded'); + $('.device-list.archive').hide(); + } else { + $(this).addClass('expanded'); + $('.device-list.archive').show(); + } + return false; }); // Set up drag and drop. - $('#device-list li') + $('.device-list li') .live('dragover', function(evt) { $(this).addClass('drag-hover'); evt.dataTransfer.dropEffect = 'link'; @@ -335,27 +408,19 @@ feature image or screenshots for your Google Play app listing.</p> */ function createFrame() { var port; - if (g_currentImage.naturalWidth == g_currentDevice.portSize[0] && - g_currentImage.naturalHeight == g_currentDevice.portSize[1]) { - if (!g_currentDevice.portRes) { - alert('No portrait frame is currently available for this device.'); - $('#output').html(MSG_NO_INPUT_IMAGE); - return; - } + + var aspect1 = g_currentImage.naturalWidth / g_currentImage.naturalHeight; + var aspect2 = g_currentDevice.portSize[0] / g_currentDevice.portSize[1]; + + if (aspect1 == aspect2) { port = true; - } else if (g_currentImage.naturalWidth == g_currentDevice.portSize[1] && - g_currentImage.naturalHeight == g_currentDevice.portSize[0]) { - if (!g_currentDevice.landRes) { - alert('No landscape frame is currently available for this device.'); - $('#output').html(MSG_NO_INPUT_IMAGE); - return; - } + } else if (aspect1 == 1 / aspect2) { port = false; } else { - alert('Screenshots for ' + g_currentDevice.title + ' must be ' + - g_currentDevice.portSize[0] + 'x' + g_currentDevice.portSize[1] + - ' or ' + - g_currentDevice.portSize[1] + 'x' + g_currentDevice.portSize[0] + '.'); + alert('The screenshot must have an aspect ratio of ' + + aspect2.toFixed(3) + ' or ' + (1 / aspect2).toFixed(3) + + ' (ideally ' + g_currentDevice.portSize[0] + 'x' + g_currentDevice.portSize[1] + + ' or ' + g_currentDevice.portSize[1] + 'x' + g_currentDevice.portSize[0] + ').'); $('#output').html(MSG_INVALID_INPUT_IMAGE); return; } @@ -378,6 +443,9 @@ feature image or screenshots for your Google Play app listing.</p> var width = resourceImages['back'].naturalWidth; var height = resourceImages['back'].naturalHeight; var offset = port ? g_currentDevice.portOffset : g_currentDevice.landOffset; + var size = port + ? g_currentDevice.portSize + : [g_currentDevice.portSize[1], g_currentDevice.portSize[0]]; var canvas = document.createElement('canvas'); canvas.width = width; @@ -388,7 +456,9 @@ feature image or screenshots for your Google Play app listing.</p> ctx.drawImage(resourceImages['shadow'], 0, 0); } ctx.drawImage(resourceImages['back'], 0, 0); - ctx.drawImage(g_currentImage, offset[0], offset[1]); + ctx.fillStyle = '#000'; + ctx.fillRect(offset[0], offset[1], size[0], size[1]); + ctx.drawImage(g_currentImage, offset[0], offset[1], size[0], size[1]); if (resourceImages['fore'] && $('#output-glare').is(':checked')) { ctx.drawImage(resourceImages['fore'], 0, 0); } diff --git a/location/java/android/location/Geofence.java b/location/java/android/location/Geofence.java index b3e4a88982d4..e0e11be44279 100644 --- a/location/java/android/location/Geofence.java +++ b/location/java/android/location/Geofence.java @@ -36,8 +36,8 @@ public final class Geofence implements Parcelable { /** * Create a horizontal, circular geofence. * - * @param latitude latitude in degrees - * @param longitude longitude in degrees + * @param latitude latitude in degrees, between -90 and +90 inclusive + * @param longitude longitude in degrees, between -180 and +180 inclusive * @param radius radius in meters * @return a new geofence * @throws IllegalArgumentException if any parameters are out of range diff --git a/location/java/android/location/LocationProvider.java b/location/java/android/location/LocationProvider.java index 737e17f378dc..8e0061d8dd9e 100644 --- a/location/java/android/location/LocationProvider.java +++ b/location/java/android/location/LocationProvider.java @@ -33,8 +33,8 @@ import com.android.internal.location.ProviderProperties; * Criteria} class allows providers to be selected based on * user-specified criteria. * - * @deprecated Use the {@link Criteria} class to request location instead of - * enumerating providers. + * @deprecated Use the {@link LocationRequest} class to request location + * instead of enumerating providers. */ @Deprecated public class LocationProvider { diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index a5c60d41e060..315196e16330 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -636,7 +636,7 @@ public class AudioService extends IAudioService.Stub implements OnFinished { private void readDockAudioSettings(ContentResolver cr) { mDockAudioMediaEnabled = Settings.Global.getInt( - cr, Settings.Global.DOCK_AUDIO_MEDIA_ENABLED, 1) == 1; + cr, Settings.Global.DOCK_AUDIO_MEDIA_ENABLED, 0) == 1; if (mDockAudioMediaEnabled) { mBecomingNoisyIntentDevices |= AudioSystem.DEVICE_OUT_ANLG_DOCK_HEADSET; @@ -3913,7 +3913,7 @@ public class AudioService extends IAudioService.Stub implements OnFinished { } else if (action.equalsIgnoreCase(Intent.ACTION_CONFIGURATION_CHANGED)) { handleConfigurationChanged(context); } else if (action.equals(Intent.ACTION_USER_SWITCHED)) { - // attempt to stop music playabck for background user + // attempt to stop music playback for background user sendMsg(mAudioHandler, MSG_BROADCAST_AUDIO_BECOMING_NOISY, SENDMSG_REPLACE, @@ -3921,6 +3921,9 @@ public class AudioService extends IAudioService.Stub implements OnFinished { 0, null, 0); + // the current audio focus owner is no longer valid + discardAudioFocusOwner(); + // load volume settings for new user readAudioSettings(true /*userSwitch*/); // preserve STREAM_MUSIC volume from one user to the next. @@ -3965,6 +3968,32 @@ public class AudioService extends IAudioService.Stub implements OnFinished { } }; + /** + * Discard the current audio focus owner. + * Notify top of audio focus stack that it lost focus (regardless of possibility to reassign + * focus), remove it from the stack, and clear the remote control display. + */ + private void discardAudioFocusOwner() { + synchronized(mAudioFocusLock) { + if (!mFocusStack.empty() && (mFocusStack.peek().mFocusDispatcher != null)) { + // notify the current focus owner it lost focus after removing it from stack + FocusStackEntry focusOwner = mFocusStack.pop(); + try { + focusOwner.mFocusDispatcher.dispatchAudioFocusChange( + AudioManager.AUDIOFOCUS_LOSS, focusOwner.mClientId); + } catch (RemoteException e) { + Log.e(TAG, "Failure to signal loss of audio focus due to "+ e); + e.printStackTrace(); + } + focusOwner.unlinkToDeath(); + // clear RCD + synchronized(mRCStack) { + clearRemoteControlDisplay_syncAfRcs(); + } + } + } + } + private void notifyTopOfAudioFocusStack() { // notify the top of the stack it gained focus if (!mFocusStack.empty() && (mFocusStack.peek().mFocusDispatcher != null)) { @@ -4036,7 +4065,9 @@ public class AudioService extends IAudioService.Stub implements OnFinished { Iterator<FocusStackEntry> stackIterator = mFocusStack.iterator(); while(stackIterator.hasNext()) { FocusStackEntry fse = stackIterator.next(); - pw.println(" source:" + fse.mSourceRef + " -- client: " + fse.mClientId + pw.println(" source:" + fse.mSourceRef + + " -- pack: " + fse.mPackageName + + " -- client: " + fse.mClientId + " -- duration: " + fse.mFocusChangeType + " -- uid: " + fse.mCallingUid + " -- stream: " + fse.mStreamType); @@ -4718,6 +4749,7 @@ public class AudioService extends IAudioService.Stub implements OnFinished { while(stackIterator.hasNext()) { RemoteControlStackEntry rcse = stackIterator.next(); pw.println(" pi: " + rcse.mMediaIntent + + " -- pack: " + rcse.mCallingPackageName + " -- ercvr: " + rcse.mReceiverComponent + " -- client: " + rcse.mRcClient + " -- uid: " + rcse.mCallingUid + diff --git a/packages/FusedLocation/AndroidManifest.xml b/packages/FusedLocation/AndroidManifest.xml index 10b90644fcc4..779428e34a0c 100644 --- a/packages/FusedLocation/AndroidManifest.xml +++ b/packages/FusedLocation/AndroidManifest.xml @@ -18,16 +18,14 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.location.fused" - coreApp="true" - android:sharedUserId="android.uid.system"> + coreApp="true"> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <uses-permission android:name="android.permission.INSTALL_LOCATION_PROVIDER" /> <application - android:label="@string/app_label" - android:process="system"> + android:label="@string/app_label"> <uses-library android:name="com.android.location.provider" /> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index 439c5279abed..8c2dd8e23edf 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -176,7 +176,7 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"La pantalla està bloquejada en orientació horitzontal."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"La pantalla està bloquejada en orientació vertical."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="7219575858348719790">"Somiar despert"</string> + <string name="start_dreams" msgid="7219575858348719790">"Estalvi de pantalla"</string> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Mode d\'avió"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"S\'està carregant, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index ddb6265ad3c2..c34ca3e116b7 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -174,7 +174,7 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Skærmen er nu låst i liggende retning."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Skærmen er nu låst i stående retning."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="7219575858348719790">"Daydream"</string> + <string name="start_dreams" msgid="7219575858348719790">"Dagdrømme"</string> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Flytilstand"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Oplader, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index fc18361f32e2..a5a5e36d28ff 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -185,7 +185,7 @@ <string name="quick_settings_bluetooth_multiple_devices_label" msgid="3912245565613684735">"Bluetooth (<xliff:g id="NUMBER">%d</xliff:g> Geräte)"</string> <string name="quick_settings_bluetooth_off_label" msgid="8159652146149219937">"Bluetooth aus"</string> <string name="quick_settings_brightness_label" msgid="6968372297018755815">"Helligkeit"</string> - <string name="quick_settings_rotation_unlocked_label" msgid="336054930362580584">"Automatisch drehen"</string> + <string name="quick_settings_rotation_unlocked_label" msgid="336054930362580584">"Autom. drehen"</string> <string name="quick_settings_rotation_locked_label" msgid="8058646447242565486">"Drehung gesperrt"</string> <string name="quick_settings_ime_label" msgid="7073463064369468429">"Eingabemethode"</string> <string name="quick_settings_location_label" msgid="3292451598267467545">"Verwendeter Standort"</string> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index a078a0b48488..33d1f6d6d375 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -176,7 +176,7 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"屏幕锁定为横向模式。"</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"屏幕锁定为纵向模式。"</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"果冻豆大乱舞"</string> - <string name="start_dreams" msgid="7219575858348719790">"白日梦"</string> + <string name="start_dreams" msgid="7219575858348719790">"互动屏保"</string> <string name="ethernet_label" msgid="7967563676324087464">"以太网"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"飞行模式"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"正在充电：<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index fefd4fb9831b..17256cfa2893 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -412,7 +412,17 @@ public class PhoneWindowManager implements WindowManagerPolicy { boolean mForceStatusBar; boolean mForceStatusBarFromKeyguard; boolean mHideLockScreen; - boolean mDismissKeyguard; + + // States of keyguard dismiss. + private static final int DISMISS_KEYGUARD_NONE = 0; // Keyguard not being dismissed. + private static final int DISMISS_KEYGUARD_START = 1; // Keyguard needs to be dismissed. + private static final int DISMISS_KEYGUARD_CONTINUE = 2; // Keyguard has been dismissed. + int mDismissKeyguard = DISMISS_KEYGUARD_NONE; + + /** The window that is currently dismissing the keyguard. Dismissing the keyguard must only + * be done once per window. */ + private WindowState mWinDismissingKeyguard; + boolean mShowingLockscreen; boolean mShowingDream; boolean mDreamingLockscreen; @@ -2921,6 +2931,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { } /** {@inheritDoc} */ + @Override public void beginPostLayoutPolicyLw(int displayWidth, int displayHeight) { mTopFullscreenOpaqueWindowState = null; mForceStatusBar = false; @@ -2928,12 +2939,13 @@ public class PhoneWindowManager implements WindowManagerPolicy { mHideLockScreen = false; mAllowLockscreenWhenOn = false; - mDismissKeyguard = false; + mDismissKeyguard = DISMISS_KEYGUARD_NONE; mShowingLockscreen = false; mShowingDream = false; } /** {@inheritDoc} */ + @Override public void applyPostLayoutPolicyLw(WindowState win, WindowManager.LayoutParams attrs) { if (DEBUG_LAYOUT) Slog.i(TAG, "Win " + win + ": isVisibleOrBehindKeyguardLw=" @@ -2971,9 +2983,12 @@ public class PhoneWindowManager implements WindowManagerPolicy { mHideLockScreen = true; mForceStatusBarFromKeyguard = false; } - if ((attrs.flags & FLAG_DISMISS_KEYGUARD) != 0) { + if ((attrs.flags & FLAG_DISMISS_KEYGUARD) != 0 + && mDismissKeyguard == DISMISS_KEYGUARD_NONE) { if (DEBUG_LAYOUT) Log.v(TAG, "Setting mDismissKeyguard to true by win " + win); - mDismissKeyguard = true; + mDismissKeyguard = mWinDismissingKeyguard == win ? + DISMISS_KEYGUARD_CONTINUE : DISMISS_KEYGUARD_START; + mWinDismissingKeyguard = win; mForceStatusBarFromKeyguard = false; } if ((attrs.flags & FLAG_ALLOW_LOCK_WHILE_SCREEN_ON) != 0) { @@ -2984,6 +2999,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { } /** {@inheritDoc} */ + @Override public int finishPostLayoutPolicyLw() { int changes = 0; boolean topIsFullscreen = false; @@ -3023,7 +3039,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { if (mStatusBar.hideLw(true)) { changes |= FINISH_LAYOUT_REDO_LAYOUT; - mHandler.post(new Runnable() { public void run() { + mHandler.post(new Runnable() { + @Override + public void run() { try { IStatusBarService statusbar = getStatusBarService(); if (statusbar != null) { @@ -3051,7 +3069,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { if (mKeyguard != null) { if (localLOGV) Log.v(TAG, "finishPostLayoutPolicyLw: mHideKeyguard=" + mHideLockScreen); - if (mDismissKeyguard && !mKeyguardMediator.isSecure()) { + if (mDismissKeyguard != DISMISS_KEYGUARD_NONE && !mKeyguardMediator.isSecure()) { if (mKeyguard.hideLw(true)) { changes |= FINISH_LAYOUT_REDO_LAYOUT | FINISH_LAYOUT_REDO_CONFIG @@ -3059,6 +3077,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { } if (mKeyguardMediator.isShowing()) { mHandler.post(new Runnable() { + @Override public void run() { mKeyguardMediator.keyguardDone(false, false); } @@ -3071,7 +3090,25 @@ public class PhoneWindowManager implements WindowManagerPolicy { | FINISH_LAYOUT_REDO_WALLPAPER; } mKeyguardMediator.setHidden(true); + } else if (mDismissKeyguard != DISMISS_KEYGUARD_NONE) { + // This is the case of keyguard isSecure() and not mHideLockScreen. + if (mDismissKeyguard == DISMISS_KEYGUARD_START) { + // Only launch the next keyguard unlock window once per window. + if (mKeyguard.showLw(true)) { + changes |= FINISH_LAYOUT_REDO_LAYOUT + | FINISH_LAYOUT_REDO_CONFIG + | FINISH_LAYOUT_REDO_WALLPAPER; + } + mKeyguardMediator.setHidden(false); + mHandler.post(new Runnable() { + @Override + public void run() { + mKeyguardMediator.dismiss(); + } + }); + } } else { + mWinDismissingKeyguard = null; if (mKeyguard.showLw(true)) { changes |= FINISH_LAYOUT_REDO_LAYOUT | FINISH_LAYOUT_REDO_CONFIG @@ -4549,6 +4586,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { pw.print(" mForceStatusBarFromKeyguard="); pw.println(mForceStatusBarFromKeyguard); pw.print(prefix); pw.print("mDismissKeyguard="); pw.print(mDismissKeyguard); + pw.print(" mWinDismissingKeyguard="); pw.print(mWinDismissingKeyguard); pw.print(" mHomePressed="); pw.println(mHomePressed); pw.print(prefix); pw.print("mAllowLockscreenWhenOn="); pw.print(mAllowLockscreenWhenOn); pw.print(" mLockScreenTimeout="); pw.print(mLockScreenTimeout); diff --git a/policy/src/com/android/internal/policy/impl/keyguard/CameraWidgetFrame.java b/policy/src/com/android/internal/policy/impl/keyguard/CameraWidgetFrame.java index db7e231b19f2..b38a9ed2934c 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/CameraWidgetFrame.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/CameraWidgetFrame.java @@ -25,6 +25,7 @@ import android.os.Handler; import android.os.SystemClock; import android.util.Log; import android.view.LayoutInflater; +import android.view.MotionEvent; import android.view.View; import android.widget.FrameLayout; import android.widget.ImageView; @@ -32,10 +33,11 @@ import android.widget.ImageView.ScaleType; import com.android.internal.policy.impl.keyguard.KeyguardActivityLauncher.CameraWidgetInfo; -public class CameraWidgetFrame extends KeyguardWidgetFrame { +public class CameraWidgetFrame extends KeyguardWidgetFrame implements View.OnClickListener { private static final String TAG = CameraWidgetFrame.class.getSimpleName(); private static final boolean DEBUG = KeyguardHostView.DEBUG; private static final int WIDGET_ANIMATION_DURATION = 250; + private static final int WIDGET_WAIT_DURATION = 650; interface Callbacks { void onLaunchingCamera(); @@ -49,6 +51,10 @@ public class CameraWidgetFrame extends KeyguardWidgetFrame { private View mWidgetView; private long mLaunchCameraStart; private boolean mRendered; + private boolean mActive; + private boolean mChallengeActive; + private boolean mTransitioning; + private boolean mDown; private final Runnable mLaunchCameraRunnable = new Runnable() { @Override @@ -63,6 +69,12 @@ public class CameraWidgetFrame extends KeyguardWidgetFrame { render(); }}; + private final Runnable mTransitionToCameraRunnable = new Runnable() { + @Override + public void run() { + transitionToCamera(); + }}; + private CameraWidgetFrame(Context context, Callbacks callbacks, KeyguardActivityLauncher activityLauncher) { super(context); @@ -93,10 +105,12 @@ public class CameraWidgetFrame extends KeyguardWidgetFrame { CameraWidgetFrame cameraWidgetFrame = new CameraWidgetFrame(context, callbacks, launcher); cameraWidgetFrame.addView(preview); cameraWidgetFrame.mWidgetView = widgetView; + preview.setOnClickListener(cameraWidgetFrame); return cameraWidgetFrame; } private static View inflateWidgetView(Context context, CameraWidgetInfo widgetInfo) { + if (DEBUG) Log.d(TAG, "inflateWidgetView: " + widgetInfo.contextPackage); View widgetView = null; Exception exception = null; try { @@ -118,6 +132,7 @@ public class CameraWidgetFrame extends KeyguardWidgetFrame { } private static View inflateGenericWidgetView(Context context) { + if (DEBUG) Log.d(TAG, "inflateGenericWidgetView"); ImageView iv = new ImageView(context); iv.setImageResource(com.android.internal.R.drawable.ic_lockscreen_camera); iv.setScaleType(ScaleType.CENTER); @@ -154,30 +169,64 @@ public class CameraWidgetFrame extends KeyguardWidgetFrame { } private void transitionToCamera() { - int startWidth = getChildAt(0).getWidth(); - int startHeight = getChildAt(0).getHeight(); + if (mTransitioning || mChallengeActive || mDown) return; + + mTransitioning = true; + + final View child = getChildAt(0); + final View root = getRootView(); + + final int startWidth = child.getWidth(); + final int startHeight = child.getHeight(); + + final int finishWidth = root.getWidth(); + final int finishHeight = root.getHeight(); + + final float scaleX = (float) finishWidth / startWidth; + final float scaleY = (float) finishHeight / startHeight; + final float scale = Math.round( Math.max(scaleX, scaleY) * 100) / 100f; - int finishWidth = getRootView().getWidth(); - int finishHeight = getRootView().getHeight(); + final int[] loc = new int[2]; + root.getLocationInWindow(loc); + final int finishCenter = loc[1] + finishHeight / 2; - float scaleX = (float) finishWidth / startWidth; - float scaleY = (float) finishHeight / startHeight; + child.getLocationInWindow(loc); + final int startCenter = loc[1] + startHeight / 2; + + if (DEBUG) Log.d(TAG, String.format("Transitioning to camera. " + + "(start=%sx%s, finish=%sx%s, scale=%s,%s, startCenter=%s, finishCenter=%s)", + startWidth, startHeight, + finishWidth, finishHeight, + scaleX, scaleY, + startCenter, finishCenter)); - float scale = Math.max(scaleX, scaleY); animate() .scaleX(scale) .scaleY(scale) + .translationY(finishCenter - startCenter) .setDuration(WIDGET_ANIMATION_DURATION) .withEndAction(mLaunchCameraRunnable) .start(); + mCallbacks.onLaunchingCamera(); } @Override + public void onClick(View v) { + if (DEBUG) Log.d(TAG, "clicked"); + if (mTransitioning) return; + if (mActive && !mChallengeActive) { + cancelTransitionToCamera(); + transitionToCamera(); + } + } + + @Override public void onWindowFocusChanged(boolean hasWindowFocus) { super.onWindowFocusChanged(hasWindowFocus); - + if (DEBUG) Log.d(TAG, "onWindowFocusChanged: " + hasWindowFocus); if (!hasWindowFocus) { + mTransitioning = false; if (mLaunchCameraStart > 0) { long launchTime = SystemClock.uptimeMillis() - mLaunchCameraStart; if (DEBUG) Log.d(TAG, String.format("Camera took %sms to launch", launchTime)); @@ -189,26 +238,73 @@ public class CameraWidgetFrame extends KeyguardWidgetFrame { @Override public void onActive(boolean isActive) { - if (isActive) { - mHandler.post(new Runnable(){ - @Override - public void run() { - transitionToCamera(); - }}); + mActive = isActive; + if (mActive) { + rescheduleTransitionToCamera(); } else { reset(); } } + @Override + public boolean onUserInteraction(int action) { + if (mTransitioning) return true; + if (DEBUG) Log.d(TAG, "onUserInteraction " + action); + mDown = action == MotionEvent.ACTION_DOWN || action == MotionEvent.ACTION_MOVE; + if (mActive && !mChallengeActive) { + rescheduleTransitionToCamera(); + } + return false; + } + + @Override + protected void onFocusLost() { + Log.d(TAG, "onFocusLost"); + cancelTransitionToCamera(); + super.onFocusLost(); + } + + @Override + public void onChallengeActive(boolean challengeActive) { + if (DEBUG) Log.d(TAG, "onChallengeActive: " + challengeActive); + mChallengeActive = challengeActive; + if (mTransitioning) return; + if (mActive) { + if (mChallengeActive) { + cancelTransitionToCamera(); + } else { + rescheduleTransitionToCamera(); + } + } + } + + private void rescheduleTransitionToCamera() { + if (DEBUG) Log.d(TAG, "rescheduleTransitionToCamera at " + SystemClock.uptimeMillis()); + mHandler.removeCallbacks(mTransitionToCameraRunnable); + mHandler.postDelayed(mTransitionToCameraRunnable, WIDGET_WAIT_DURATION); + } + + private void cancelTransitionToCamera() { + if (DEBUG) Log.d(TAG, "cancelTransitionToCamera at " + SystemClock.uptimeMillis()); + mHandler.removeCallbacks(mTransitionToCameraRunnable); + } + private void onCameraLaunched() { - reset(); mCallbacks.onCameraLaunched(); + reset(); } private void reset() { + if (DEBUG) Log.d(TAG, "reset"); + mLaunchCameraStart = 0; + mTransitioning = false; + mChallengeActive = false; + mDown = false; + cancelTransitionToCamera(); animate().cancel(); setScaleX(1); setScaleY(1); + setTranslationY(0); } @Override diff --git a/policy/src/com/android/internal/policy/impl/keyguard/CheckLongPressHelper.java b/policy/src/com/android/internal/policy/impl/keyguard/CheckLongPressHelper.java index 020fdbabb64b..4825e23ec9c9 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/CheckLongPressHelper.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/CheckLongPressHelper.java @@ -60,8 +60,10 @@ public class CheckLongPressHelper { public void onMove(MotionEvent ev) { float x = ev.getX(); float y = ev.getY(); + boolean xMoved = Math.abs(mDownX - x) > mScaledTouchSlop; + boolean yMoved = Math.abs(mDownY - y) > mScaledTouchSlop; - if (Math.sqrt(Math.pow(mDownX - x, 2) + Math.pow(mDownY - y, 2)) > mScaledTouchSlop) { + if (xMoved || yMoved) { cancelLongPress(); } } @@ -77,4 +79,4 @@ public class CheckLongPressHelper { public boolean hasPerformedLongPress() { return mHasPerformedLongPress; } -}
\ No newline at end of file +} diff --git a/policy/src/com/android/internal/policy/impl/keyguard/FaceUnlock.java b/policy/src/com/android/internal/policy/impl/keyguard/FaceUnlock.java index 000acb19b902..cae598cc7d99 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/FaceUnlock.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/FaceUnlock.java @@ -151,6 +151,14 @@ public class FaceUnlock implements BiometricSensorUnlock, Handler.Callback { } boolean mWasRunning = mIsRunning; + try { + if (mService != null) { + mService.makeInvisible(); + } + } catch (RemoteException e) { + Log.e(TAG, "Caught exception making Face Unlock invisible: " + e.toString()); + } + stopUi(); if (mBoundToService) { diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardAbsKeyInputView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardAbsKeyInputView.java index 2eb10fe12795..9c21830cf710 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardAbsKeyInputView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardAbsKeyInputView.java @@ -91,9 +91,6 @@ public abstract class KeyguardAbsKeyInputView extends LinearLayout @Override protected void onFinishInflate() { - // We always set a dummy NavigationManager to avoid null checks - mSecurityMessageDisplay = new KeyguardNavigationManager(null); - mLockPatternUtils = new LockPatternUtils(mContext); mPasswordEntry = (TextView) findViewById(R.id.passwordEntry); @@ -120,6 +117,7 @@ public abstract class KeyguardAbsKeyInputView extends LinearLayout } } }); + mSecurityMessageDisplay = new KeyguardMessageArea.Helper(this); } @Override @@ -219,12 +217,6 @@ public abstract class KeyguardAbsKeyInputView extends LinearLayout public void afterTextChanged(Editable s) { } - @Override - public void setSecurityMessageDisplay(SecurityMessageDisplay display) { - mSecurityMessageDisplay = display; - reset(); - } - // Cause a VIRTUAL_KEY vibration public void doHapticKeyClick() { if (mEnableHaptics) { diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardAccountView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardAccountView.java index ea7a8e7e30e1..9c877550d4e0 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardAccountView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardAccountView.java @@ -84,9 +84,6 @@ public class KeyguardAccountView extends LinearLayout implements KeyguardSecurit protected void onFinishInflate() { super.onFinishInflate(); - // We always set a dummy NavigationManager to avoid null checks - mSecurityMessageDisplay = new KeyguardNavigationManager(null); - mLogin = (EditText) findViewById(R.id.login); mLogin.setFilters(new InputFilter[] { new LoginFilter.UsernameFilterGeneric() } ); mLogin.addTextChangedListener(this); @@ -96,6 +93,8 @@ public class KeyguardAccountView extends LinearLayout implements KeyguardSecurit mOk = (Button) findViewById(R.id.ok); mOk.setOnClickListener(this); + + mSecurityMessageDisplay = new KeyguardMessageArea.Helper(this); reset(); } @@ -317,12 +316,6 @@ public class KeyguardAccountView extends LinearLayout implements KeyguardSecurit } @Override - public void setSecurityMessageDisplay(SecurityMessageDisplay display) { - mSecurityMessageDisplay = display; - reset(); - } - - @Override public void showUsabilityHint() { } } diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java index a224a4219bbc..4c500696cc4d 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java @@ -17,11 +17,13 @@ package com.android.internal.policy.impl.keyguard; import android.app.ActivityManagerNative; +import android.app.ActivityOptions; import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; +import android.os.Bundle; import android.os.RemoteException; import android.os.UserHandle; import android.provider.MediaStore; @@ -97,13 +99,13 @@ public abstract class KeyguardActivityLauncher { // For now, we'll treat this like launching any other app from secure keyguard. // When they do, user sees the system's ResolverActivity which lets them choose // which secure camera to use. - launchActivity(SECURE_CAMERA_INTENT, false); + launchActivity(SECURE_CAMERA_INTENT, false, false); } else { - launchActivity(SECURE_CAMERA_INTENT, true); + launchActivity(SECURE_CAMERA_INTENT, true, false); } } else { // Launch the normal camera - launchActivity(INSECURE_CAMERA_INTENT, false); + launchActivity(INSECURE_CAMERA_INTENT, false, false); } } @@ -113,8 +115,11 @@ public abstract class KeyguardActivityLauncher { * @param showsWhileLocked true if the activity can be run on top of keyguard. * See {@link WindowManager#FLAG_SHOW_WHEN_LOCKED} */ - public void launchActivity(final Intent intent, boolean showsWhileLocked) { + public void launchActivity(final Intent intent, boolean showsWhileLocked, boolean animate) { final Context context = getContext(); + final Bundle animation = animate ? null : + ActivityOptions.makeCustomAnimation(context, com.android.internal.R.anim.fade_in, + com.android.internal.R.anim.fade_out).toBundle(); LockPatternUtils lockPatternUtils = getLockPatternUtils(); intent.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK @@ -128,7 +133,8 @@ public abstract class KeyguardActivityLauncher { Log.w(TAG, "can't dismiss keyguard on launch"); } try { - context.startActivityAsUser(intent, new UserHandle(UserHandle.USER_CURRENT)); + context.startActivityAsUser(intent, animation, + new UserHandle(UserHandle.USER_CURRENT)); } catch (ActivityNotFoundException e) { Log.w(TAG, "Activity not found for intent + " + intent.getAction()); } @@ -139,7 +145,8 @@ public abstract class KeyguardActivityLauncher { callback.setOnDismissRunnable(new Runnable() { @Override public void run() { - context.startActivityAsUser(intent, new UserHandle(UserHandle.USER_CURRENT)); + context.startActivityAsUser(intent, animation, + new UserHandle(UserHandle.USER_CURRENT)); } }); callback.dismiss(false); diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardFaceUnlockView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardFaceUnlockView.java index 4aa6b05dc7b8..a88456849a45 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardFaceUnlockView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardFaceUnlockView.java @@ -35,7 +35,6 @@ public class KeyguardFaceUnlockView extends LinearLayout implements KeyguardSecu private KeyguardSecurityCallback mKeyguardSecurityCallback; private LockPatternUtils mLockPatternUtils; private BiometricSensorUnlock mBiometricUnlock; - private SecurityMessageDisplay mSecurityMessageDisplay; private View mFaceUnlockAreaView; private ImageButton mCancelButton; @@ -86,7 +85,7 @@ public class KeyguardFaceUnlockView extends LinearLayout implements KeyguardSecu public void onPause() { if (DEBUG) Log.d(TAG, "onPause()"); if (mBiometricUnlock != null) { - mBiometricUnlock.stopAndShowBackup(); + mBiometricUnlock.stop(); } KeyguardUpdateMonitor.getInstance(mContext).removeCallback(mUpdateCallback); } @@ -215,11 +214,6 @@ public class KeyguardFaceUnlockView extends LinearLayout implements KeyguardSecu }; @Override - public void setSecurityMessageDisplay(SecurityMessageDisplay display) { - mSecurityMessageDisplay = display; - } - - @Override public void showUsabilityHint() { } } diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java index b8467299a46a..ec89da25840a 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java @@ -249,14 +249,6 @@ public class KeyguardHostView extends KeyguardViewBase { mViewMediatorCallback.onUserActivityTimeoutChanged(); } } - - @Override - public void onPageSwitch(int newPageIndex) { - if (!isCameraOrAdd(newPageIndex)) { - if (DEBUG) Log.d(TAG, "Setting sticky widget index: " + newPageIndex); - mLockPatternUtils.setStickyWidgetIndex(newPageIndex); - } - } }; @Override @@ -633,19 +625,7 @@ public class KeyguardHostView extends KeyguardViewBase { View v = inflater.inflate(layoutId, this, false); mSecurityViewContainer.addView(v); updateSecurityView(v); - - view = (KeyguardSecurityView) v; - TextView navigationText = ((TextView) findViewById(R.id.keyguard_message_area)); - - // Some devices can fit a navigation area, others cannot. On devices that cannot, - // we display the security message in status area. - if (navigationText != null) { - view.setSecurityMessageDisplay(new KeyguardNavigationManager(navigationText)); - } else { - if (mKeyguardStatusViewManager != null) { - view.setSecurityMessageDisplay(mKeyguardStatusViewManager); - } - } + view = (KeyguardSecurityView)v; } if (view instanceof KeyguardSelectorView) { @@ -737,6 +717,7 @@ public class KeyguardHostView extends KeyguardViewBase { @Override public void onScreenTurnedOff() { if (DEBUG) Log.d(TAG, "screen off, instance " + Integer.toHexString(hashCode())); + saveStickyWidgetIndex(); showPrimarySecurityScreen(true); getSecurityView(mCurrentSecuritySelection).onPause(); } @@ -854,15 +835,14 @@ public class KeyguardHostView extends KeyguardViewBase { @Override public void onCameraLaunched() { + if (isCameraPage(mAppWidgetContainer.getCurrentPage())) { + mAppWidgetContainer.scrollLeft(); + } SlidingChallengeLayout slider = locateSlider(); if (slider != null) { slider.showHandle(true); slider.showChallenge(true); } - View v = mAppWidgetContainer.getChildAt(mAppWidgetContainer.getCurrentPage()); - if (v instanceof CameraWidgetFrame) { - mAppWidgetContainer.scrollLeft(); - } } private SlidingChallengeLayout locateSlider() { @@ -963,13 +943,6 @@ public class KeyguardHostView extends KeyguardViewBase { } }); } - - KeyguardStatusView ksv = (KeyguardStatusView) - findViewById(R.id.keyguard_status_view_face_palm); - if (ksv != null) { - mKeyguardStatusViewManager = ksv.getManager(); - } - } private void addWidgetsFromSettings() { @@ -1050,6 +1023,8 @@ public class KeyguardHostView extends KeyguardViewBase { @Override public Parcelable onSaveInstanceState() { + if (DEBUG) Log.d(TAG, "onSaveInstanceState"); + saveStickyWidgetIndex(); Parcelable superState = super.onSaveInstanceState(); SavedState ss = new SavedState(superState); ss.transportState = mTransportState; @@ -1058,6 +1033,7 @@ public class KeyguardHostView extends KeyguardViewBase { @Override public void onRestoreInstanceState(Parcelable state) { + if (DEBUG) Log.d(TAG, "onRestoreInstanceState"); if (!(state instanceof SavedState)) { super.onRestoreInstanceState(state); return; @@ -1068,70 +1044,82 @@ public class KeyguardHostView extends KeyguardViewBase { post(mSwitchPageRunnable); } + @Override + public void onWindowFocusChanged(boolean hasWindowFocus) { + super.onWindowFocusChanged(hasWindowFocus); + if (DEBUG) Log.d(TAG, "Window is " + (hasWindowFocus ? "focused" : "unfocused")); + if (!hasWindowFocus) { + saveStickyWidgetIndex(); + } + } + private void showAppropriateWidgetPage() { - boolean music = mTransportControl.isMusicPlaying() || mTransportState == TRANSPORT_VISIBLE; - if (music) { + boolean isMusicPlaying = + mTransportControl.isMusicPlaying() || mTransportState == TRANSPORT_VISIBLE; + if (isMusicPlaying) { mTransportState = TRANSPORT_VISIBLE; } else if (mTransportState == TRANSPORT_VISIBLE) { mTransportState = TRANSPORT_INVISIBLE; } - int pageToShow = getAppropriateWidgetPage(); + int pageToShow = getAppropriateWidgetPage(isMusicPlaying); mAppWidgetContainer.setCurrentPage(pageToShow); } - private boolean isCameraOrAdd(int pageIndex) { + private boolean isCameraPage(int pageIndex) { + View v = mAppWidgetContainer.getChildAt(pageIndex); + return v != null && v instanceof CameraWidgetFrame; + } + + private boolean isAddPage(int pageIndex) { View v = mAppWidgetContainer.getChildAt(pageIndex); - return v.getId() == R.id.keyguard_add_widget || v instanceof CameraWidgetFrame; + return v != null && v.getId() == R.id.keyguard_add_widget; } - private int getAppropriateWidgetPage() { + private int getAppropriateWidgetPage(boolean isMusicPlaying) { // assumes at least one widget (besides camera + add) - boolean music = mTransportControl.isMusicPlaying() || mTransportState == TRANSPORT_VISIBLE; // if music playing, show transport - if (music) { + if (isMusicPlaying) { if (DEBUG) Log.d(TAG, "Music playing, show transport"); return mAppWidgetContainer.indexOfChild(mTransportControl); } - // if multi-user applicable, show it - UserManager userManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE); - View multiUserView = findViewById(R.id.keyguard_multi_user_selector); - int multiUserPosition = mAppWidgetContainer.indexOfChild(multiUserView); - if (multiUserPosition != -1 && userManager.getUsers(true).size() > 1) { - if (DEBUG) Log.d(TAG, "Multi-user applicable, show it"); - return multiUserPosition; - } - - // if we have a sticky widget, show it - int stickyWidgetIndex = mLockPatternUtils.getStickyWidgetIndex(); + // if we have a valid sticky widget, show it + int stickyWidgetIndex = mLockPatternUtils.getStickyAppWidgetIndex(); if (stickyWidgetIndex > -1 && stickyWidgetIndex < mAppWidgetContainer.getChildCount() - && !isCameraOrAdd(stickyWidgetIndex)) { - if (DEBUG) Log.d(TAG, "Sticky widget found, show it"); + && !isAddPage(stickyWidgetIndex) + && !isCameraPage(stickyWidgetIndex)) { + if (DEBUG) Log.d(TAG, "Valid sticky widget found, show page " + stickyWidgetIndex); return stickyWidgetIndex; } - // if we have a status view, show it - View statusView = findViewById(R.id.keyguard_status_view); - int statusViewIndex = mAppWidgetContainer.indexOfChild(statusView); - if (statusViewIndex > -1) { - if (DEBUG) Log.d(TAG, "Status widget found, show it"); - return mAppWidgetContainer.indexOfChild(statusView); - } - - // else the right-most (except for camera) + // else show the right-most widget (except for camera) int rightMost = mAppWidgetContainer.getChildCount() - 1; - if (mAppWidgetContainer.getChildAt(rightMost) instanceof CameraWidgetFrame) { + if (isCameraPage(rightMost)) { rightMost--; } - if (DEBUG) Log.d(TAG, "Show right-most"); + if (DEBUG) Log.d(TAG, "Show right-most page " + rightMost); return rightMost; } + private void saveStickyWidgetIndex() { + int stickyWidgetIndex = mAppWidgetContainer.getCurrentPage(); + if (isAddPage(stickyWidgetIndex)) { + stickyWidgetIndex++; + } + if (isCameraPage(stickyWidgetIndex)) { + stickyWidgetIndex--; + } + if (stickyWidgetIndex < 0 || stickyWidgetIndex >= mAppWidgetContainer.getChildCount()) { + stickyWidgetIndex = -1; + } + if (DEBUG) Log.d(TAG, "saveStickyWidgetIndex: " + stickyWidgetIndex); + mLockPatternUtils.setStickyAppWidgetIndex(stickyWidgetIndex); + } + private void enableUserSelectorIfNecessary() { - // if there are multiple users, we need to add the multi-user switcher widget to the - // keyguard. + // if there are multiple users, we need to enable to multi-user switcher UserManager mUm = (UserManager) mContext.getSystemService(Context.USER_SERVICE); List<UserInfo> users = mUm.getUsers(true); @@ -1213,4 +1201,10 @@ public class KeyguardHostView extends KeyguardViewBase { return false; } + /** + * Dismisses the keyguard by going to the next screen or making it gone. + */ + public void dismiss() { + showNextSecurityScreenOrFinish(false); + } } diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardMessageArea.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardMessageArea.java new file mode 100644 index 000000000000..ca78cf95a7eb --- /dev/null +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardMessageArea.java @@ -0,0 +1,215 @@ +/* + * Copyright (C) 2011 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.internal.policy.impl.keyguard; + +import android.content.ContentResolver; +import android.content.Context; +import android.os.Handler; +import android.os.Looper; +import android.os.UserHandle; +import android.provider.Settings; +import android.text.TextUtils; +import android.util.AttributeSet; +import android.view.View; +import android.widget.TextView; + +import libcore.util.MutableInt; + +import com.android.internal.R; + +/*** + * Manages a number of views inside of the given layout. See below for a list of widgets. + */ +class KeyguardMessageArea extends TextView { + static final int CHARGING_ICON = 0; //R.drawable.ic_lock_idle_charging; + static final int BATTERY_LOW_ICON = 0; //R.drawable.ic_lock_idle_low_battery; + + static final int SECURITY_MESSAGE_DURATION = 5000; + static final String SEPARATOR = " "; + + // are we showing battery information? + boolean mShowingBatteryInfo = false; + + // last known plugged in state + boolean mPluggedIn = false; + + // last known battery level + int mBatteryLevel = 100; + + KeyguardUpdateMonitor mUpdateMonitor; + + // Timeout before we reset the message to show charging/owner info + long mTimeout = SECURITY_MESSAGE_DURATION; + + // Shadowed text values + protected boolean mBatteryCharged; + protected boolean mBatteryIsLow; + + private Handler mHandler; + + CharSequence mMessage; + boolean mShowingMessage; + Runnable mClearMessageRunnable = new Runnable() { + @Override + public void run() { + mMessage = null; + mShowingMessage = false; + update(); + } + }; + + public static class Helper implements SecurityMessageDisplay { + KeyguardMessageArea mMessageArea; + Helper(View v) { + mMessageArea = (KeyguardMessageArea) v.findViewById(R.id.keyguard_message_area); + if (mMessageArea == null) { + throw new RuntimeException("Can't find keyguard_message_area in " + v.getClass()); + } + } + + public void setMessage(CharSequence msg, boolean important) { + if (!TextUtils.isEmpty(msg) && important) { + mMessageArea.mMessage = msg; + mMessageArea.securityMessageChanged(); + } + } + + public void setMessage(int resId, boolean important) { + if (resId != 0 && important) { + mMessageArea.mMessage = mMessageArea.getContext().getResources().getText(resId); + mMessageArea.securityMessageChanged(); + } + } + + public void setMessage(int resId, boolean important, Object... formatArgs) { + if (resId != 0 && important) { + mMessageArea.mMessage = mMessageArea.getContext().getString(resId, formatArgs); + mMessageArea.securityMessageChanged(); + } + } + + @Override + public void setTimeout(int timeoutMs) { + mMessageArea.mTimeout = timeoutMs; + } + } + + private KeyguardUpdateMonitorCallback mInfoCallback = new KeyguardUpdateMonitorCallback() { + @Override + public void onRefreshBatteryInfo(KeyguardUpdateMonitor.BatteryStatus status) { + mShowingBatteryInfo = status.isPluggedIn() || status.isBatteryLow(); + mPluggedIn = status.isPluggedIn(); + mBatteryLevel = status.level; + mBatteryCharged = status.isCharged(); + mBatteryIsLow = status.isBatteryLow(); + update(); + } + }; + + public KeyguardMessageArea(Context context) { + this(context, null); + } + + public KeyguardMessageArea(Context context, AttributeSet attrs) { + super(context, attrs); + + // This is required to ensure marquee works + setSelected(true); + + // Registering this callback immediately updates the battery state, among other things. + mUpdateMonitor = KeyguardUpdateMonitor.getInstance(getContext()); + mUpdateMonitor.registerCallback(mInfoCallback); + mHandler = new Handler(Looper.myLooper()); + + update(); + } + + public void securityMessageChanged() { + mShowingMessage = true; + update(); + mHandler.removeCallbacks(mClearMessageRunnable); + if (mTimeout > 0) { + mHandler.postDelayed(mClearMessageRunnable, mTimeout); + } + announceForAccessibility(getText()); + } + + /** + * Update the status lines based on these rules: + * AlarmStatus: Alarm state always gets it's own line. + * Status1 is shared between help, battery status and generic unlock instructions, + * prioritized in that order. + * @param showStatusLines status lines are shown if true + */ + void update() { + MutableInt icon = new MutableInt(0); + CharSequence status = concat(getChargeInfo(icon), getOwnerInfo(), getCurrentMessage()); + setCompoundDrawablesWithIntrinsicBounds(icon.value, 0, 0, 0); + setText(status); + } + + + private CharSequence concat(Object... args) { + StringBuilder b = new StringBuilder(); + for (int i = 0; i < args.length; i++) { + final Object arg = args[i]; + if (arg instanceof CharSequence) { + b.append((CharSequence)args[i]); + b.append(SEPARATOR); + } else if (arg instanceof String) { + b.append((String)args[i]); + b.append(SEPARATOR); + } + } + return b.toString(); + } + + + CharSequence getCurrentMessage() { + return mShowingMessage ? mMessage : null; + } + + String getOwnerInfo() { + ContentResolver res = getContext().getContentResolver(); + final boolean ownerInfoEnabled = Settings.Secure.getIntForUser(res, + Settings.Secure.LOCK_SCREEN_OWNER_INFO_ENABLED, 1, UserHandle.USER_CURRENT) != 0; + return ownerInfoEnabled && !mShowingMessage ? + Settings.Secure.getStringForUser(res, Settings.Secure.LOCK_SCREEN_OWNER_INFO, + UserHandle.USER_CURRENT) : null; + } + + private CharSequence getChargeInfo(MutableInt icon) { + CharSequence string = null; + if (mShowingBatteryInfo && !mShowingMessage) { + // Battery status + if (mPluggedIn) { + // Charging, charged or waiting to charge. + string = getContext().getString(mBatteryCharged ? + com.android.internal.R.string.lockscreen_charged + :com.android.internal.R.string.lockscreen_plugged_in, mBatteryLevel); + icon.value = CHARGING_ICON; + } else if (mBatteryIsLow) { + // Battery is low + string = getContext().getString( + com.android.internal.R.string.lockscreen_low_battery); + icon.value = BATTERY_LOW_ICON; + } + } + return string; + } + +} diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardNavigationManager.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardNavigationManager.java deleted file mode 100644 index cec2668ff23e..000000000000 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardNavigationManager.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (C) 2012 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.internal.policy.impl.keyguard; - -import android.widget.TextView; - -public class KeyguardNavigationManager implements SecurityMessageDisplay { - - private TextView mMessageArea; - - public KeyguardNavigationManager(TextView messageArea) { - if (messageArea != null) { - mMessageArea = messageArea; - mMessageArea.setSelected(true); // Make marquee work - } - } - - public void setMessage(CharSequence msg, boolean important) { - if (mMessageArea == null) return; - mMessageArea.setText(msg); - mMessageArea.announceForAccessibility(mMessageArea.getText()); - } - - public void setMessage(int resId, boolean important) { - if (mMessageArea == null) return; - if (resId != 0) { - mMessageArea.setText(resId); - mMessageArea.announceForAccessibility(mMessageArea.getText()); - } else { - mMessageArea.setText(""); - } - } - - public void setMessage(int resId, boolean important, Object... formatArgs) { - if (mMessageArea == null) return; - if (resId != 0) { - mMessageArea.setText(mMessageArea.getContext().getString(resId, formatArgs)); - mMessageArea.announceForAccessibility(mMessageArea.getText()); - } else { - mMessageArea.setText(""); - } - } -} diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPINView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPINView.java index 5cdf4d394f74..bea9aec13ed5 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPINView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPINView.java @@ -33,13 +33,6 @@ import com.android.internal.R; public class KeyguardPINView extends KeyguardAbsKeyInputView implements KeyguardSecurityView, OnEditorActionListener, TextWatcher { - // To avoid accidental lockout due to events while the device in in the pocket, ignore - // any passwords with length less than or equal to this length. - private static final int MINIMUM_PASSWORD_LENGTH_BEFORE_REPORT = 3; - - // Enable this if we want to hide the on-screen PIN keyboard when a physical one is showing - private static final boolean ENABLE_HIDE_KEYBOARD = false; - public KeyguardPINView(Context context) { this(context, null); } diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPatternView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPatternView.java index 408a9c8c22af..6b3446add9a1 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPatternView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPatternView.java @@ -110,10 +110,6 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit @Override protected void onFinishInflate() { super.onFinishInflate(); - - // We always set a dummy NavigationManager to avoid null checks - mSecurityMessageDisplay = new KeyguardNavigationManager(null); - mLockPatternUtils = mLockPatternUtils == null ? new LockPatternUtils(mContext) : mLockPatternUtils; @@ -139,6 +135,7 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit setFocusableInTouchMode(true); maybeEnableFallback(mContext); + mSecurityMessageDisplay = new KeyguardMessageArea.Helper(this); } private void updateFooter(FooterMode mode) { @@ -376,12 +373,6 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit public KeyguardSecurityCallback getCallback() { return mCallback; } - - @Override - public void setSecurityMessageDisplay(SecurityMessageDisplay display) { - mSecurityMessageDisplay = display; - reset(); - } } diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityView.java index c3684c4ab9ef..26517435d8f0 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityView.java @@ -61,7 +61,9 @@ public interface KeyguardSecurityView { */ KeyguardSecurityCallback getCallback(); - void setSecurityMessageDisplay(SecurityMessageDisplay display); - + /** + * Instruct the view to show usability hints, if any. + * + */ void showUsabilityHint(); } diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityViewFlipper.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityViewFlipper.java index 9cdbc2de203e..58cf56767b0c 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityViewFlipper.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityViewFlipper.java @@ -119,14 +119,6 @@ public class KeyguardSecurityViewFlipper extends ViewFlipper implements Keyguard } @Override - public void setSecurityMessageDisplay(SecurityMessageDisplay display) { - KeyguardSecurityView ksv = getSecurityView(); - if (ksv != null) { - ksv.setSecurityMessageDisplay(display); - } - } - - @Override public void showUsabilityHint() { KeyguardSecurityView ksv = getSecurityView(); if (ksv != null) { diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSelectorView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSelectorView.java index eba9a76d0309..938e3bd63aac 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSelectorView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSelectorView.java @@ -59,7 +59,7 @@ public class KeyguardSelectorView extends LinearLayout implements KeyguardSecuri ((SearchManager) mContext.getSystemService(Context.SEARCH_SERVICE)) .getAssistIntent(mContext, UserHandle.USER_CURRENT); if (assistIntent != null) { - mActivityLauncher.launchActivity(assistIntent, false); + mActivityLauncher.launchActivity(assistIntent, false, true); } else { Log.w(TAG, "Failed to get intent for assist activity"); } @@ -261,8 +261,4 @@ public class KeyguardSelectorView extends LinearLayout implements KeyguardSecuri public KeyguardSecurityCallback getCallback() { return mCallback; } - - @Override - public void setSecurityMessageDisplay(SecurityMessageDisplay display) { - } } diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSimPinView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSimPinView.java index 018a1aa752e0..fcf45ff8a880 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSimPinView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSimPinView.java @@ -76,9 +76,6 @@ public class KeyguardSimPinView extends LinearLayout protected void onFinishInflate() { super.onFinishInflate(); - // We always set a dummy NavigationManager to avoid null checks - mSecurityMessageDisplay = new KeyguardNavigationManager(null); - mPinEntry = (EditText) findViewById(R.id.sim_pin_entry); mPinEntry.setOnEditorActionListener(this); mPinEntry.addTextChangedListener(this); @@ -103,6 +100,9 @@ public class KeyguardSimPinView extends LinearLayout } }); } + + mSecurityMessageDisplay = new KeyguardMessageArea.Helper(this); + mSecurityMessageDisplay.setTimeout(0); reset(); } @@ -269,9 +269,4 @@ public class KeyguardSimPinView extends LinearLayout public void afterTextChanged(Editable s) { } - @Override - public void setSecurityMessageDisplay(SecurityMessageDisplay display) { - mSecurityMessageDisplay = display; - reset(); - } } diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSimPukView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSimPukView.java index d0585b99f6ea..04658050d9b4 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSimPukView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSimPukView.java @@ -130,10 +130,6 @@ public class KeyguardSimPukView extends LinearLayout implements View.OnClickList @Override protected void onFinishInflate() { super.onFinishInflate(); - - // We always set a dummy NavigationManager to avoid null checks - mSecurityMessageDisplay = new KeyguardNavigationManager(null); - mSimPinEntry = (TextView) findViewById(R.id.sim_pin_entry); mSimPinEntry.setOnEditorActionListener(this); mSimPinEntry.addTextChangedListener(this); @@ -150,6 +146,9 @@ public class KeyguardSimPukView extends LinearLayout implements View.OnClickList }); mKeyboardHelper.setKeyboardMode(PasswordEntryKeyboardHelper.KEYBOARD_MODE_NUMERIC); mKeyboardHelper.setEnableHaptics(mLockPatternUtils.isTactileFeedbackEnabled()); + + mSecurityMessageDisplay = new KeyguardMessageArea.Helper(this); + mSecurityMessageDisplay.setTimeout(0); // don't show ownerinfo/charging status by default reset(); } @@ -338,10 +337,4 @@ public class KeyguardSimPukView extends LinearLayout implements View.OnClickList @Override public void afterTextChanged(Editable s) { } - - @Override - public void setSecurityMessageDisplay(SecurityMessageDisplay display) { - mSecurityMessageDisplay = display; - reset(); - } } diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardStatusViewManager.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardStatusViewManager.java index 2837a66a64a6..b4bd6e9e7a6c 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardStatusViewManager.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardStatusViewManager.java @@ -326,4 +326,8 @@ class KeyguardStatusViewManager implements SecurityMessageDisplay { return mContainer.getContext(); } + @Override + public void setTimeout(int timeout_ms) { + } + } diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java index 9fa14f5f3692..b224c0898f4d 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java @@ -65,6 +65,7 @@ public class KeyguardViewManager { private FrameLayout mKeyguardHost; private KeyguardHostView mKeyguardView; + private boolean mScreenOn = false; private LockPatternUtils mLockPatternUtils; public interface ShowListener { @@ -302,6 +303,7 @@ public class KeyguardViewManager { public synchronized void onScreenTurnedOff() { if (DEBUG) Log.d(TAG, "onScreenTurnedOff()"); + mScreenOn = false; if (mKeyguardView != null) { mKeyguardView.onScreenTurnedOff(); } @@ -310,6 +312,7 @@ public class KeyguardViewManager { public synchronized void onScreenTurnedOn( final KeyguardViewManager.ShowListener showListener) { if (DEBUG) Log.d(TAG, "onScreenTurnedOn()"); + mScreenOn = true; if (mKeyguardView != null) { mKeyguardView.onScreenTurnedOn(); @@ -398,6 +401,15 @@ public class KeyguardViewManager { } /** + * Dismisses the keyguard by going to the next screen or making it gone. + */ + public synchronized void dismiss() { + if (mScreenOn) { + mKeyguardView.dismiss(); + } + } + + /** * @return Whether the keyguard is showing */ public synchronized boolean isShowing() { diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java index bc12e96e475f..53cbb39fd832 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java @@ -813,9 +813,7 @@ public class KeyguardViewMediator { } /** - * Enable the keyguard if the settings are appropriate. Return true if all - * work that will happen is done; returns false if the caller can wait for - * the keyguard to be shown. + * Enable the keyguard if the settings are appropriate. */ private void doKeyguardLocked(Bundle options) { // if another app is disabling us, don't show @@ -867,6 +865,13 @@ public class KeyguardViewMediator { } /** + * Dismiss the keyguard through the security layers. + */ + public void dismiss() { + mKeyguardViewManager.dismiss(); + } + + /** * Send message to keyguard telling it to reset its state. * @param options options about how to show the keyguard * @see #handleReset() diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewStateManager.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewStateManager.java index c163b975fbc9..85245ba439b1 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewStateManager.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewStateManager.java @@ -17,20 +17,27 @@ package com.android.internal.policy.impl.keyguard; import android.os.Handler; import android.os.Looper; -import android.util.Log; import android.view.View; public class KeyguardViewStateManager implements SlidingChallengeLayout.OnChallengeScrolledListener { private KeyguardWidgetPager mPagedView; - private int mCurrentPageIndex; private ChallengeLayout mChallengeLayout; private Runnable mHideHintsRunnable; - private KeyguardSecurityView mKeyguardSecurityContainer; private int[] mTmpPoint = new int[2]; + private int[] mTmpLoc = new int[2]; + + private KeyguardSecurityView mKeyguardSecurityContainer; private static final int SCREEN_ON_HINT_DURATION = 1000; + private static final int SCREEN_ON_RING_HINT_DELAY = 300; Handler mMainQueue = new Handler(Looper.myLooper()); + int mLastScrollState = SlidingChallengeLayout.SCROLL_STATE_IDLE; + + // Paged view state + private int mPageListeningToSlider = -1; + private int mCurrentPage = -1; + int mChallengeTop = 0; public KeyguardViewStateManager() { @@ -44,6 +51,13 @@ public class KeyguardViewStateManager implements SlidingChallengeLayout.OnChalle mChallengeLayout = layout; } + public boolean isChallengeShowing() { + if (mChallengeLayout != null) { + return mChallengeLayout.isChallengeShowing(); + } + return false; + } + public void setSecurityViewContainer(KeyguardSecurityView container) { mKeyguardSecurityContainer = container; } @@ -66,28 +80,30 @@ public class KeyguardViewStateManager implements SlidingChallengeLayout.OnChalle } public void onPageSwitch(View newPage, int newPageIndex) { - // Reset the previous page size and ensure the current page is sized appropriately - if (mPagedView != null) { - KeyguardWidgetFrame oldPage = mPagedView.getWidgetPageAt(mCurrentPageIndex); - // Reset the old widget page to full size - if (oldPage != null) { - oldPage.resetSize(); + // Reset the previous page size and ensure the current page is sized appropriately. + // We only modify the page state if it is not currently under control by the slider. + // This prevents conflicts. + if (mPagedView != null && mChallengeLayout != null) { + KeyguardWidgetFrame prevPage = mPagedView.getWidgetPageAt(mCurrentPage); + if (prevPage != null && mCurrentPage != mPageListeningToSlider) { + prevPage.resetSize(); } KeyguardWidgetFrame newCurPage = mPagedView.getWidgetPageAt(newPageIndex); - if (mChallengeLayout.isChallengeOverlapping()) { - sizeWidgetFrameToChallengeTop(newCurPage); + boolean challengeOverlapping = mChallengeLayout.isChallengeOverlapping(); + if (challengeOverlapping && !newCurPage.isSmall() + && mPageListeningToSlider != newPageIndex) { + newCurPage.shrinkWidget(); } } - mCurrentPageIndex = newPageIndex; + mCurrentPage = newPageIndex; } - private void sizeWidgetFrameToChallengeTop(KeyguardWidgetFrame frame) { - if (frame == null) return; + private int getChallengeTopRelativeToFrame(KeyguardWidgetFrame frame, int top) { mTmpPoint[0] = 0; - mTmpPoint[1] = mChallengeTop; + mTmpPoint[1] = top; mapPoint((View) mChallengeLayout, frame, mTmpPoint); - frame.setChallengeTop(mTmpPoint[1]); + return mTmpPoint[1]; } /** @@ -98,15 +114,15 @@ public class KeyguardViewStateManager implements SlidingChallengeLayout.OnChalle * @param toView The view into which the point should be mapped * @param pt The point */ - public void mapPoint(View fromView, View toView, int pt[]) { - int[] loc = new int[2]; - fromView.getLocationInWindow(loc); - int x = loc[0]; - int y = loc[1]; + private void mapPoint(View fromView, View toView, int pt[]) { + fromView.getLocationInWindow(mTmpLoc); + + int x = mTmpLoc[0]; + int y = mTmpLoc[1]; - toView.getLocationInWindow(loc); - int vX = loc[0]; - int vY = loc[1]; + toView.getLocationInWindow(mTmpLoc); + int vX = mTmpLoc[0]; + int vY = mTmpLoc[1]; pt[0] += x - vX; pt[1] += y - vY; @@ -114,20 +130,18 @@ public class KeyguardViewStateManager implements SlidingChallengeLayout.OnChalle @Override public void onScrollStateChanged(int scrollState) { + if (mPagedView == null || mChallengeLayout == null) return; + boolean challengeOverlapping = mChallengeLayout.isChallengeOverlapping(); + if (scrollState == SlidingChallengeLayout.SCROLL_STATE_IDLE) { - if (mPagedView == null) return; + KeyguardWidgetFrame frame = mPagedView.getWidgetPageAt(mPageListeningToSlider); + if (frame == null) return; - boolean challengeOverlapping = mChallengeLayout.isChallengeOverlapping(); - int curPage = mPagedView.getCurrentPage(); - KeyguardWidgetFrame frame = mPagedView.getWidgetPageAt(curPage); - - if (frame != null) { - if (!challengeOverlapping) { - frame.resetSize(); - } else { - sizeWidgetFrameToChallengeTop(frame); - } + if (!challengeOverlapping) { + frame.resetSize(); } + frame.onChallengeActive(mChallengeLayout.isChallengeShowing()); + frame.hideFrame(this); if (challengeOverlapping) { mPagedView.setOnlyAllowEdgeSwipes(true); @@ -140,14 +154,48 @@ public class KeyguardViewStateManager implements SlidingChallengeLayout.OnChalle } else { mKeyguardSecurityContainer.onPause(); } - } else { + mPageListeningToSlider = -1; + } else if (mLastScrollState == SlidingChallengeLayout.SCROLL_STATE_IDLE) { + // Whether dragging or settling, if the last state was idle, we use this signal + // to update the current page who will receive events from the sliding challenge. + // We resize the frame as appropriate. + mPageListeningToSlider = mPagedView.getNextPage(); + KeyguardWidgetFrame frame = mPagedView.getWidgetPageAt(mPageListeningToSlider); + if (frame == null) return; + + frame.showFrame(this); + + // As soon as the security begins sliding, the widget becomes small (if it wasn't + // small to begin with). + if (!frame.isSmall()) { + // We need to fetch the final page, in case the pages are in motion. + mPageListeningToSlider = mPagedView.getNextPage(); + frame.shrinkWidget(); + } // View is on the move. Pause the security view until it completes. mKeyguardSecurityContainer.onPause(); + + frame.onChallengeActive(true); + } + mLastScrollState = scrollState; + } + + @Override + public void onScrollPositionChanged(float scrollPosition, int challengeTop) { + mChallengeTop = challengeTop; + KeyguardWidgetFrame frame = mPagedView.getWidgetPageAt(mPageListeningToSlider); + if (frame != null) { + frame.adjustFrame(getChallengeTopRelativeToFrame(frame, mChallengeTop)); } } public void showUsabilityHints() { - mKeyguardSecurityContainer.showUsabilityHint(); + mMainQueue.postDelayed( new Runnable() { + @Override + public void run() { + mKeyguardSecurityContainer.showUsabilityHint(); + } + } , SCREEN_ON_RING_HINT_DELAY); mPagedView.showInitialPageHints(); mHideHintsRunnable = new Runnable() { @Override @@ -159,10 +207,4 @@ public class KeyguardViewStateManager implements SlidingChallengeLayout.OnChalle mMainQueue.postDelayed(mHideHintsRunnable, SCREEN_ON_HINT_DURATION); } - - @Override - public void onScrollPositionChanged(float scrollPosition, int challengeTop) { - mChallengeTop = challengeTop; - } - } diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetCarousel.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetCarousel.java index 02c32d4d6e32..cf16ef2a715d 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetCarousel.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetCarousel.java @@ -17,12 +17,14 @@ package com.android.internal.policy.impl.keyguard; import android.content.Context; import android.util.AttributeSet; +import android.view.View; import com.android.internal.R; public class KeyguardWidgetCarousel extends KeyguardWidgetPager { private float mAdjacentPagesAngle; + private static float MAX_SCROLL_PROGRESS = 1.3f; private static float CAMERA_DISTANCE = 10000; public KeyguardWidgetCarousel(Context context, AttributeSet attrs) { @@ -39,43 +41,73 @@ public class KeyguardWidgetCarousel extends KeyguardWidgetPager { } protected float getMaxScrollProgress() { - return 1.5f; + return MAX_SCROLL_PROGRESS; + } + + public float getAlphaForPage(int screenCenter, int index) { + View child = getChildAt(index); + if (child == null) return 0f; + + float scrollProgress = getScrollProgress(screenCenter, child, index); + if (!isOverScrollChild(index, scrollProgress)) { + scrollProgress = getBoundedScrollProgress(screenCenter, child, index); + float alpha = 1 - Math.abs(scrollProgress / MAX_SCROLL_PROGRESS); + return alpha; + } else { + return 1f; + } } private void updatePageAlphaValues(int screenCenter) { - boolean isInOverscroll = mOverScrollX < 0 || mOverScrollX > mMaxScrollX; - if (!isInOverscroll) { + if (mChildrenOutlineFadeAnimation != null) { + mChildrenOutlineFadeAnimation.cancel(); + mChildrenOutlineFadeAnimation = null; + } + if (!isReordering(false)) { for (int i = 0; i < getChildCount(); i++) { KeyguardWidgetFrame child = getWidgetPageAt(i); if (child != null) { - float scrollProgress = getScrollProgress(screenCenter, child, i); - if (!isReordering(false)) { - child.setBackgroundAlphaMultiplier( - backgroundAlphaInterpolator(Math.abs(scrollProgress))); - } else { - child.setBackgroundAlphaMultiplier(1f); - } + float alpha = getAlphaForPage(screenCenter, i); + child.setBackgroundAlpha(alpha); + child.setContentAlpha(alpha); } } } + } @Override protected void screenScrolled(int screenCenter) { + mScreenCenter = screenCenter; updatePageAlphaValues(screenCenter); for (int i = 0; i < getChildCount(); i++) { KeyguardWidgetFrame v = getWidgetPageAt(i); - if (v == mDragView) continue; - if (v != null) { - float scrollProgress = getScrollProgress(screenCenter, v, i); + float scrollProgress = getScrollProgress(screenCenter, v, i); + if (v == mDragView || v == null) continue; + v.setCameraDistance(CAMERA_DISTANCE); + + if (isOverScrollChild(i, scrollProgress)) { + v.setRotationY(- OVERSCROLL_MAX_ROTATION * scrollProgress); + v.setOverScrollAmount(Math.abs(scrollProgress), scrollProgress < 0); + } else { + scrollProgress = getBoundedScrollProgress(screenCenter, v, i); int width = v.getMeasuredWidth(); float pivotX = (width / 2f) + scrollProgress * (width / 2f); float pivotY = v.getMeasuredHeight() / 2; float rotationY = - mAdjacentPagesAngle * scrollProgress; - v.setCameraDistance(CAMERA_DISTANCE); v.setPivotX(pivotX); v.setPivotY(pivotY); v.setRotationY(rotationY); + v.setOverScrollAmount(0f, false); + } + + float alpha = v.getAlpha(); + // If the view has 0 alpha, we set it to be invisible so as to prevent + // it from accepting touches + if (alpha == 0) { + v.setVisibility(INVISIBLE); + } else if (v.getVisibility() != VISIBLE) { + v.setVisibility(VISIBLE); } } } diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetFrame.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetFrame.java index 9e1189c3bf26..e9c90a77b55b 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetFrame.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetFrame.java @@ -16,6 +16,9 @@ package com.android.internal.policy.impl.keyguard; +import android.animation.Animator; +import android.animation.ObjectAnimator; +import android.animation.PropertyValuesHolder; import android.appwidget.AppWidgetHostView; import android.content.Context; import android.content.res.Resources; @@ -38,6 +41,8 @@ public class KeyguardWidgetFrame extends FrameLayout { private final static PorterDuffXfermode sAddBlendMode = new PorterDuffXfermode(PorterDuff.Mode.ADD); + static final float OUTLINE_ALPHA_MULTIPLIER = 0.6f; + private int mGradientColor; private LinearGradient mForegroundGradient; private LinearGradient mLeftToRightGradient; @@ -49,11 +54,20 @@ public class KeyguardWidgetFrame extends FrameLayout { private final Rect mForegroundRect = new Rect(); private int mForegroundAlpha = 0; private CheckLongPressHelper mLongPressHelper; + private Animator mFrameFade; + private boolean mIsSmall = false; private float mBackgroundAlpha; + private float mContentAlpha; private float mBackgroundAlphaMultiplier = 1.0f; private Drawable mBackgroundDrawable; private Rect mBackgroundRect = new Rect(); + private static int mSmallWidgetHeight; + + // Multiple callers may try and adjust the alpha of the frame. When a caller shows + // the outlines, we give that caller control, and nobody else can fade them out. + // This prevents animation conflicts. + private Object mBgAlphaController; public KeyguardWidgetFrame(Context context) { this(context, null, 0); @@ -74,12 +88,21 @@ public class KeyguardWidgetFrame extends FrameLayout { int padding = (int) (res.getDisplayMetrics().density * 8); setPadding(padding, padding, padding, padding); - mBackgroundDrawable = res.getDrawable(R.drawable.security_frame); + mBackgroundDrawable = res.getDrawable(R.drawable.kg_bouncer_bg_white); mGradientColor = res.getColor(com.android.internal.R.color.kg_widget_pager_gradient); mGradientPaint.setXfermode(sAddBlendMode); } @Override + protected void onDetachedFromWindow() { + cancelLongPress(); + } + + public void setMaxChallengeTop(int top) { + mSmallWidgetHeight = top - getPaddingTop(); + } + + @Override public boolean onInterceptTouchEvent(MotionEvent ev) { // Watch for longpress events at this level to make sure // users can always pick up this widget @@ -133,6 +156,23 @@ public class KeyguardWidgetFrame extends FrameLayout { mLongPressHelper.cancelLongPress(); } + + private void drawGradientOverlay(Canvas c) { + mGradientPaint.setShader(mForegroundGradient); + mGradientPaint.setAlpha(mForegroundAlpha); + c.drawRect(mForegroundRect, mGradientPaint); + } + + protected void drawBg(Canvas canvas) { + if (mBackgroundAlpha > 0.0f) { + Drawable bg = mBackgroundDrawable; + + bg.setAlpha((int) (mBackgroundAlpha * mBackgroundAlphaMultiplier * 255)); + bg.setBounds(mBackgroundRect); + bg.draw(canvas); + } + } + @Override protected void dispatchDraw(Canvas canvas) { drawBg(canvas); @@ -164,6 +204,14 @@ public class KeyguardWidgetFrame extends FrameLayout { } } + public void enableHardwareLayers() { + setLayerType(LAYER_TYPE_HARDWARE, null); + } + + public void disableHardwareLayers() { + setLayerType(LAYER_TYPE_NONE, null); + } + public View getContent() { return getChildAt(0); } @@ -177,28 +225,12 @@ public class KeyguardWidgetFrame extends FrameLayout { } } - private void drawGradientOverlay(Canvas c) { - mGradientPaint.setShader(mForegroundGradient); - mGradientPaint.setAlpha(mForegroundAlpha); - c.drawRect(mForegroundRect, mGradientPaint); - } - - protected void drawBg(Canvas canvas) { - if (mBackgroundAlpha > 0.0f) { - Drawable bg = mBackgroundDrawable; - - bg.setAlpha((int) (mBackgroundAlpha * mBackgroundAlphaMultiplier * 255)); - bg.setBounds(mBackgroundRect); - bg.draw(canvas); - } - } - public float getBackgroundAlpha() { return mBackgroundAlpha; } public void setBackgroundAlphaMultiplier(float multiplier) { - if (mBackgroundAlphaMultiplier != multiplier) { + if (Float.compare(mBackgroundAlphaMultiplier, multiplier) != 0) { mBackgroundAlphaMultiplier = multiplier; invalidate(); } @@ -209,13 +241,18 @@ public class KeyguardWidgetFrame extends FrameLayout { } public void setBackgroundAlpha(float alpha) { - if (mBackgroundAlpha != alpha) { + if (Float.compare(mBackgroundAlpha, alpha) != 0) { mBackgroundAlpha = alpha; invalidate(); } } + public float getContentAlpha() { + return mContentAlpha; + } + public void setContentAlpha(float alpha) { + mContentAlpha = alpha; View content = getContent(); if (content != null) { content.setAlpha(alpha); @@ -223,11 +260,27 @@ public class KeyguardWidgetFrame extends FrameLayout { } /** + * Set the top location of the challenge. + * + * @param top The top of the challenge, in _local_ coordinates, or -1 to indicate the challenge + * is down. + */ + private void setChallengeTop(int top, boolean updateWidgetSize) { + // The widget starts below the padding, and extends to the top of the challengs. + int widgetHeight = top - getPaddingTop(); + int frameHeight = top + getPaddingBottom(); + setFrameHeight(frameHeight); + if (updateWidgetSize) { + setWidgetHeight(widgetHeight); + } + } + + /** * Depending on whether the security is up, the widget size needs to change * * @param height The height of the widget, -1 for full height */ - public void setWidgetHeight(int height) { + private void setWidgetHeight(int height) { boolean needLayout = false; View widget = getContent(); if (widget != null) { @@ -242,22 +295,56 @@ public class KeyguardWidgetFrame extends FrameLayout { } } - /** - * Set the top location of the challenge. - * - * @param top The top of the challenge, in _local_ coordinates, or -1 to indicate the challenge - * is down. - */ - public void setChallengeTop(int top) { - // The widget starts below the padding, and extends to the top of the challengs. - int widgetHeight = top - getPaddingTop(); - setWidgetHeight(widgetHeight); + public boolean isSmall() { + return mIsSmall; + } + + public void adjustFrame(int challengeTop) { + setChallengeTop(challengeTop, false); + } + + public void shrinkWidget() { + mIsSmall = true; + setChallengeTop(mSmallWidgetHeight, true); } public void resetSize() { + mIsSmall = false; + setFrameHeight(getMeasuredHeight()); setWidgetHeight(LayoutParams.MATCH_PARENT); } + public void setFrameHeight(int height) { + height = Math.min(height, getMeasuredHeight()); + mBackgroundRect.set(0, 0, getMeasuredWidth(), height); + invalidate(); + } + + public void hideFrame(Object caller) { + fadeFrame(caller, false, 0f, 150); + } + + public void showFrame(Object caller) { + fadeFrame(caller, true, OUTLINE_ALPHA_MULTIPLIER, 150); + } + + public void fadeFrame(Object caller, boolean takeControl, float alpha, int duration) { + if (takeControl) { + mBgAlphaController = caller; + } + + if (mBgAlphaController != caller) return; + + if (mFrameFade != null) { + mFrameFade.cancel(); + mFrameFade = null; + } + PropertyValuesHolder bgAlpha = PropertyValuesHolder.ofFloat("backgroundAlpha", alpha); + mFrameFade = ObjectAnimator.ofPropertyValuesHolder(this, bgAlpha); + mFrameFade.setDuration(duration); + mFrameFade.start(); + } + @Override protected void onSizeChanged(int w, int h, int oldw, int oldh) { super.onSizeChanged(w, h, oldw, oldh); @@ -270,6 +357,7 @@ public class KeyguardWidgetFrame extends FrameLayout { mRightToLeftGradient = new LinearGradient(x1, 0f, x0, 0f, mGradientColor, 0, Shader.TileMode.CLAMP); mBackgroundRect.set(0, 0, w, h); + invalidate(); } void setOverScrollAmount(float r, boolean left) { @@ -284,4 +372,13 @@ public class KeyguardWidgetFrame extends FrameLayout { public void onActive(boolean isActive) { // hook for subclasses } + + public boolean onUserInteraction(int action) { + // hook for subclasses + return false; + } + + public void onChallengeActive(boolean challengeActive) { + // hook for subclasses + } } diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java index 63e7fddd8463..800ccc08671b 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java @@ -15,6 +15,9 @@ */ package com.android.internal.policy.impl.keyguard; +import android.animation.Animator; +import android.animation.AnimatorListenerAdapter; +import android.animation.AnimatorSet; import android.animation.ObjectAnimator; import android.animation.PropertyValuesHolder; import android.animation.TimeInterpolator; @@ -27,33 +30,35 @@ import android.view.MotionEvent; import android.view.View; import android.view.View.OnLongClickListener; import android.view.ViewGroup; -import android.view.animation.AccelerateInterpolator; -import android.view.animation.DecelerateInterpolator; import android.widget.FrameLayout; import com.android.internal.R; import com.android.internal.widget.LockPatternUtils; +import java.util.ArrayList; + public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwitchListener, OnLongClickListener { ZInterpolator mZInterpolator = new ZInterpolator(0.5f); private static float CAMERA_DISTANCE = 10000; - private static float TRANSITION_MAX_ROTATION = 30; + protected static float OVERSCROLL_MAX_ROTATION = 30; private static final boolean PERFORM_OVERSCROLL_ROTATION = true; private KeyguardViewStateManager mViewStateManager; private LockPatternUtils mLockPatternUtils; // Related to the fading in / out background outlines - private static final int CHILDREN_OUTLINE_FADE_OUT_DELAY = 0; private static final int CHILDREN_OUTLINE_FADE_OUT_DURATION = 375; - private static final int CHILDREN_OUTLINE_FADE_IN_DURATION = 100; - private ObjectAnimator mChildrenOutlineFadeInAnimation; - private ObjectAnimator mChildrenOutlineFadeOutAnimation; + private static final int CHILDREN_OUTLINE_FADE_IN_DURATION = 75; + protected AnimatorSet mChildrenOutlineFadeAnimation; private float mChildrenOutlineAlpha = 0; private float mSidePagesAlpha = 1f; + protected int mScreenCenter; + private boolean mHasLayout = false; + private boolean mHasMeasure = false; + private boolean mShowHintsOnLayout = false; private static final long CUSTOM_WIDGET_USER_ACTIVITY_TIMEOUT = 30000; @@ -111,11 +116,7 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit if (mPage != newPageIndex) { int oldPageIndex = mPage; mPage = newPageIndex; - if (mCallbacks != null) { - mCallbacks.onUserActivityTimeoutChanged(); - mCallbacks.userActivity(); - mCallbacks.onPageSwitch(newPageIndex); - } + userActivity(); KeyguardWidgetFrame oldWidgetPage = getWidgetPageAt(oldPageIndex); if (oldWidgetPage != null) { oldWidgetPage.onActive(false); @@ -130,6 +131,22 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit } } + private void userActivity() { + if (mCallbacks != null) { + mCallbacks.onUserActivityTimeoutChanged(); + mCallbacks.userActivity(); + } + } + + @Override + public boolean onTouchEvent(MotionEvent ev) { + KeyguardWidgetFrame currentWidgetPage = getWidgetPageAt(getCurrentPage()); + if (currentWidgetPage != null && currentWidgetPage.onUserInteraction(ev.getAction())) { + return true; + } + return super.onTouchEvent(ev); + } + public void showPagingFeedback() { // Nothing yet. } @@ -154,7 +171,6 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit public interface Callbacks { public void userActivity(); public void onUserActivityTimeoutChanged(); - public void onPageSwitch(int newPageIndex); } public void addWidget(View widget) { @@ -253,31 +269,33 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit @Override protected void onPageBeginMoving() { - // Enable hardware layers while pages are moving - // TODO: We should only do this for the two views that are actually moving - int children = getChildCount(); - for (int i = 0; i < children; i++) { - getWidgetPageAt(i).enableHardwareLayersForContent(); - } - if (mViewStateManager != null) { mViewStateManager.onPageBeginMoving(); } showOutlinesAndSidePages(); + userActivity(); } @Override protected void onPageEndMoving() { - // Disable hardware layers while pages are moving + if (mViewStateManager != null) { + mViewStateManager.onPageEndMoving(); + } + hideOutlinesAndSidePages(); + } + + private void enablePageLayers() { int children = getChildCount(); for (int i = 0; i < children; i++) { - getWidgetPageAt(i).disableHardwareLayersForContent(); + getWidgetPageAt(i).enableHardwareLayersForContent(); } + } - if (mViewStateManager != null) { - mViewStateManager.onPageEndMoving(); + private void disablePageLayers() { + int children = getChildCount(); + for (int i = 0; i < children; i++) { + getWidgetPageAt(i).disableHardwareLayersForContent(); } - hideOutlinesAndSidePages(); } /* @@ -325,25 +343,25 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit } private void updatePageAlphaValues(int screenCenter) { + } + + public float getAlphaForPage(int screenCenter, int index) { + return 1f; + } + + public float getOutlineAlphaForPage(int screenCenter, int index) { + return getAlphaForPage(screenCenter, index) * KeyguardWidgetFrame.OUTLINE_ALPHA_MULTIPLIER; + } + + protected boolean isOverScrollChild(int index, float scrollProgress) { boolean isInOverscroll = mOverScrollX < 0 || mOverScrollX > mMaxScrollX; - if (!isInOverscroll) { - for (int i = 0; i < getChildCount(); i++) { - KeyguardWidgetFrame child = getWidgetPageAt(i); - if (child != null) { - float scrollProgress = getScrollProgress(screenCenter, child, i); - if (!isReordering(false)) { - child.setBackgroundAlphaMultiplier( - backgroundAlphaInterpolator(Math.abs(scrollProgress))); - } else { - child.setBackgroundAlphaMultiplier(1f); - } - } - } - } + return (isInOverscroll && (index == 0 && scrollProgress < 0 || + index == getChildCount() - 1 && scrollProgress > 0)); } @Override protected void screenScrolled(int screenCenter) { + mScreenCenter = screenCenter; updatePageAlphaValues(screenCenter); for (int i = 0; i < getChildCount(); i++) { KeyguardWidgetFrame v = getWidgetPageAt(i); @@ -351,30 +369,17 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit if (v != null) { float scrollProgress = getScrollProgress(screenCenter, v, i); - float alpha = 1.0f; - v.setCameraDistance(mDensity * CAMERA_DISTANCE); - if (PERFORM_OVERSCROLL_ROTATION) { - if (i == 0 && scrollProgress < 0) { - // Over scroll to the left - v.setRotationY(-TRANSITION_MAX_ROTATION * scrollProgress); - v.setOverScrollAmount(Math.abs(scrollProgress), true); - alpha = 1.0f; - // On the first page, we don't want the page to have any lateral motion - } else if (i == getChildCount() - 1 && scrollProgress > 0) { - // Over scroll to the right - v.setRotationY(-TRANSITION_MAX_ROTATION * scrollProgress); - alpha = 1.0f; - v.setOverScrollAmount(Math.abs(scrollProgress), false); - // On the last page, we don't want the page to have any lateral motion. - } else { - v.setRotationY(0f); - v.setOverScrollAmount(0, false); - } + if (isOverScrollChild(i, scrollProgress) && PERFORM_OVERSCROLL_ROTATION) { + v.setRotationY(- OVERSCROLL_MAX_ROTATION * scrollProgress); + v.setOverScrollAmount(Math.abs(scrollProgress), scrollProgress < 0); + } else { + v.setRotationY(0f); + v.setOverScrollAmount(0, false); } - v.setAlpha(alpha); + float alpha = v.getAlpha(); // If the view has 0 alpha, we set it to be invisible so as to prevent // it from accepting touches if (alpha == 0) { @@ -385,6 +390,7 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit } } } + @Override void boundByReorderablePages(boolean isReordering, int[] range) { if (isReordering) { @@ -418,7 +424,6 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit @Override protected void onStartReordering() { super.onStartReordering(); - setChildrenOutlineMultiplier(1.0f); showOutlinesAndSidePages(); } @@ -429,43 +434,120 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit } void showOutlinesAndSidePages() { - if (mChildrenOutlineFadeOutAnimation != null) mChildrenOutlineFadeOutAnimation.cancel(); - if (mChildrenOutlineFadeInAnimation != null) mChildrenOutlineFadeInAnimation.cancel(); - - PropertyValuesHolder outlinesAlpha = - PropertyValuesHolder.ofFloat("childrenOutlineAlpha", 1.0f); - PropertyValuesHolder sidePagesAlpha = PropertyValuesHolder.ofFloat("sidePagesAlpha", 1.0f); - mChildrenOutlineFadeInAnimation = - ObjectAnimator.ofPropertyValuesHolder(this, outlinesAlpha, sidePagesAlpha); + enablePageLayers(); + animateOutlinesAndSidePages(true); + } - mChildrenOutlineFadeInAnimation.setDuration(CHILDREN_OUTLINE_FADE_IN_DURATION); - mChildrenOutlineFadeInAnimation.start(); + void hideOutlinesAndSidePages() { + animateOutlinesAndSidePages(false); } public void showInitialPageHints() { - // We start with everything showing - setChildrenOutlineAlpha(1.0f); - setSidePagesAlpha(1.0f); - setChildrenOutlineMultiplier(1.0f); + if (mHasLayout) { + showOutlinesAndSidePages(); + } else { + // The layout hints depend on layout being run once + mShowHintsOnLayout = true; + } + } - int currPage = getCurrentPage(); - KeyguardWidgetFrame frame = getWidgetPageAt(currPage); - frame.setBackgroundAlphaMultiplier(0f); + @Override + public void onAttachedToWindow() { + super.onAttachedToWindow(); + mHasMeasure = false; + mHasLayout = false; + } + + protected void onLayout(boolean changed, int left, int top, int right, int bottom) { + super.onLayout(changed, left, top, right, bottom); + if (mShowHintsOnLayout) { + post(new Runnable() { + @Override + public void run() { + showOutlinesAndSidePages(); + } + }); + mShowHintsOnLayout = false; + } + mHasLayout = true; + } + + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + int maxChallengeTop = -1; + View parent = (View) getParent(); + boolean challengeShowing = false; + // Widget pages need to know where the top of the sliding challenge is so that they + // now how big the widget should be when the challenge is up. We compute it here and + // then propagate it to each of our children. + if (parent.getParent() instanceof SlidingChallengeLayout) { + SlidingChallengeLayout scl = (SlidingChallengeLayout) parent.getParent(); + int top = scl.getMaxChallengeTop(); + + // This is a bit evil, but we need to map a coordinate relative to the SCL into a + // coordinate relative to our children, hence we subtract the top padding.s + maxChallengeTop = top - getPaddingTop(); + challengeShowing = scl.isChallengeShowing(); + } + + int count = getChildCount(); + for (int i = 0; i < count; i++) { + KeyguardWidgetFrame frame = getWidgetPageAt(i); + frame.setMaxChallengeTop(maxChallengeTop); + + // On the very first measure pass, if the challenge is showing, we need to make sure + // that the widget on the current page is small. + if (challengeShowing && i == mCurrentPage && !mHasMeasure) { + frame.shrinkWidget(); + } + } + super.onMeasure(widthMeasureSpec, heightMeasureSpec); } - void hideOutlinesAndSidePages() { - if (mChildrenOutlineFadeInAnimation != null) mChildrenOutlineFadeInAnimation.cancel(); - if (mChildrenOutlineFadeOutAnimation != null) mChildrenOutlineFadeOutAnimation.cancel(); + void animateOutlinesAndSidePages(final boolean show) { + if (mChildrenOutlineFadeAnimation != null) { + mChildrenOutlineFadeAnimation.cancel(); + mChildrenOutlineFadeAnimation = null; + } + + int count = getChildCount(); + PropertyValuesHolder alpha; + ArrayList<Animator> anims = new ArrayList<Animator>(); + + int duration = show ? CHILDREN_OUTLINE_FADE_IN_DURATION : + CHILDREN_OUTLINE_FADE_OUT_DURATION; - PropertyValuesHolder outlinesAlpha = - PropertyValuesHolder.ofFloat("childrenOutlineAlpha", 0f); - PropertyValuesHolder sidePagesAlpha = PropertyValuesHolder.ofFloat("sidePagesAlpha", 0f); - mChildrenOutlineFadeOutAnimation = - ObjectAnimator.ofPropertyValuesHolder(this, outlinesAlpha, sidePagesAlpha); + int curPage = getNextPage(); + for (int i = 0; i < count; i++) { + float finalContentAlpha; + if (show) { + finalContentAlpha = getAlphaForPage(mScreenCenter, i); + } else if (!show && i == curPage) { + finalContentAlpha = 1f; + } else { + finalContentAlpha = 0f; + } + KeyguardWidgetFrame child = getWidgetPageAt(i); + alpha = PropertyValuesHolder.ofFloat("contentAlpha", finalContentAlpha); + ObjectAnimator a = ObjectAnimator.ofPropertyValuesHolder(child, alpha); + anims.add(a); + + float finalOutlineAlpha = show ? getOutlineAlphaForPage(mScreenCenter, i) : 0f; + child.fadeFrame(this, show, finalOutlineAlpha, duration); + } + + mChildrenOutlineFadeAnimation = new AnimatorSet(); + mChildrenOutlineFadeAnimation.playTogether(anims); - mChildrenOutlineFadeOutAnimation.setDuration(CHILDREN_OUTLINE_FADE_OUT_DURATION); - mChildrenOutlineFadeOutAnimation.setStartDelay(CHILDREN_OUTLINE_FADE_OUT_DELAY); - mChildrenOutlineFadeOutAnimation.start(); + mChildrenOutlineFadeAnimation.setDuration(duration); + mChildrenOutlineFadeAnimation.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + if (!show) { + disablePageLayers(); + } + } + }); + mChildrenOutlineFadeAnimation.start(); } public void setChildrenOutlineAlpha(float alpha) { @@ -506,7 +588,8 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit @Override public boolean onLongClick(View v) { - if (startReordering()) { + // Disallow long pressing to reorder if the challenge is showing + if (!mViewStateManager.isChallengeShowing() && startReordering()) { return true; } return false; diff --git a/policy/src/com/android/internal/policy/impl/keyguard/MultiPaneChallengeLayout.java b/policy/src/com/android/internal/policy/impl/keyguard/MultiPaneChallengeLayout.java index 3ccc7ea55ef8..a207f5d1048d 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/MultiPaneChallengeLayout.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/MultiPaneChallengeLayout.java @@ -20,7 +20,6 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.Rect; import android.util.AttributeSet; -import android.util.Log; import android.view.Gravity; import android.view.View; import android.view.ViewGroup; diff --git a/policy/src/com/android/internal/policy/impl/keyguard/PagedView.java b/policy/src/com/android/internal/policy/impl/keyguard/PagedView.java index 3562071a2a1c..657a31f3d38c 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/PagedView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/PagedView.java @@ -201,9 +201,9 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc // We use the min scale to determine how much to expand the actually PagedView measured // dimensions such that when we are zoomed out, the view is not clipped private int REORDERING_DROP_REPOSITION_DURATION = 200; - private int REORDERING_REORDER_REPOSITION_DURATION = 350; - private int REORDERING_ZOOM_IN_OUT_DURATION = 250; - private int REORDERING_SIDE_PAGE_HOVER_TIMEOUT = 500; + protected int REORDERING_REORDER_REPOSITION_DURATION = 300; + protected int REORDERING_ZOOM_IN_OUT_DURATION = 250; + private int REORDERING_SIDE_PAGE_HOVER_TIMEOUT = 300; private float REORDERING_SIDE_PAGE_BUFFER_PERCENTAGE = 0.1f; private float mMinScale = 1f; protected View mDragView; @@ -215,6 +215,10 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc // This variable's scope is for the duration of startReordering() and after the zoomIn() // animation after endReordering() private boolean mIsReordering; + // The runnable that settles the page after snapToPage and animateDragViewToOriginalPosition + private int NUM_ANIMATIONS_RUNNING_BEFORE_ZOOM_OUT = 2; + private int mPostReorderingPreZoomInRemainingAnimationCount; + private Runnable mPostReorderingPreZoomInRunnable; // Edge swiping private boolean mOnlyAllowEdgeSwipes = false; @@ -536,6 +540,8 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc pageEndMoving(); } + onPostReorderingAnimationCompleted(); + // Notify the user when the page changes AccessibilityManager accessibilityManager = (AccessibilityManager) getContext().getSystemService(Context.ACCESSIBILITY_SERVICE); @@ -1162,6 +1168,15 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc return 1.0f; } + protected float getBoundedScrollProgress(int screenCenter, View v, int page) { + final int halfScreenSize = getViewportWidth() / 2; + + screenCenter = Math.min(mScrollX + halfScreenSize, screenCenter); + screenCenter = Math.max(halfScreenSize, screenCenter); + + return getScrollProgress(screenCenter, v, page); + } + protected float getScrollProgress(int screenCenter, View v, int page) { final int halfScreenSize = getViewportWidth() / 2; @@ -1962,13 +1977,19 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc } // Animate the drag view back to the original position - void animateChildrenToOriginalPosition() { + void animateDragViewToOriginalPosition() { if (mDragView != null) { AnimatorSet anim = new AnimatorSet(); anim.setDuration(REORDERING_DROP_REPOSITION_DURATION); anim.playTogether( ObjectAnimator.ofFloat(mDragView, "translationX", 0f), ObjectAnimator.ofFloat(mDragView, "translationY", 0f)); + anim.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + onPostReorderingAnimationCompleted(); + } + }); anim.start(); } } @@ -2001,6 +2022,16 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc invalidate(); } + private void onPostReorderingAnimationCompleted() { + // Trigger the callback when reordering has settled + --mPostReorderingPreZoomInRemainingAnimationCount; + if (mPostReorderingPreZoomInRunnable != null && + mPostReorderingPreZoomInRemainingAnimationCount == 0) { + mPostReorderingPreZoomInRunnable.run(); + mPostReorderingPreZoomInRunnable = null; + } + } + protected void onEndReordering() { mIsReordering = false; } @@ -2038,21 +2069,28 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc // In that case, we don't want to do anything. if (!mReorderingStarted) return; mReorderingStarted = false; - Runnable onCompleteRunnable = new Runnable() { - @Override - public void run() { - onEndReordering(); - } - }; - zoomIn(onCompleteRunnable); // If we haven't flung-to-delete the current child, then we just animate the drag view // back into position if (!mIsFlingingToDelete) { - // Snap to the current page - snapToDestination(); + mPostReorderingPreZoomInRunnable = new Runnable() { + public void run() { + Runnable onCompleteRunnable = new Runnable() { + @Override + public void run() { + onEndReordering(); + } + }; + zoomIn(onCompleteRunnable); + }; + }; - animateChildrenToOriginalPosition(); + mPostReorderingPreZoomInRemainingAnimationCount = + NUM_ANIMATIONS_RUNNING_BEFORE_ZOOM_OUT; + // Snap to the current page + snapToPage(indexOfChild(mDragView), 0); + // Animate the drag view back to the front position + animateDragViewToOriginalPosition(); } } diff --git a/policy/src/com/android/internal/policy/impl/keyguard/SecurityMessageDisplay.java b/policy/src/com/android/internal/policy/impl/keyguard/SecurityMessageDisplay.java index b57d8c13af96..ec6472faeea7 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/SecurityMessageDisplay.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/SecurityMessageDisplay.java @@ -22,4 +22,6 @@ public interface SecurityMessageDisplay { public void setMessage(int resId, boolean important); public void setMessage(int resId, boolean important, Object... formatArgs); + + public void setTimeout(int timeout_ms); } diff --git a/policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java b/policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java index 506b79d208df..35eccbb1e805 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java @@ -44,6 +44,18 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout private static final String TAG = "SlidingChallengeLayout"; private static final boolean DEBUG = false; + // The drag handle is measured in dp above & below the top edge of the + // challenge view; these parameters change based on whether the challenge + // is open or closed. + private static final int DRAG_HANDLE_CLOSED_ABOVE = 64; // dp + private static final int DRAG_HANDLE_CLOSED_BELOW = 0; // dp + private static final int DRAG_HANDLE_OPEN_ABOVE = 8; // dp + private static final int DRAG_HANDLE_OPEN_BELOW = 0; // dp + + private static final boolean OPEN_ON_CLICK = true; + + private static final int HANDLE_ANIMATE_DURATION = 200; // ms + // Drawn to show the drag handle in closed state; crossfades to the challenge view // when challenge is fully visible private Drawable mHandleDrawable; @@ -82,13 +94,20 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout private VelocityTracker mVelocityTracker; private int mMinVelocity; private int mMaxVelocity; - private float mGestureStartY; // where did you touch the screen to start this gesture? + private float mGestureStartX, mGestureStartY; // where did you first touch the screen? private int mGestureStartChallengeBottom; // where was the challenge at that time? - private int mDragHandleSize; // handle hitrect extension into the challenge view - private int mDragHandleHeadroom; // extend the handle's hitrect this far above the line + + private int mDragHandleClosedBelow; // handle hitrect extension into the challenge view + private int mDragHandleClosedAbove; // extend the handle's hitrect this far above the line + private int mDragHandleOpenBelow; // handle hitrect extension into the challenge view + private int mDragHandleOpenAbove; // extend the handle's hitrect this far above the line + private int mDragHandleEdgeSlop; private int mChallengeBottomBound; // Number of pixels from the top of the challenge view // that should remain on-screen + + private int mTouchSlop; + float mHandleAlpha; float mFrameAlpha; private ObjectAnimator mHandleAnimation; @@ -125,9 +144,6 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout } }; - private static final int DRAG_HANDLE_DEFAULT_SIZE = 32; // dp - private static final int HANDLE_ANIMATE_DURATION = 200; // ms - // True if at least one layout pass has happened since the view was attached. private boolean mHasLayout; @@ -224,21 +240,23 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout mDragHandleEdgeSlop = getResources().getDimensionPixelSize( R.dimen.kg_edge_swipe_region_size); - setWillNotDraw(false); - } + mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop(); - public void setDragDrawables(Drawable handle, Drawable icon) { final float density = getResources().getDisplayMetrics().density; - final int defaultSize = (int) (DRAG_HANDLE_DEFAULT_SIZE * density + 0.5f); - final int handleHeight = handle != null ? handle.getIntrinsicHeight() : 0; - final int iconHeight = icon != null ? icon.getIntrinsicHeight() : 0; - mDragHandleSize = Math.max(handleHeight > 0 ? handleHeight : defaultSize, - iconHeight > 0 ? iconHeight : defaultSize); // top half of the lock icon, plus another 25% to be sure - mDragHandleHeadroom = (int) (iconHeight * 0.75f); - mChallengeBottomBound = (mDragHandleSize + mDragHandleHeadroom + handleHeight) / 2; + mDragHandleClosedAbove = (int) (DRAG_HANDLE_CLOSED_ABOVE * density + 0.5f); + mDragHandleClosedBelow = (int) (DRAG_HANDLE_CLOSED_BELOW * density + 0.5f); + mDragHandleOpenAbove = (int) (DRAG_HANDLE_OPEN_ABOVE * density + 0.5f); + mDragHandleOpenBelow = (int) (DRAG_HANDLE_OPEN_BELOW * density + 0.5f); + // how much space to account for in the handle when closed + mChallengeBottomBound = mDragHandleClosedBelow; + + setWillNotDraw(false); + } + + public void setDragDrawables(Drawable handle, Drawable icon) { mHandleDrawable = handle; mDragIconDrawable = icon; } @@ -352,7 +370,7 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout mScrollState = state; animateHandle(state == SCROLL_STATE_IDLE && !mChallengeShowing); - animateFrame(state != SCROLL_STATE_IDLE, false); + animateFrame(false , false); if (mScrollListener != null) { mScrollListener.onScrollStateChanged(state); } @@ -477,9 +495,12 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout } mVelocityTracker.addMovement(ev); + //Log.v(TAG, "onIntercept: " + ev); + final int action = ev.getActionMasked(); switch (action) { case MotionEvent.ACTION_DOWN: + mGestureStartX = ev.getX(); mGestureStartY = ev.getY(); mBlockDrag = false; break; @@ -500,7 +521,8 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout (isInChallengeView(x, y) && mScrollState == SCROLL_STATE_SETTLING)) && mActivePointerId == INVALID_POINTER) { mActivePointerId = ev.getPointerId(i); - mGestureStartY = ev.getY(); + mGestureStartX = x; + mGestureStartY = y; mGestureStartChallengeBottom = getChallengeBottom(); mDragging = true; } else if (isInChallengeView(x, y)) { @@ -536,6 +558,7 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout switch (action) { case MotionEvent.ACTION_DOWN: mBlockDrag = false; + mGestureStartX = ev.getX(); mGestureStartY = ev.getY(); break; @@ -551,7 +574,12 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout break; } case MotionEvent.ACTION_UP: - if (mDragging) { + if (OPEN_ON_CLICK + && isInDragHandle(mGestureStartX, mGestureStartY) + && Math.abs(ev.getX() - mGestureStartX) <= mTouchSlop + && Math.abs(ev.getY() - mGestureStartY) <= mTouchSlop) { + showChallenge(true); + } else if (mDragging) { mVelocityTracker.computeCurrentVelocity(1000, mMaxVelocity); showChallenge((int) mVelocityTracker.getYVelocity(mActivePointerId)); } @@ -568,6 +596,7 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout if ((isInDragHandle(x, y) || crossedDragHandle(x, y, mGestureStartY) || (isInChallengeView(x, y) && mScrollState == SCROLL_STATE_SETTLING)) && mActivePointerId == INVALID_POINTER) { + mGestureStartX = x; mGestureStartY = y; mActivePointerId = ev.getPointerId(i); mGestureStartChallengeBottom = getChallengeBottom(); @@ -605,8 +634,11 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout * We only want to add additional vertical space to the drag handle when the panel is fully * closed. */ - private int getDragHandleHeadroom() { - return isChallengeShowing() ? 0 : mDragHandleHeadroom; + private int getDragHandleSizeAbove() { + return isChallengeShowing() ? mDragHandleOpenAbove : mDragHandleClosedAbove; + } + private int getDragHandleSizeBelow() { + return isChallengeShowing() ? mDragHandleOpenBelow : mDragHandleClosedBelow; } private boolean isInChallengeView(float x, float y) { @@ -620,17 +652,17 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout if (mChallengeView == null) return false; return x >= mDragHandleEdgeSlop && - y >= mChallengeView.getTop() - getDragHandleHeadroom() && + y >= mChallengeView.getTop() - getDragHandleSizeAbove() && x < getWidth() - mDragHandleEdgeSlop && - y < mChallengeView.getTop() + mDragHandleSize; + y < mChallengeView.getTop() + getDragHandleSizeBelow(); } private boolean crossedDragHandle(float x, float y, float initialY) { final int challengeTop = mChallengeView.getTop(); return x >= 0 && x < getWidth() && - initialY < (challengeTop - getDragHandleHeadroom()) && - y > challengeTop + mDragHandleSize; + initialY < (challengeTop - getDragHandleSizeAbove()) && + y > challengeTop + getDragHandleSizeBelow(); } @Override @@ -649,6 +681,9 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout final View oldChallengeView = mChallengeView; mChallengeView = null; final int count = getChildCount(); + + // First iteration through the children finds special children and sets any associated + // state. for (int i = 0; i < count; i++) { final View child = getChildAt(i); final LayoutParams lp = (LayoutParams) child.getLayoutParams(); @@ -667,10 +702,22 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout } else if (lp.childType == LayoutParams.CHILD_TYPE_SCRIM) { setScrimView(child); } - if (child.getVisibility() == GONE) continue; + } - measureChildWithMargins(child, widthSpec, 0, heightSpec, 0); + // We want to measure the challenge view first, for various reasons that I'd rather + // not get into here. + if (mChallengeView != null) { + measureChildWithMargins(mChallengeView, widthSpec, 0, heightSpec, 0); + } + + // Measure the rest of the children + for (int i = 0; i < count; i++) { + final View child = getChildAt(i); + // Don't measure the challenge view twice! + if (child != mChallengeView) { + measureChildWithMargins(child, widthSpec, 0, heightSpec, 0); + } } } @@ -715,14 +762,6 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout } if (!mHasLayout) { - // We want to trigger the initial listener updates outside of layout pass, - // in case the listeners trigger requestLayout(). - post(new Runnable() { - @Override - public void run() { - sendInitialListenerUpdates(); - } - }); if (mFrameDrawable != null) { mFrameDrawable.setAlpha(0); } @@ -760,20 +799,25 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout debugPaint.setColor(0x40FF00CC); // show the isInDragHandle() rect c.drawRect(mDragHandleEdgeSlop, - mChallengeView.getTop() - getDragHandleHeadroom(), + mChallengeView.getTop() - getDragHandleSizeAbove(), getWidth() - mDragHandleEdgeSlop, - mChallengeView.getTop() + mDragHandleSize, + mChallengeView.getTop() + getDragHandleSizeBelow(), debugPaint); } - if (mChallengeView != null && mHandleAlpha > 0 && mHandleDrawable != null) { + if (mChallengeView != null && mHandleAlpha > 0) { final int top = mChallengeView.getTop(); - final int handleHeight = mHandleDrawable.getIntrinsicHeight(); + final int handleHeight; final int challengeLeft = mChallengeView.getLeft(); final int challengeRight = mChallengeView.getRight(); - mHandleDrawable.setBounds(challengeLeft, top, challengeRight, top + handleHeight); - mHandleDrawable.setAlpha((int) (mHandleAlpha * 0xFF)); - mHandleDrawable.draw(c); + if (mHandleDrawable != null) { + handleHeight = mHandleDrawable.getIntrinsicHeight(); + mHandleDrawable.setBounds(challengeLeft, top, challengeRight, top + handleHeight); + mHandleDrawable.setAlpha((int) (mHandleAlpha * 0xFF)); + mHandleDrawable.draw(c); + } else { + handleHeight = 0; + } if (DEBUG) { // now show the actual drag handle @@ -784,10 +828,12 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout } if (mDragIconDrawable != null) { + final int closedTop = getLayoutBottom() - mChallengeBottomBound; final int iconWidth = mDragIconDrawable.getIntrinsicWidth(); final int iconHeight = mDragIconDrawable.getIntrinsicHeight(); final int iconLeft = (challengeLeft + challengeRight - iconWidth) / 2; - final int iconTop = top + (handleHeight - iconHeight) / 2; + final int iconTop = closedTop + + (mDragHandleClosedBelow - mDragHandleClosedAbove - iconHeight) / 2; mDragIconDrawable.setBounds(iconLeft, iconTop, iconLeft + iconWidth, iconTop + iconHeight); mDragIconDrawable.setAlpha((int) (mHandleAlpha * 0xFF)); @@ -802,6 +848,14 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout } } + public int getMaxChallengeTop() { + if (mChallengeView == null) return 0; + + final int layoutBottom = getLayoutBottom(); + final int challengeHeight = mChallengeView.getMeasuredHeight(); + return layoutBottom - challengeHeight; + } + /** * Move the bottom edge of mChallengeView to a new position and notify the listener * if it represents a change in position. Changes made through this method will @@ -848,7 +902,7 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout final int bottomMargin = (mChallengeView == null) ? 0 : ((LayoutParams) mChallengeView.getLayoutParams()).bottomMargin; - final int layoutBottom = getHeight() - getPaddingBottom() - bottomMargin; + final int layoutBottom = getMeasuredHeight() - getPaddingBottom() - bottomMargin; return layoutBottom; } diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java index eb833eb54de5..37dee1980c54 100644 --- a/services/java/com/android/server/LocationManagerService.java +++ b/services/java/com/android/server/LocationManagerService.java @@ -405,9 +405,7 @@ public class LocationManagerService extends ILocationManager.Stub implements Run mLastLocation.clear(); for (LocationProviderInterface p : mProviders) { updateProviderListenersLocked(p.getName(), false, mCurrentUserId); - if (!LocationManager.FUSED_PROVIDER.equals(p.getName())) { - p.switchUser(userId); - } + p.switchUser(userId); } mCurrentUserId = userId; updateProvidersLocked(); @@ -666,27 +664,9 @@ public class LocationManagerService extends ILocationManager.Stub implements Run mProvidersByName.remove(provider.getName()); } - /** - * Returns true if the specified UID is SYSTEM_UID or matches the current user. - * - * @param uid the uid - * @return true if uid is SYSTEM_UID or matches the current user - */ - private boolean isCurrentUserOrSystemLocked(int uid) { - return uid == Process.SYSTEM_UID || UserHandle.getUserId(uid) == mCurrentUserId; - } - - /** - * Returns the first UID in the current user's range. - * - * @return the first UID in the current user's range - */ - private int getCurrentUidBaseLocked() { - return UserHandle.getUid(mCurrentUserId, 0); - } - private boolean isAllowedBySettingsLocked(String provider, int uid) { - if (!isCurrentUserOrSystemLocked(uid)) { + private boolean isAllowedBySettingsLocked(String provider, int userId) { + if (userId != mCurrentUserId) { return false; } if (mEnabledProviders.contains(provider)) { @@ -695,10 +675,6 @@ public class LocationManagerService extends ILocationManager.Stub implements Run if (mDisabledProviders.contains(provider)) { return false; } - if (uid == Process.SYSTEM_UID) { - return true; - } - // Use system settings ContentResolver resolver = mContext.getContentResolver(); @@ -852,8 +828,8 @@ public class LocationManagerService extends ILocationManager.Stub implements Run public List<String> getProviders(Criteria criteria, boolean enabledOnly) { int allowedResolutionLevel = getCallerAllowedResolutionLevel(); ArrayList<String> out; - final int callingUid = Binder.getCallingUid(); - final long identity = Binder.clearCallingIdentity(); + int callingUserId = UserHandle.getCallingUserId(); + long identity = Binder.clearCallingIdentity(); try { synchronized (mLock) { out = new ArrayList<String>(mProviders.size()); @@ -863,7 +839,7 @@ public class LocationManagerService extends ILocationManager.Stub implements Run continue; } if (allowedResolutionLevel >= getMinimumResolutionLevelForProviderUse(name)) { - if (enabledOnly && !isAllowedBySettingsLocked(name, callingUid)) { + if (enabledOnly && !isAllowedBySettingsLocked(name, callingUserId)) { continue; } if (criteria != null && !LocationProvider.propertiesMeetCriteria( @@ -939,7 +915,7 @@ public class LocationManagerService extends ILocationManager.Stub implements Run LocationProviderInterface p = mProviders.get(i); boolean isEnabled = p.isEnabled(); String name = p.getName(); - boolean shouldBeEnabled = isAllowedBySettingsLocked(name, getCurrentUidBaseLocked()); + boolean shouldBeEnabled = isAllowedBySettingsLocked(name, mCurrentUserId); if (isEnabled && !shouldBeEnabled) { updateProviderListenersLocked(name, false, mCurrentUserId); changesMade = true; @@ -967,7 +943,7 @@ public class LocationManagerService extends ILocationManager.Stub implements Run final int N = records.size(); for (int i = 0; i < N; i++) { UpdateRecord record = records.get(i); - if (isCurrentUserOrSystemLocked(record.mReceiver.mUid)) { + if (UserHandle.getUserId(record.mReceiver.mUid) == userId) { // Sends a notification message to the receiver if (!record.mReceiver.callProviderEnabledLocked(provider, enabled)) { if (deadReceivers == null) { @@ -1006,7 +982,7 @@ public class LocationManagerService extends ILocationManager.Stub implements Run if (records != null) { for (UpdateRecord record : records) { - if (isCurrentUserOrSystemLocked(record.mReceiver.mUid)) { + if (UserHandle.getUserId(record.mReceiver.mUid) == mCurrentUserId) { LocationRequest locationRequest = record.mRequest; providerRequest.locationRequests.add(locationRequest); if (locationRequest.getInterval() < providerRequest.interval) { @@ -1024,7 +1000,7 @@ public class LocationManagerService extends ILocationManager.Stub implements Run // under that threshold. long thresholdInterval = (providerRequest.interval + 1000) * 3 / 2; for (UpdateRecord record : records) { - if (isCurrentUserOrSystemLocked(record.mReceiver.mUid)) { + if (UserHandle.getUserId(record.mReceiver.mUid) == mCurrentUserId) { LocationRequest locationRequest = record.mRequest; if (locationRequest.getInterval() <= thresholdInterval) { worksource.add(record.mReceiver.mUid); @@ -1247,7 +1223,7 @@ public class LocationManagerService extends ILocationManager.Stub implements Run oldRecord.disposeLocked(false); } - boolean isProviderEnabled = isAllowedBySettingsLocked(name, uid); + boolean isProviderEnabled = isAllowedBySettingsLocked(name, UserHandle.getUserId(uid)); if (isProviderEnabled) { applyRequirementsLocked(name); } else { @@ -1302,10 +1278,9 @@ public class LocationManagerService extends ILocationManager.Stub implements Run } // update provider - int currentUidBase = getCurrentUidBaseLocked(); for (String provider : providers) { // If provider is already disabled, don't need to do anything - if (!isAllowedBySettingsLocked(provider, currentUidBase)) { + if (!isAllowedBySettingsLocked(provider, mCurrentUserId)) { continue; } @@ -1323,8 +1298,7 @@ public class LocationManagerService extends ILocationManager.Stub implements Run request.getProvider()); // no need to sanitize this request, as only the provider name is used - final int callingUid = Binder.getCallingUid(); - final long identity = Binder.clearCallingIdentity(); + long identity = Binder.clearCallingIdentity(); try { if (mBlacklist.isBlacklisted(packageName)) { if (D) Log.d(TAG, "not returning last loc for blacklisted app: " + @@ -1340,9 +1314,7 @@ public class LocationManagerService extends ILocationManager.Stub implements Run LocationProviderInterface provider = mProvidersByName.get(name); if (provider == null) return null; - if (!isAllowedBySettingsLocked(name, callingUid)) { - return null; - } + if (!isAllowedBySettingsLocked(name, mCurrentUserId)) return null; Location location = mLastLocation.get(name); if (location == null) { @@ -1499,14 +1471,13 @@ public class LocationManagerService extends ILocationManager.Stub implements Run provider); if (LocationManager.FUSED_PROVIDER.equals(provider)) return false; - final int callingUid = Binder.getCallingUid(); - final long identity = Binder.clearCallingIdentity(); + long identity = Binder.clearCallingIdentity(); try { synchronized (mLock) { LocationProviderInterface p = mProvidersByName.get(provider); if (p == null) return false; - return isAllowedBySettingsLocked(provider, callingUid); + return isAllowedBySettingsLocked(provider, mCurrentUserId); } } finally { Binder.restoreCallingIdentity(identity); @@ -1645,10 +1616,10 @@ public class LocationManagerService extends ILocationManager.Stub implements Run Receiver receiver = r.mReceiver; boolean receiverDead = false; - final int receiverUid = receiver.mUid; - if (!isCurrentUserOrSystemLocked(receiverUid)) { + int receiverUserId = UserHandle.getUserId(receiver.mUid); + if (receiverUserId != mCurrentUserId) { if (D) { - Log.d(TAG, "skipping loc update for background uid " + receiverUid + + Log.d(TAG, "skipping loc update for background user " + receiverUserId + " (current user: " + mCurrentUserId + ", app: " + receiver.mPackageName + ")"); } @@ -1745,7 +1716,7 @@ public class LocationManagerService extends ILocationManager.Stub implements Run } synchronized (mLock) { - if (isAllowedBySettingsLocked(provider, getCurrentUidBaseLocked())) { + if (isAllowedBySettingsLocked(provider, mCurrentUserId)) { handleLocationChangedLocked(location, passive); } } diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java index 6ef39ac10733..83672c540c2d 100644 --- a/services/java/com/android/server/pm/PackageManagerService.java +++ b/services/java/com/android/server/pm/PackageManagerService.java @@ -1009,6 +1009,8 @@ public class PackageManagerService extends IPackageManager.Stub { File dataDir = Environment.getDataDirectory(); mAppDataDir = new File(dataDir, "data"); + mAppInstallDir = new File(dataDir, "app"); + mAppLibInstallDir = new File(dataDir, "app-lib"); mAsecInternalPath = new File(dataDir, "app-asec").getPath(); mUserAppDataDir = new File(dataDir, "user"); mDrmAppPrivateInstallDir = new File(dataDir, "app-private"); @@ -1218,8 +1220,6 @@ public class PackageManagerService extends IPackageManager.Stub { } } - mAppInstallDir = new File(dataDir, "app"); - mAppLibInstallDir = new File(dataDir, "app-lib"); //look for any incomplete package installations ArrayList<PackageSetting> deletePkgsList = mSettings.getListOfIncompleteInstallPackagesLPr(); //clean up list diff --git a/services/java/com/android/server/pm/Settings.java b/services/java/com/android/server/pm/Settings.java index 3a54514d9c05..94494ae892c9 100644 --- a/services/java/com/android/server/pm/Settings.java +++ b/services/java/com/android/server/pm/Settings.java @@ -196,7 +196,7 @@ final class Settings { final String name = pkg.packageName; PackageSetting p = getPackageLPw(name, origPackage, realName, sharedUser, codePath, resourcePath, nativeLibraryPathString, pkg.mVersionCode, pkgFlags, - user, add); + user, add, true /* allowInstall */); return p; } @@ -358,7 +358,7 @@ final class Settings { private PackageSetting getPackageLPw(String name, PackageSetting origPackage, String realName, SharedUserSetting sharedUser, File codePath, File resourcePath, String nativeLibraryPathString, int vc, int pkgFlags, - UserHandle installUser, boolean add) { + UserHandle installUser, boolean add, boolean allowInstall) { PackageSetting p = mPackages.get(name); if (p != null) { if (!p.codePath.equals(codePath)) { @@ -432,7 +432,7 @@ final class Settings { Slog.i(PackageManagerService.TAG, "Stopping package " + name, e); } List<UserInfo> users = getAllUsers(); - if (users != null) { + if (users != null && allowInstall) { for (UserInfo user : users) { // By default we consider this app to be installed // for the user if no user has been specified (which @@ -498,7 +498,7 @@ final class Settings { addPackageSettingLPw(p, name, sharedUser); } } else { - if (installUser != null) { + if (installUser != null && allowInstall) { // The caller has explicitly specified the user they want this // package installed for, and the package already exists. // Make sure it conforms to the new request. @@ -1701,24 +1701,6 @@ final class Settings { Log.wtf(PackageManagerService.TAG, "Error reading package manager settings", e); } - if (mBackupStoppedPackagesFilename.exists() - || mStoppedPackagesFilename.exists()) { - // Read old file - readStoppedLPw(); - mBackupStoppedPackagesFilename.delete(); - mStoppedPackagesFilename.delete(); - // Migrate to new file format - writePackageRestrictionsLPr(0); - } else { - if (users == null) { - readPackageRestrictionsLPr(0); - } else { - for (UserInfo user : users) { - readPackageRestrictionsLPr(user.id); - } - } - } - final int N = mPendingPackages.size(); for (int i = 0; i < N; i++) { final PendingPackage pp = mPendingPackages.get(i); @@ -1727,7 +1709,7 @@ final class Settings { PackageSetting p = getPackageLPw(pp.name, null, pp.realName, (SharedUserSetting) idObj, pp.codePath, pp.resourcePath, pp.nativeLibraryPathString, pp.versionCode, pp.pkgFlags, - UserHandle.ALL, true); + null, true /* add */, false /* allowInstall */); if (p == null) { PackageManagerService.reportSettingsProblem(Log.WARN, "Unable to create application package for " + pp.name); @@ -1748,6 +1730,24 @@ final class Settings { } mPendingPackages.clear(); + if (mBackupStoppedPackagesFilename.exists() + || mStoppedPackagesFilename.exists()) { + // Read old file + readStoppedLPw(); + mBackupStoppedPackagesFilename.delete(); + mStoppedPackagesFilename.delete(); + // Migrate to new file format + writePackageRestrictionsLPr(0); + } else { + if (users == null) { + readPackageRestrictionsLPr(0); + } else { + for (UserInfo user : users) { + readPackageRestrictionsLPr(user.id); + } + } + } + /* * Make sure all the updated system packages have their shared users * associated with them. diff --git a/services/java/com/android/server/wm/WindowAnimator.java b/services/java/com/android/server/wm/WindowAnimator.java index 269eac074d65..9a62482f17c7 100644 --- a/services/java/com/android/server/wm/WindowAnimator.java +++ b/services/java/com/android/server/wm/WindowAnimator.java @@ -264,6 +264,8 @@ public class WindowAnimator { WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER); } } + if (WindowManagerService.DEBUG_WALLPAPER_LIGHT && !token.hidden) Slog.d(TAG, + "Hiding wallpaper " + token + " from " + w); token.hidden = true; } } diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index 9511a1a951f8..637f2de086e5 100755 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -192,6 +192,7 @@ public class WindowManagerService extends IWindowManager.Stub static final boolean DEBUG_STARTING_WINDOW = false; static final boolean DEBUG_REORDER = false; static final boolean DEBUG_WALLPAPER = false; + static final boolean DEBUG_WALLPAPER_LIGHT = true || DEBUG_WALLPAPER; static final boolean DEBUG_DRAG = false; static final boolean DEBUG_SCREEN_ON = false; static final boolean DEBUG_SCREENSHOT = false; @@ -1625,7 +1626,7 @@ public class WindowManagerService extends IWindowManager.Stub } if (foundW == null && windowDetachedI >= 0) { - if (DEBUG_WALLPAPER) Slog.v(TAG, + if (DEBUG_WALLPAPER_LIGHT) Slog.v(TAG, "Found animating detached wallpaper activity: #" + i + "=" + w); foundW = w; foundI = windowDetachedI; @@ -1641,12 +1642,12 @@ public class WindowManagerService extends IWindowManager.Stub // enough (we'll just wait until whatever transition is pending // executes). if (mWallpaperTarget != null && mWallpaperTarget.mAppToken != null) { - if (DEBUG_WALLPAPER) Slog.v(TAG, + if (DEBUG_WALLPAPER_LIGHT) Slog.v(TAG, "Wallpaper not changing: waiting for app anim in current target"); return 0; } if (foundW != null && foundW.mAppToken != null) { - if (DEBUG_WALLPAPER) Slog.v(TAG, + if (DEBUG_WALLPAPER_LIGHT) Slog.v(TAG, "Wallpaper not changing: waiting for app anim in found target"); return 0; } @@ -1654,7 +1655,7 @@ public class WindowManagerService extends IWindowManager.Stub if (mWallpaperTarget != foundW && (mLowerWallpaperTarget == null || mLowerWallpaperTarget != foundW)) { - if (DEBUG_WALLPAPER) { + if (DEBUG_WALLPAPER_LIGHT) { Slog.v(TAG, "New wallpaper target: " + foundW + " oldTarget: " + mWallpaperTarget); } @@ -1674,17 +1675,17 @@ public class WindowManagerService extends IWindowManager.Stub boolean foundAnim = foundW.mWinAnimator.mAnimation != null || (foundW.mAppToken != null && foundW.mAppToken.mAppAnimator.animation != null); - if (DEBUG_WALLPAPER) { + if (DEBUG_WALLPAPER_LIGHT) { Slog.v(TAG, "New animation: " + foundAnim + " old animation: " + oldAnim); } if (foundAnim && oldAnim) { int oldI = windows.indexOf(oldW); - if (DEBUG_WALLPAPER) { + if (DEBUG_WALLPAPER_LIGHT) { Slog.v(TAG, "New i: " + foundI + " old i: " + oldI); } if (oldI >= 0) { - if (DEBUG_WALLPAPER) { + if (DEBUG_WALLPAPER_LIGHT) { Slog.v(TAG, "Animating wallpapers: old#" + oldI + "=" + oldW + "; new#" + foundI + "=" + foundW); @@ -1692,7 +1693,7 @@ public class WindowManagerService extends IWindowManager.Stub // Set the new target correctly. if (foundW.mAppToken != null && foundW.mAppToken.hiddenRequested) { - if (DEBUG_WALLPAPER) { + if (DEBUG_WALLPAPER_LIGHT) { Slog.v(TAG, "Old wallpaper still the target."); } mWallpaperTarget = oldW; @@ -1704,7 +1705,7 @@ public class WindowManagerService extends IWindowManager.Stub // the wallpaper below the lower. else if (foundI > oldI) { // The new target is on top of the old one. - if (DEBUG_WALLPAPER) { + if (DEBUG_WALLPAPER_LIGHT) { Slog.v(TAG, "Found target above old target."); } mUpperWallpaperTarget = foundW; @@ -1713,7 +1714,7 @@ public class WindowManagerService extends IWindowManager.Stub foundI = oldI; } else { // The new target is below the old one. - if (DEBUG_WALLPAPER) { + if (DEBUG_WALLPAPER_LIGHT) { Slog.v(TAG, "Found target below old target."); } mUpperWallpaperTarget = oldW; @@ -1732,7 +1733,7 @@ public class WindowManagerService extends IWindowManager.Stub || (mUpperWallpaperTarget.mAppToken != null && mUpperWallpaperTarget.mAppToken.mAppAnimator.animation != null); if (!lowerAnimating || !upperAnimating) { - if (DEBUG_WALLPAPER) { + if (DEBUG_WALLPAPER_LIGHT) { Slog.v(TAG, "No longer animating wallpaper targets!"); } mLowerWallpaperTarget = null; @@ -1810,6 +1811,8 @@ public class WindowManagerService extends IWindowManager.Stub curTokenIndex--; WindowToken token = mWallpaperTokens.get(curTokenIndex); if (token.hidden == visible) { + if (DEBUG_WALLPAPER_LIGHT) Slog.d(TAG, + "Wallpaper token " + token + " hidden=" + !visible); changed |= ADJUST_WALLPAPER_VISIBILITY_CHANGED; token.hidden = !visible; // Need to do a layout to ensure the wallpaper now has the @@ -1831,7 +1834,7 @@ public class WindowManagerService extends IWindowManager.Stub dispatchWallpaperVisibility(wallpaper, visible); wallpaper.mWinAnimator.mAnimLayer = wallpaper.mLayer + mWallpaperAnimLayerAdjustment; - if (DEBUG_LAYERS || DEBUG_WALLPAPER) Slog.v(TAG, "adjustWallpaper win " + if (DEBUG_LAYERS || DEBUG_WALLPAPER_LIGHT) Slog.v(TAG, "adjustWallpaper win " + wallpaper + " anim layer: " + wallpaper.mWinAnimator.mAnimLayer); // First, if this window is at the current index, then all @@ -1858,7 +1861,7 @@ public class WindowManagerService extends IWindowManager.Stub } // Now stick it in. - if (DEBUG_WALLPAPER || DEBUG_WINDOW_MOVEMENT || DEBUG_ADD_REMOVE) { + if (DEBUG_WALLPAPER_LIGHT || DEBUG_WINDOW_MOVEMENT || DEBUG_ADD_REMOVE) { Slog.v(TAG, "Moving wallpaper " + wallpaper + " from " + oldIndex + " to " + foundI); } @@ -2033,9 +2036,9 @@ public class WindowManagerService extends IWindowManager.Stub if (wallpaper.mWallpaperVisible != visible) { wallpaper.mWallpaperVisible = visible; try { - if (DEBUG_VISIBILITY || DEBUG_WALLPAPER) Slog.v(TAG, - "Updating visibility of wallpaper " + wallpaper - + ": " + visible + " Callers=" + Debug.getCallers(2)); + if (DEBUG_VISIBILITY || DEBUG_WALLPAPER_LIGHT) Slog.v(TAG, + "Updating vis of wallpaper " + wallpaper + + ": " + visible + " from:\n" + Debug.getCallers(4, " ")); wallpaper.mClient.dispatchAppVisibility(visible); } catch (RemoteException e) { } @@ -8800,10 +8803,10 @@ public class WindowManagerService extends IWindowManager.Stub WindowState oldWallpaper = mWallpaperTarget; if (mLowerWallpaperTarget != null && mLowerWallpaperTarget.mAppToken != null) { - if (DEBUG_WALLPAPER) Slog.v(TAG, + if (DEBUG_WALLPAPER_LIGHT) Slog.v(TAG, "wallpaperForceHiding changed with lower=" + mLowerWallpaperTarget); - if (DEBUG_WALLPAPER) Slog.v(TAG, + if (DEBUG_WALLPAPER_LIGHT) Slog.v(TAG, "hidden=" + mLowerWallpaperTarget.mAppToken.hidden + " hiddenRequested=" + mLowerWallpaperTarget.mAppToken.hiddenRequested); if (mLowerWallpaperTarget.mAppToken.hidden) { @@ -8815,7 +8818,7 @@ public class WindowManagerService extends IWindowManager.Stub } } mInnerFields.mAdjResult |= adjustWallpaperWindowsLocked(); - if (DEBUG_WALLPAPER) Slog.v(TAG, "****** OLD: " + oldWallpaper + if (DEBUG_WALLPAPER_LIGHT) Slog.v(TAG, "****** OLD: " + oldWallpaper + " NEW: " + mWallpaperTarget + " LOWER: " + mLowerWallpaperTarget); return changes; @@ -9189,7 +9192,7 @@ public class WindowManagerService extends IWindowManager.Stub } } if ((w.mAttrs.flags & FLAG_SHOW_WALLPAPER) != 0) { - if (DEBUG_WALLPAPER) Slog.v(TAG, + if (DEBUG_WALLPAPER_LIGHT) Slog.v(TAG, "First draw done in potential wallpaper target " + w); mInnerFields.mWallpaperMayChange = true; displayContent.pendingLayoutChanges |= @@ -9340,18 +9343,18 @@ public class WindowManagerService extends IWindowManager.Stub mInnerFields.mWallpaperForceHidingChanged = false; if (mInnerFields.mWallpaperMayChange) { - if (WindowManagerService.DEBUG_WALLPAPER) Slog.v(TAG, + if (WindowManagerService.DEBUG_WALLPAPER_LIGHT) Slog.v(TAG, "Wallpaper may change! Adjusting"); mInnerFields.mAdjResult |= adjustWallpaperWindowsLocked(); } if ((mInnerFields.mAdjResult&ADJUST_WALLPAPER_LAYERS_CHANGED) != 0) { - if (DEBUG_WALLPAPER) Slog.v(TAG, + if (DEBUG_WALLPAPER_LIGHT) Slog.v(TAG, "Wallpaper layer changed: assigning layers + relayout"); defaultDisplay.pendingLayoutChanges |= WindowManagerPolicy.FINISH_LAYOUT_REDO_LAYOUT; assignLayersLocked(defaultWindows); } else if ((mInnerFields.mAdjResult&ADJUST_WALLPAPER_VISIBILITY_CHANGED) != 0) { - if (DEBUG_WALLPAPER) Slog.v(TAG, + if (DEBUG_WALLPAPER_LIGHT) Slog.v(TAG, "Wallpaper visibility changed: relayout"); defaultDisplay.pendingLayoutChanges |= WindowManagerPolicy.FINISH_LAYOUT_REDO_LAYOUT; } @@ -10326,7 +10329,7 @@ public class WindowManagerService extends IWindowManager.Stub Iterator<WindowToken> it = mTokenMap.values().iterator(); while (it.hasNext()) { WindowToken token = it.next(); - pw.print(" Token "); pw.print(token.token); + pw.print(" "); pw.print(token); if (dumpAll) { pw.println(':'); token.dump(pw, " "); @@ -10354,8 +10357,9 @@ public class WindowManagerService extends IWindowManager.Stub pw.println(); pw.println(" Application tokens in Z order:"); for (int i=mAppTokens.size()-1; i>=0; i--) { - pw.print(" App #"); pw.print(i); pw.println(": "); - mAppTokens.get(i).dump(pw, " "); + pw.print(" App #"); pw.print(i); + pw.print(' '); pw.print(mAppTokens.get(i)); pw.println(":"); + mAppTokens.get(i).dump(pw, " "); } } if (mFinishedStarting.size() > 0) { diff --git a/services/java/com/android/server/wm/WindowState.java b/services/java/com/android/server/wm/WindowState.java index c195f4578d8b..0a9c3e5bfdcd 100644 --- a/services/java/com/android/server/wm/WindowState.java +++ b/services/java/com/android/server/wm/WindowState.java @@ -282,7 +282,7 @@ final class WindowState implements WindowManagerPolicy.WindowState { mEnforceSizeCompat = (mAttrs.flags & FLAG_COMPATIBLE_WINDOW) != 0; if (WindowManagerService.localLOGV) Slog.v( TAG, "Window " + this + " client=" + c.asBinder() - + " token=" + token + " (" + mAttrs.token + ")"); + + " token=" + token + " (" + mAttrs.token + ")" + " params=" + a); try { c.asBinder().linkToDeath(deathRecipient, 0); } catch (RemoteException e) { diff --git a/services/java/com/android/server/wm/WindowToken.java b/services/java/com/android/server/wm/WindowToken.java index 5ec151b8e805..e581915abee5 100644 --- a/services/java/com/android/server/wm/WindowToken.java +++ b/services/java/com/android/server/wm/WindowToken.java @@ -79,7 +79,6 @@ class WindowToken { } void dump(PrintWriter pw, String prefix) { - pw.print(prefix); pw.print("token="); pw.println(token); pw.print(prefix); pw.print("windows="); pw.println(windows); pw.print(prefix); pw.print("windowType="); pw.print(windowType); pw.print(" hidden="); pw.print(hidden); @@ -97,7 +96,7 @@ class WindowToken { StringBuilder sb = new StringBuilder(); sb.append("WindowToken{"); sb.append(Integer.toHexString(System.identityHashCode(this))); - sb.append(" token="); sb.append(token); sb.append('}'); + sb.append(" "); sb.append(token); sb.append('}'); stringName = sb.toString(); } return stringName; |
