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

Commit 95404c66 authored by nicolasroard's avatar nicolasroard
Browse files

Fix UI stuff 

bug:7354368
bug:7362027
bug:7344915
Change-Id: I2efd5de0971e5dfbc989d60860348280c03b3db4
parent eb321f77

res/layout/filtershow_activity.xml

+14 −10
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="@color/background_main_toolbar" >

    android:background="@color/background_screen" >



    <LinearLayout

        android:id="@+id/imageStatePanel"
@@ -176,6 +176,7 @@ 
              android:layout_width="match_parent"

              android:layout_height="wrap_content"

              android:layout_gravity="center"

              android:background="@color/background_main_toolbar"

              custom:max_width="600dip"

              android:orientation="vertical">
@@ -187,7 +188,7 @@ 
            <LinearLayout

                android:id="@+id/filterButtonsList"

                android:layout_width="fill_parent"

                android:layout_height="96dip"

                android:layout_height="@dimen/thumbnail_size"

                android:background="@color/background_main_toolbar"

                android:orientation="horizontal"

                android:visibility="gone" >
@@ -225,13 +226,14 @@ 
            <HorizontalScrollView

                android:id="@+id/fxList"

                android:layout_width="match_parent"

                android:layout_height="96dip"

                android:layout_height="@dimen/thumbnail_size"

                android:scrollbars="none" >



                <LinearLayout

                    android:id="@+id/listFilters"

                    android:layout_width="wrap_content"

                    android:layout_height="match_parent"

                    android:layout_marginLeft="@dimen/thumbnail_margin"

                    android:orientation="horizontal" >

                </LinearLayout>

            </HorizontalScrollView>
@@ -239,7 +241,7 @@ 
            <HorizontalScrollView

                android:id="@+id/bordersList"

                android:layout_width="match_parent"

                android:layout_height="96dip"

                android:layout_height="@dimen/thumbnail_size"

                android:visibility="gone"

                android:scrollbars="none" >
@@ -247,6 +249,7 @@ 
                    android:id="@+id/listBorders"

                    android:layout_width="wrap_content"

                    android:layout_height="match_parent"

                    android:layout_marginLeft="@dimen/thumbnail_margin"

                    android:orientation="horizontal" >

                </LinearLayout>

            </HorizontalScrollView>
@@ -254,7 +257,7 @@ 
            <HorizontalScrollView

                android:id="@+id/geometryList"

                android:layout_width="fill_parent"

                android:layout_height="96dip"

                android:layout_height="@dimen/thumbnail_size"

                android:background="@color/background_main_toolbar"

                android:visibility="gone"

                android:scrollbars="none" >
@@ -303,7 +306,7 @@ 
            <HorizontalScrollView

                android:id="@+id/colorsFxList"

                android:layout_width="fill_parent"

                android:layout_height="96dip"

                android:layout_height="@dimen/thumbnail_size"

                android:background="@color/background_main_toolbar"

                android:visibility="gone"

                android:scrollbars="none" >
@@ -312,6 +315,7 @@ 
                    android:id="@+id/listColorsFx"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_marginLeft="@dimen/thumbnail_margin"

                    android:orientation="horizontal" >



                    <com.android.gallery3d.filtershow.ui.ImageButtonTitle
@@ -399,7 +403,7 @@ 


            <ImageButton

                android:id="@+id/fxButton"

                android:layout_width="wrap_content"

                android:layout_width="@dimen/thumbnail_size"

                android:layout_height="match_parent"

                android:layout_weight="1"

                android:background="@drawable/filtershow_button_background"
@@ -408,7 +412,7 @@ 


            <ImageButton

                android:id="@+id/borderButton"

                android:layout_width="wrap_content"

                android:layout_width="@dimen/thumbnail_size"

                android:layout_height="match_parent"

                android:layout_weight="1"

                android:background="@drawable/filtershow_button_background"
@@ -418,7 +422,7 @@ 


            <ImageButton

                android:id="@+id/geometryButton"

                android:layout_width="wrap_content"

                android:layout_width="@dimen/thumbnail_size"

                android:layout_height="match_parent"

                android:layout_weight="1"

                android:background="@drawable/filtershow_button_background"
@@ -428,7 +432,7 @@ 


            <ImageButton

                android:id="@+id/colorsButton"

                android:layout_width="wrap_content"

                android:layout_width="@dimen/thumbnail_size"

                android:layout_height="match_parent"

                android:layout_weight="1"

                android:background="@drawable/filtershow_button_background"

res/values-sw600dp/dimensions.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- 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.

-->

<resources>

    <!--  configuration for filtershow UI -->

    <dimen name="thumbnail_size">128dip</dimen>

    <dimen name="thumbnail_margin">3dip</dimen>

</resources>

res/values-sw800dp/dimensions.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- 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.

-->

<resources>

    <!--  configuration for filtershow UI -->

    <dimen name="thumbnail_size">128dip</dimen>

    <dimen name="thumbnail_margin">3dip</dimen>

</resources>

res/values/dimensions.xml

+4 −0
Original line number Diff line number Diff line
@@ -46,4 +46,8 @@ 


    <!-- for manage cache bar -->

    <dimen name="manage_cache_bottom_height">48dp</dimen>



    <!--  configuration for filtershow UI -->

    <dimen name="thumbnail_size">96dip</dimen>

    <dimen name="thumbnail_margin">3dip</dimen>

</resources>

res/values/filtershow_color.xml

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
    <color name="red">#FF0000</color>

    <color name="blue">#0000FF</color>

    <color name="text_toolbar">#FFFFFF</color>

    <color name="background_screen">#000000</color>

    <color name="background_toolbar">#363949</color>

    <color name="background_main_toolbar">#1e2028</color>

    <color name="toolbar_separation_line">#333333</color>