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

Commit 4a6b6129 authored by Rodolfo Hurtado's avatar Rodolfo Hurtado Committed by Steve Kondik
Browse files

Phone and Messaging Lockscreen resources 

Change-Id: Ida52d9e88030daea7033a7651e82f0d18a847448

Phone and Messaging LockScren resources.

Change-Id: I9d75160ba252485c1a89b420a05c795b4a229f82

Phone and Messaging LockScren resources

fix lockscreen landscape layout

Change-Id: Iec8448c86ee60c5dafae5ec0c403a0c595339388

Add Phone and Messaging SlidingTab to LockScreen

Change-Id: I10f5632acfb1acbba87502e1f5c4630c1fc74854

lockscreen: Fix NPE if new sliding tabs fail to load.

Change-Id: I91e6531fe936719adb6262ca82c8fd8503a4bf9f

Lockscreen.java Fixed mSelector2 crash if not creation succed

Change-Id: Ic38dde27eb786e339bf44e106f437a6da355863e
parent a60c4335

core/java/android/provider/Settings.java

+6 −0
Original line number Diff line number Diff line
@@ -2076,6 +2076,12 @@ public final class Settings { 
        public static final String LOCKSCREEN_QUICK_UNLOCK_CONTROL =

            "lockscreen_quick_unlock_control";



        /**

         * Whether to use the custom Phone and Messaging SlidingTab

         * @hide

         */

        public static final String LOCKSCREEN_PHONE_MESSAGING_TAB = "lockscreen_phone_messaging_tab";



        /**

         * Pulse the Trackball with Screen On.  The value is boolean (1 or 0).

         * @hide

core/res/res/drawable-hdpi/ic_jog_dial_messaging.png

0 → 100644
+6.99 KiB
Loading image diff...

core/res/res/drawable-mdpi/ic_jog_dial_messaging.png

0 → 100644
+4.59 KiB
Loading image diff...

core/res/res/layout/keyguard_screen_tab_unlock.xml

+15 −6
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_below="@id/carrier"

        android:layout_marginTop="52dip"

        android:layout_marginTop="32dip"

        android:layout_marginLeft="20dip"

        android:layout_marginBottom="8dip"

        >
@@ -153,13 +153,22 @@ 
        android:drawablePadding="4dip"

        />



    <com.android.internal.widget.SlidingTab

        android:id="@+id/tab_selector2"

        android:orientation="horizontal"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_alignParentBottom="true"

        android:layout_marginBottom="150dip"

        />



    <com.android.internal.widget.SlidingTab

        android:id="@+id/tab_selector"

        android:orientation="horizontal"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_alignParentBottom="true"

        android:layout_marginBottom="80dip"

        android:layout_marginBottom="60dip"

        />



    <!-- emergency call button shown when sim is PUKd and tab_selector is
@@ -185,7 +194,7 @@ 
        android:layout_height="wrap_content"

        android:layout_centerInParent="true"

        android:layout_alignParentBottom="true"

        android:layout_marginBottom="20dip"

        android:layout_marginBottom="10dip"

        android:padding="10px"

        android:background="@color/transparent"

        android:visibility="gone"
@@ -197,7 +206,7 @@ 
        android:src="@drawable/ic_media_pause"

        android:layout_centerInParent="true"

        android:layout_alignParentBottom="true"

        android:layout_marginBottom="20dip"

        android:layout_marginBottom="10dip"

        android:padding="10px"

        android:background="@color/transparent"

        android:visibility="gone"
@@ -208,7 +217,7 @@ 
        android:layout_height="wrap_content"

        android:src="@drawable/ic_media_previous"

        android:layout_alignParentBottom="true"

        android:layout_marginBottom="20dip"

        android:layout_marginBottom="10dip"

        android:padding="10px"

        android:layout_toLeftOf="@+id/musicControlPause"

        android:background="@color/transparent"
@@ -220,7 +229,7 @@ 
        android:layout_height="wrap_content"

        android:src="@drawable/ic_media_next"

        android:layout_alignParentBottom="true"

        android:layout_marginBottom="20dip"

        android:layout_marginBottom="10dip"

        android:padding="10px"

        android:layout_toRightOf="@+id/musicControlPause"

        android:background="@color/transparent"

core/res/res/layout/keyguard_screen_tab_unlock_land.xml

+8 −1
Original line number Diff line number Diff line
@@ -202,12 +202,19 @@ 
    </RelativeLayout>



    <!-- right side -->

    <com.android.internal.widget.SlidingTab

        android:id="@+id/tab_selector2"

        android:orientation="vertical"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        />



    <com.android.internal.widget.SlidingTab

        android:id="@+id/tab_selector"

        android:orientation="vertical"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_marginRight="80dip"

        android:layout_marginRight="60dip"

        />



    <!-- emergency call button shown when sim is PUKd and tab_selector is