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

Commit 43c1248a authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "QS: Add long-press to customize prototype - part 3"

parents 435acfc8 2681dcb6

packages/SystemUI/res/anim/fab_elevation.xml

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

<!-- Copyright (C) 2015 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.

-->

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

    <item android:state_enabled="true" android:state_pressed="true">

        <set>

            <objectAnimator

                android:duration="@android:integer/config_shortAnimTime"

                android:propertyName="translationZ"

                android:valueTo="@dimen/fab_press_translation_z"

                android:valueType="floatType" />

        </set>

    </item>

    <item>

        <set>

            <objectAnimator

                android:duration="@android:integer/config_shortAnimTime"

                android:propertyName="translationZ"

                android:valueTo="0"

                android:valueType="floatType" />

        </set>

    </item>

</selector>

packages/SystemUI/res/drawable/fab_background.xml

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

<!-- Copyright (C) 2015 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.

-->

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

        android:color="@color/fab_ripple">

    <item>

        <shape>

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

        </shape>

    </item>

</ripple>

packages/SystemUI/res/drawable/ic_add.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<!--

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

-->

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

        android:width="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="48.0"

        android:viewportHeight="48.0">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M38.0,26.0L26.0,26.0l0.0,12.0l-4.0,0.0L22.0,26.0L10.0,26.0l0.0,-4.0l12.0,0.0L22.0,10.0l4.0,0.0l0.0,12.0l12.0,0.0l0.0,4.0z"/>

</vector>

packages/SystemUI/res/layout/qs_customize_panel.xml

+14 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

    android:paddingBottom="@dimen/navigation_bar_size"

    android:background="?android:attr/windowBackground">



    <FrameLayout
@@ -76,7 +77,8 @@ 


    <com.android.systemui.tuner.AutoScrollView

        android:layout_width="match_parent"

        android:layout_height="fill_parent"

        android:layout_height="0dp"

        android:layout_weight="1"

        android:paddingTop="8dp"

        android:paddingBottom="8dp"

        android:elevation="2dp">
@@ -89,4 +91,15 @@ 


    </com.android.systemui.tuner.AutoScrollView>



    <com.android.systemui.qs.customize.FloatingActionButton

        android:id="@+id/fab"

        android:clickable="true"

        android:layout_width="@dimen/fab_size"

        android:layout_height="@dimen/fab_size"

        android:layout_gravity="bottom|end"

        android:layout_marginEnd="@dimen/fab_margin"

        android:layout_marginBottom="@dimen/fab_margin"

        android:elevation="@dimen/fab_elevation"

        android:background="@drawable/fab_background" />



</com.android.systemui.qs.customize.QSCustomizer>

packages/SystemUI/res/values-sw600dp/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -98,4 +98,6 @@ 
         In sw600dp we want the buttons centered so this fills the space,

         (screen_pinning_request_width - 3 * screen_pinning_request_button_width) / 2 -->

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



    <dimen name="fab_margin">24dp</dimen>

</resources>