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

Commit a2f945e2 authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge "Changed the swipe up search affordance" into lmp-dev

parents 025207b3 92d892c0

packages/SystemUI/res/anim/search_launch_enter.xml

+5 −13
Original line number Diff line number Diff line
@@ -17,16 +17,8 @@ 
*/

-->



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

        android:shareInterpolator="false" android:zAdjustment="top">



    <alpha android:fromAlpha="0" android:toAlpha="1.0"

            android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"

            android:interpolator="@android:interpolator/decelerate_cubic"

            android:duration="300"/>



    <translate android:fromYDelta="100%" android:toYDelta="0"

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

       android:fromAlpha="0" android:toAlpha="1.0"

       android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"

       android:interpolator="@android:interpolator/decelerate_cubic"

       android:duration="300"/>
 
 No newline at end of file
 
</set>

packages/SystemUI/res/drawable/search_panel_card_bg.xml

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



<!--

  ~ Copyright (C) 2014 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">

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

    <corners android:radius="@dimen/notification_material_rounded_rect_radius" />

</shape>

packages/SystemUI/res/layout/status_bar_search_panel.xml

+4 −7
Original line number Diff line number Diff line
@@ -30,17 +30,14 @@ 
        android:id="@+id/search_panel_scrim"

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



    <FrameLayout

        style="@style/SearchPanelCard"

        android:id="@+id/search_panel_card"

        android:background="@drawable/search_panel_card_bg"

        android:elevation="12dp">

    <com.android.systemui.SearchPanelCircleView

        style="@style/SearchPanelCircle"

        android:id="@+id/search_panel_circle">



        <ImageView

            style="@style/SearchPanelLogo"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:id="@+id/search_logo" />

    </FrameLayout>

    </com.android.systemui.SearchPanelCircleView>



</com.android.systemui.SearchPanelView>

packages/SystemUI/res/values-land/styles.xml

+0 −12
Original line number Diff line number Diff line
@@ -19,18 +19,6 @@ 
        <item name="android:layout_width">360dp</item>

    </style>



    <style name="SearchPanelCard">

        <item name="android:layout_width">@dimen/search_panel_card_height</item>

        <item name="android:layout_height">match_parent</item>

        <item name="android:layout_marginTop">16dp</item>

        <item name="android:layout_marginBottom">16dp</item>

        <item name="android:layout_gravity">right</item>

    </style>



    <style name="SearchPanelLogo">

        <item name="android:layout_gravity">top|left</item>

    </style>



    <style name="SearchPanelScrim">

        <item name="android:layout_width">@dimen/search_panel_scrim_height</item>

        <item name="android:layout_height">match_parent</item>

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

+0 −10
Original line number Diff line number Diff line
@@ -19,16 +19,6 @@ 
        <item name="android:layout_width">480dp</item>

    </style>



    <style name="SearchPanelCard">

        <item name="android:layout_width">550dp</item>

        <item name="android:layout_height">@dimen/search_panel_card_height</item>

        <item name="android:layout_gravity">center_horizontal|bottom</item>

    </style>



    <style name="SearchPanelLogo">

        <item name="android:layout_gravity">top|center_horizontal</item>

    </style>



    <style name="SearchPanelScrim">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">@dimen/search_panel_scrim_height</item>