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

Commit ad0f187a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Controls Task View - Limit screen width"

parents bddfb193 11f2ef92
Loading
Loading
Loading
Loading
+43 −38
Original line number Diff line number Diff line
@@ -15,13 +15,18 @@
     limitations under the License.
-->

<LinearLayout
<FrameLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/control_detail_root"
    android:layout_width="match_parent"
    android:layout_height="match_parent">
  <LinearLayout
      android:id="@+id/control_task_view_container"
      android:layout_width="match_parent"
      android:layout_height="match_parent"
    android:orientation="vertical"
    android:background="@android:color/black">
      android:layout_gravity="right|top"
      android:layout_marginRight="@dimen/controls_task_view_right_margin"
      android:orientation="vertical">
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
@@ -30,7 +35,7 @@
      <ImageView
          android:id="@+id/control_detail_close"
          android:contentDescription="@string/accessibility_desc_close"
        android:src="@drawable/ic_arrow_back"
          android:src="@drawable/ic_close"
          android:background="?android:attr/selectableItemBackgroundBorderless"
          android:tint="@color/control_primary_text"
          android:layout_width="48dp"
@@ -55,7 +60,7 @@
        android:id="@+id/controls_activity_view"
        android:layout_width="match_parent"
        android:layout_height="0dp"
      android:layout_weight="1"
      android:orientation="vertical" />
        android:layout_weight="1" />
  </LinearLayout>
</FrameLayout>
+4 −0
Original line number Diff line number Diff line
@@ -25,4 +25,8 @@
    <!-- margin from keyguard status bar to clock. For split shade it should be
         keyguard_split_shade_top_margin - status_bar_header_height_keyguard = 8dp -->
    <dimen name="keyguard_clock_top_margin">8dp</dimen>

    <!-- Limit the TaskView to this percentage of the overall screen width (0.0 - 1.0) -->
    <item name="controls_task_view_width_percentage" translatable="false" format="float" type="dimen">0.45</item>
    <dimen name="controls_task_view_right_margin">8dp</dimen>
</resources>
+1 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@
    <color name="control_enabled_cool_foreground">@color/GM2_blue_300</color>
    <color name="control_thumbnail_tint">#33000000</color>
    <color name="control_thumbnail_shadow_color">@*android:color/black</color>
    <color name="controls_task_view_bg">#CC191C1D</color>

    <!-- Docked misalignment message -->
    <color name="misalignment_text_color">#F28B82</color>
+3 −0
Original line number Diff line number Diff line
@@ -1052,6 +1052,9 @@
    <dimen name="controls_setup_subtitle">14sp</dimen>
    <dimen name="controls_setup_vertical_padding">52dp</dimen>
    <dimen name="controls_detail_dialog_header_height">52dp</dimen>
    <!-- Limit the TaskView to this percentage of the overall screen width (0.0 - 1.0) -->
    <item name="controls_task_view_width_percentage" translatable="false" format="float" type="dimen">1.0</item>
    <dimen name="controls_task_view_right_margin">0dp</dimen>

    <!-- Home Controls activity view detail panel-->
    <dimen name="controls_activity_view_corner_radius">@*android:dimen/config_bottomDialogCornerRadius</dimen>
+1 −1
Original line number Diff line number Diff line
@@ -746,7 +746,7 @@
     <style name="Theme.SystemUI.Dialog.Control.DetailPanel" parent="@android:style/Theme.DeviceDefault.Dialog.NoActionBar">
      <item name="android:windowFullscreen">false</item>
      <item name="android:windowIsFloating">false</item>
      <item name="android:windowBackground">@android:color/black</item>
      <item name="android:windowBackground">@color/controls_task_view_bg</item>
      <item name="android:backgroundDimEnabled">false</item>
      <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
    </style>
Loading