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

Commit a3a078e3 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Fix 3201849: Use custom Drawable for bg in lockscreen" into honeycomb

parents 02e852f9 39d4b067
Loading
Loading
Loading
Loading
+2 −4
Original line number Diff line number Diff line
@@ -25,9 +25,7 @@
    android:orientation="vertical"
    android:gravity="bottom"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="#ff800000"
        >
    android:layout_height="match_parent">

    <LinearLayout
        android:orientation="vertical"
+1 −2
Original line number Diff line number Diff line
@@ -26,8 +26,7 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical"
    android:id="@+id/root"
    android:background="#70000000">
    android:id="@+id/root">

    <!-- top: status -->
    <RelativeLayout
+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="horizontal"
    android:background="#70000000"
    android:id="@+id/root">

    <!-- left side: status -->
+1 −2
Original line number Diff line number Diff line
@@ -25,8 +25,7 @@
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:orientation="horizontal"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="#70000000">
    android:layout_height="match_parent">

    <!-- left side: status  -->
    <RelativeLayout
+1 −3
Original line number Diff line number Diff line
@@ -21,9 +21,7 @@
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:orientation="vertical"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="#70000000"
        >
    android:layout_height="match_parent">

    <!-- top: status -->
    <LinearLayout
Loading