summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/res
diff options
context:
space:
mode:
Diffstat (limited to 'packages/SystemUI/res')
-rw-r--r--packages/SystemUI/res/drawable/assist_orb_navbar_scrim.xml25
-rw-r--r--packages/SystemUI/res/drawable/assist_orb_scrim.xml (renamed from packages/SystemUI/res/drawable/search_panel_scrim.xml)0
-rw-r--r--packages/SystemUI/res/layout/assist_orb.xml54
-rw-r--r--packages/SystemUI/res/layout/status_bar_search_panel.xml43
-rw-r--r--packages/SystemUI/res/values-land/styles.xml6
-rw-r--r--packages/SystemUI/res/values-sw600dp/styles.xml6
-rw-r--r--packages/SystemUI/res/values/colors.xml3
-rw-r--r--packages/SystemUI/res/values/dimens.xml23
-rw-r--r--packages/SystemUI/res/values/styles.xml6
9 files changed, 92 insertions, 74 deletions
diff --git a/packages/SystemUI/res/drawable/assist_orb_navbar_scrim.xml b/packages/SystemUI/res/drawable/assist_orb_navbar_scrim.xml
new file mode 100644
index 0000000..52ed76d
--- /dev/null
+++ b/packages/SystemUI/res/drawable/assist_orb_navbar_scrim.xml
@@ -0,0 +1,25 @@
+<?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
diff --git a/packages/SystemUI/res/drawable/search_panel_scrim.xml b/packages/SystemUI/res/drawable/assist_orb_scrim.xml
index bbb2617..bbb2617 100644
--- a/packages/SystemUI/res/drawable/search_panel_scrim.xml
+++ b/packages/SystemUI/res/drawable/assist_orb_scrim.xml
diff --git a/packages/SystemUI/res/layout/assist_orb.xml b/packages/SystemUI/res/layout/assist_orb.xml
new file mode 100644
index 0000000..ab0a0a5
--- /dev/null
+++ b/packages/SystemUI/res/layout/assist_orb.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* apps/common/assets/default/default/skins/StatusBar.xml
+**
+** 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
diff --git a/packages/SystemUI/res/layout/status_bar_search_panel.xml b/packages/SystemUI/res/layout/status_bar_search_panel.xml
deleted file mode 100644
index e0520ef..0000000
--- a/packages/SystemUI/res/layout/status_bar_search_panel.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* apps/common/assets/default/default/skins/StatusBar.xml
-**
-** 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.SearchPanelView
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/search_panel_container"
- android:layout_height="match_parent"
- android:layout_width="match_parent">
-
- <com.android.systemui.statusbar.AlphaOptimizedView
- style="@style/SearchPanelScrim"
- android:id="@+id/search_panel_scrim"
- android:background="@drawable/search_panel_scrim" />
-
- <com.android.systemui.SearchPanelCircleView
- style="@style/SearchPanelCircle"
- android:id="@+id/search_panel_circle">
-
- <ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/search_logo" />
- </com.android.systemui.SearchPanelCircleView>
-
-</com.android.systemui.SearchPanelView>
diff --git a/packages/SystemUI/res/values-land/styles.xml b/packages/SystemUI/res/values-land/styles.xml
index e58fbb1..8919198 100644
--- a/packages/SystemUI/res/values-land/styles.xml
+++ b/packages/SystemUI/res/values-land/styles.xml
@@ -18,10 +18,4 @@
<style name="BrightnessDialogContainer" parent="@style/BaseBrightnessDialogContainer">
<item name="android:layout_width">360dp</item>
</style>
-
- <style name="SearchPanelScrim">
- <item name="android:layout_width">@dimen/search_panel_scrim_height</item>
- <item name="android:layout_height">match_parent</item>
- <item name="android:layout_gravity">right</item>
- </style>
</resources>
diff --git a/packages/SystemUI/res/values-sw600dp/styles.xml b/packages/SystemUI/res/values-sw600dp/styles.xml
index 156fa65..4d7d6b5 100644
--- a/packages/SystemUI/res/values-sw600dp/styles.xml
+++ b/packages/SystemUI/res/values-sw600dp/styles.xml
@@ -19,12 +19,6 @@
<item name="android:layout_width">480dp</item>
</style>
- <style name="SearchPanelScrim">
- <item name="android:layout_width">match_parent</item>
- <item name="android:layout_height">@dimen/search_panel_scrim_height</item>
- <item name="android:layout_gravity">bottom</item>
- </style>
-
<style name="UserDetailView">
<item name="numColumns">4</item>
</style>
diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml
index d4aeab6..89a7220 100644
--- a/packages/SystemUI/res/values/colors.xml
+++ b/packages/SystemUI/res/values/colors.xml
@@ -108,8 +108,7 @@
<color name="notification_guts_text_color">#b2FFFFFF</color>
<color name="notification_guts_btn_color">#FFFFFFFF</color>
- <color name="search_panel_circle_color">#ffffff</color>
- <color name="search_panel_ripple_color">#ffbbbbbb</color>
+ <color name="assist_orb_color">#ffffff</color>
<color name="keyguard_user_switcher_background_gradient_color">#77000000</color>
<color name="doze_small_icon_background_color">#ff434343</color>
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index c24cd64..c9e1fee 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -471,22 +471,23 @@
<dimen name="go_to_full_shade_appearing_translation">200dp</dimen>
<!-- The diameter of the search panel circle. -->
- <dimen name="search_panel_circle_size">88dp</dimen>
+ <dimen name="assist_orb_size">144dp</dimen>
- <!-- The margin to the edge of the screen from where the circle starts to appear -->
- <dimen name="search_panel_circle_base_margin">80dp</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 circle translates when appearing -->
- <dimen name="search_panel_circle_travel_distance">80dp</dimen>
+ <!-- The amount the orb translates when appearing -->
+ <dimen name="assist_orb_travel_distance">26dp</dimen>
- <!-- The elevation of the search panel circle -->
- <dimen name="search_panel_circle_elevation">12dp</dimen>
+ <!-- The elevation of the orb -->
+ <dimen name="assist_orb_elevation">12dp</dimen>
- <!-- The height of the scrim behind the search panel circle. -->
- <dimen name="search_panel_scrim_height">250dp</dimen>
+ <!-- The height of the scrim behind the orb. -->
+ <dimen name="assist_orb_scrim_height">250dp</dimen>
- <!-- How far the user needs to drag up to invoke search. -->
- <dimen name="search_panel_threshold">100dp</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 phone/camera/unlock icon view on keyguard. -->
<dimen name="keyguard_affordance_height">56dp</dimen>
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index 07fcb82..e491b1b 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -246,12 +246,6 @@
<item name="android:layout_height">match_parent</item>
</style>
- <style name="SearchPanelScrim">
- <item name="android:layout_width">match_parent</item>
- <item name="android:layout_height">@dimen/search_panel_scrim_height</item>
- <item name="android:layout_gravity">bottom</item>
- </style>
-
<style name="UserDetailView">
<item name="numColumns">3</item>
</style>
generated by cgit v1.1 at 2025-01-09 05:59:36 +0000