Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2bf6181 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard to show the... 

am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev

* commit '2c29deaa':
  Add mechanism to kick keyguard to show the assistant
parents 79b08a49 2c29deaa

core/java/android/view/IWindowManager.aidl

+36 −30
Original line number Diff line number Diff line
@@ -259,4 +259,10 @@ interface IWindowManager 
     * Device is in safe mode.

     */

    boolean isSafeModeEnabled();



    /**

     * Tell keyguard to show the assistant (Intent.ACTION_ASSIST) after asking for the user's

     * credentials.

     */

    void showAssistant();

}

core/java/android/view/WindowManagerPolicy.java

+6 −0
Original line number Diff line number Diff line
@@ -1136,4 +1136,10 @@ public interface WindowManagerPolicy { 
     * @param args additional arguments to the dump request.

     */

    public void dump(String prefix, PrintWriter writer, String[] args);



    /**

     * Ask keyguard to invoke the assist intent after dismissing keyguard

     * {@link android.content.Intent#ACTION_ASSIST}

     */

    public void showAssistant();

}

core/res/res/anim/keyguard_action_assist_enter.xml

0 → 100644
+32 −0
Original line number Diff line number Diff line 
<?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.

*/

-->



<set xmlns:android="http://schemas.android.com/apk/res/android"

        android:shareInterpolator="false" android:zAdjustment="top">



    <alpha android:fromAlpha="0" android:toAlpha="1.0"

            android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"

            android:interpolator="@android:interpolator/decelerate_cubic"

            android:duration="300"/>



    <translate android:fromYDelta="100%" android:toYDelta="0"

            android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"

            android:interpolator="@android:interpolator/decelerate_cubic"

            android:duration="300" />

</set>

core/res/res/anim/keyguard_action_assist_exit.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?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.

*/

-->



<translate xmlns:android="http://schemas.android.com/apk/res/android"

       android:interpolator="@android:anim/accelerate_interpolator"

       android:fromXDelta="0" android:toXDelta="0"

       android:duration="300" />

core/res/res/values/symbols.xml

+3 −0
Original line number Diff line number Diff line
@@ -1189,6 +1189,9 @@ 
  <java-symbol type="anim" name="keyguard_security_animate_out" />

  <java-symbol type="anim" name="keyguard_security_fade_in" />

  <java-symbol type="anim" name="keyguard_security_fade_out" />

  <java-symbol type="anim" name="keyguard_action_assist_exit" />

  <java-symbol type="anim" name="keyguard_action_assist_enter" />



  <java-symbol type="array" name="config_keyboardTapVibePattern" />

  <java-symbol type="array" name="config_longPressVibePattern" />

  <java-symbol type="array" name="config_safeModeDisabledVibePattern" />