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

Commit 78337f8a authored by Matt Casey's avatar Matt Casey Committed by Automerger Merge Worker
Browse files

Merge "Remove the unused assistant orb UI." into sc-v2-dev am: 525dec66 am: 6e194cd3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16247451

Change-Id: I53e2eabfdabb17a196c6f45e3bd1816c608e70ce
parents 50701a0b 6e194cd3

packages/SystemUI/res/drawable/assist_orb_navbar_scrim.xml

deleted100644 → 0
+0 −25
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">

    <gradient

            android:type="linear"

            android:angle="90"

            android:startColor="#33000000"

            android:endColor="#00000000" />

</shape>
 
 No newline at end of file

packages/SystemUI/res/drawable/assist_orb_scrim.xml

deleted100644 → 0
+0 −25
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">

    <gradient

            android:type="linear"

            android:angle="90"

            android:startColor="#55000000"

            android:endColor="#00000000" />

</shape>
 
 No newline at end of file

packages/SystemUI/res/layout/assist_orb.xml

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

<!--

**

** Copyright 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.

*/

-->



<!-- Extends FrameLayout -->

<com.android.systemui.assist.AssistOrbContainer

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

    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <com.android.systemui.statusbar.AlphaOptimizedView

        android:layout_width="match_parent"

        android:layout_height="@dimen/assist_orb_scrim_height"

        android:layout_gravity="bottom"

        android:id="@+id/assist_orb_scrim"

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



    <com.android.systemui.assist.AssistOrbView

        android:id="@+id/assist_orb"

        android:layout_width="match_parent"

        android:layout_height="match_parent">



        <ImageView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

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

    </com.android.systemui.assist.AssistOrbView>



    <com.android.systemui.statusbar.AlphaOptimizedView

        android:id="@+id/assist_orb_navbar_scrim"

        android:layout_height="@dimen/assist_orb_navbar_scrim_height"

        android:layout_width="match_parent"

        android:layout_gravity="bottom"

        android:elevation="50dp"

        android:outlineProvider="none"

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



</com.android.systemui.assist.AssistOrbContainer>
 
 No newline at end of file

packages/SystemUI/res/values/colors.xml

+0 −2
Original line number Diff line number Diff line
@@ -87,8 +87,6 @@ 


    <color name="notification_section_clear_all_btn_color">@color/GM2_grey_700</color>



    <color name="assist_orb_color">#ffffff</color>



    <color name="keyguard_user_switcher_background_gradient_color">#77000000</color>



    <!-- The color of the navigation bar icons. Need to be in sync with ic_sysbar_* -->

packages/SystemUI/res/values/dimens.xml

+0 −19
Original line number Diff line number Diff line
@@ -678,25 +678,6 @@ 
         from Keyguard. -->

    <dimen name="go_to_full_shade_appearing_translation">200dp</dimen>



    <!-- The diameter of the search panel circle. -->

    <dimen name="assist_orb_size">144dp</dimen>



    <!-- The margin to the edge of the screen from where the orb starts to appear -->

    <dimen name="assist_orb_base_margin">22dp</dimen>



    <!-- The amount the orb translates when appearing -->

    <dimen name="assist_orb_travel_distance">26dp</dimen>



    <!-- The elevation of the orb -->

    <dimen name="assist_orb_elevation">12dp</dimen>



    <!-- The height of the scrim behind the orb. -->

    <dimen name="assist_orb_scrim_height">250dp</dimen>



    <!-- The height of the scrim behind the search panel circle. Should be navigation_bar_height

         + 8dp. -->

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



    <!-- The width/height of the keyguard bottom area icon view on keyguard. -->

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

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