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

Commit dd3af83f authored by Garfield Tan's avatar Garfield Tan Committed by android-build-merger
Browse files

Merge "Make buttons of bottom bars match spec." into arc-apps 

am: 31018c2e

Change-Id: Icdb7ea92a19f1a58dd47ca84ec929c44030c2ef9
parents c54ad10b 31018c2e

res/drawable/bottom_bar_positive_button_background.xml

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

<!--

  ~ Copyright (C) 2017 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.

  -->



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

    android:shape="rectangle">

    <corners android:radius="2dp" />

    <solid android:color="@color/primary" />

</shape>
 
 No newline at end of file

res/layout/fragment_pick.xml

+14 −12
Original line number Diff line number Diff line
@@ -16,22 +16,24 @@ 


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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_height="@dimen/bottom_bar_height"

    android:orientation="horizontal"

    android:baselineAligned="false"

    android:gravity="end"

    android:paddingEnd="8dp"

    android:minHeight="?android:attr/listPreferredItemHeightSmall">

    <Button

    android:paddingEnd="@dimen/bottom_bar_padding_end">

    <TextView

        style="@style/BottomBarButton"

        android:id="@android:id/button2"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_width="@dimen/bottom_bar_negative_button_width"

        android:background="@android:color/transparent"

        android:text="@android:string/cancel"

        android:visibility="gone"

        style="?android:attr/buttonBarNegativeButtonStyle" />

    <Button

        android:textColor="@color/primary"/>

    <TextView

        style="@style/BottomBarButton"

        android:id="@android:id/button1"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        style="?android:attr/buttonBarPositiveButtonStyle" />

        android:layout_width="@dimen/bottom_bar_positive_button_width"

        android:layout_marginStart="@dimen/bottom_bar_positive_button_margin_start"

        android:background="@drawable/bottom_bar_positive_button_background"

        android:elevation="@dimen/bottom_bar_positive_button_elevation"

        android:textColor="@android:color/white"/>

</LinearLayout>

res/layout/fragment_save.xml

+9 −5
Original line number Diff line number Diff line
@@ -16,8 +16,9 @@ 


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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_height="@dimen/bottom_bar_height"

    android:paddingStart="@dimen/list_item_padding"

    android:paddingEnd="@dimen/bottom_bar_padding_end"

    android:orientation="horizontal"

    android:baselineAligned="false"

    android:gravity="center_vertical"
@@ -50,12 +51,15 @@ 
        android:layout_width="wrap_content"

        android:layout_height="match_parent">



        <Button

        <TextView

            style="@style/BottomBarButton"

            android:id="@android:id/button1"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:layout_width="@dimen/bottom_bar_positive_button_width"

            android:layout_marginStart="@dimen/bottom_bar_positive_button_margin_start"

            android:background="@drawable/bottom_bar_positive_button_background"

            android:text="@string/menu_save"

            style="?android:attr/buttonBarPositiveButtonStyle" />

            android:elevation="@dimen/bottom_bar_positive_button_elevation"

            android:textColor="@android:color/white"/>



        <ProgressBar

            android:id="@android:id/progress"

res/values/colors.xml

+0 −1
Original line number Diff line number Diff line
@@ -70,5 +70,4 @@ 
    <color name="scroll_thumb_pressed">#ff8c8c8c</color>

    <color name="scroll_thumb">#ffbebebe</color>

    <color name="scroll_track">#fff0f0f0</color>



</resources>

res/values/dimens.xml

+7 −0
Original line number Diff line number Diff line
@@ -62,4 +62,11 @@ 
    <dimen name="fastscroll_default_thickness">8dp</dimen>

    <dimen name="fastscroll_minimum_range">50dp</dimen>

    <dimen name="fastscroll_margin">0dp</dimen>



    <dimen name="bottom_bar_height">56dp</dimen>

    <dimen name="bottom_bar_padding_end">10dp</dimen>

    <dimen name="bottom_bar_negative_button_width">88.5dp</dimen>

    <dimen name="bottom_bar_positive_button_margin_start">8dp</dimen>

    <dimen name="bottom_bar_positive_button_width">73dp</dimen>

    <dimen name="bottom_bar_positive_button_elevation">2dp</dimen>

</resources>