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

Commit e690ad99 authored by Fredrik Ryden's avatar Fredrik Ryden Committed by android-build-merger
Browse files

Merge "Fixed button bar hiding permissions screen." am: 52ca98bf am: 786423b5

am: bac5687e

Change-Id: I08014eb511959e99828ede7a2a3690a71f026a84
parents aac96db6 bac5687e
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@
    </ScrollView>

    <LinearLayout style="?android:attr/buttonBarStyle"
        android:background="?android:attr/windowBackground"
        android:background="?android:attr/colorBackground"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:orientation="horizontal"
+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@

    <!-- Bottom buttons -->
    <LinearLayout style="?android:attr/buttonBarStyle"
        android:background="?android:attr/windowBackground"
        android:background="?android:attr/colorBackground"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:orientation="horizontal"
+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@

        <!-- Bottom buttons -->
        <LinearLayout style="?android:attr/buttonBarStyle"
            android:background="?android:attr/windowBackground"
            android:background="?android:attr/colorBackground"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:orientation="horizontal"