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

Commit 01c5911d authored by Nick Ning's avatar Nick Ning Committed by Android (Google) Code Review
Browse files

Merge "Added Complication implementations for Dream Weather, Clock Time, and Clock Time."

parents 228a16b8 078fb82e

packages/SystemUI/res/layout/dream_overlay_complication_clock_date.xml

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

<!--

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

-->

<TextClock

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

    android:id="@+id/date_view"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:paddingLeft="@dimen/dream_overlay_complication_clock_date_padding_left"

    android:paddingBottom="@dimen/dream_overlay_complication_clock_date_padding_bottom"

    android:gravity="center_horizontal"

    android:textColor="@android:color/white"

    android:shadowColor="@color/keyguard_shadow_color"

    android:shadowRadius="?attr/shadowRadius"

    android:format12Hour="EEE, MMM d"

    android:format24Hour="EEE, MMM d"

    android:textSize="@dimen/dream_overlay_complication_clock_date_text_size"/>

packages/SystemUI/res/layout/dream_overlay_complication_clock_time.xml

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

<!--

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

-->

<TextClock

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

    android:id="@+id/time_view"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:paddingLeft="@dimen/dream_overlay_complication_clock_time_padding_left"

    android:fontFamily="sans-serif-thin"

    android:textColor="@android:color/white"

    android:format12Hour="h:mm"

    android:format24Hour="kk:mm"

    android:shadowColor="@color/keyguard_shadow_color"

    android:shadowRadius="?attr/shadowRadius"

    android:textSize="@dimen/dream_overlay_complication_clock_time_text_size"/>

packages/SystemUI/res/layout/dream_overlay_complication_weather.xml

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

<!--

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

-->

<TextView

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

    android:id="@+id/weather_view"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:paddingLeft="@dimen/dream_overlay_complication_weather_padding_left"

    android:paddingBottom="@dimen/dream_overlay_complication_weather_padding_bottom"

    android:textColor="@android:color/white"

    android:shadowColor="@color/keyguard_shadow_color"

    android:shadowRadius="?attr/shadowRadius"

    android:textSize="@dimen/dream_overlay_complication_weather_text_size"/>

packages/SystemUI/res/layout/dream_overlay_complications_layer.xml

+0 −28
Original line number Diff line number Diff line
@@ -20,34 +20,6 @@ 
    android:id="@+id/dream_overlay_complications_layer"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

    <TextClock

        android:id="@+id/time_view"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:fontFamily="sans-serif-thin"

        android:format12Hour="h:mm"

        android:format24Hour="kk:mm"

        android:shadowColor="#B2000000"

        android:shadowRadius="2.0"

        android:singleLine="true"

        android:textSize="72sp"

        android:textColor="@android:color/white"

        app:layout_constraintBottom_toTopOf="@+id/date_view"

        app:layout_constraintStart_toStartOf="parent" />

    <TextClock

        android:id="@+id/date_view"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:shadowColor="#B2000000"

        android:shadowRadius="2.0"

        android:format12Hour="EEE, MMM d"

        android:format24Hour="EEE, MMM d"

        android:singleLine="true"

        android:textSize="18sp"

        android:textColor="@android:color/white"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toEndOf="@+id/time_view"

        app:layout_constraintStart_toStartOf="@+id/time_view" />

    <androidx.constraintlayout.widget.Guideline

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

packages/SystemUI/res/values/dimens.xml

+10 −0
Original line number Diff line number Diff line
@@ -1346,6 +1346,16 @@ 
         shade. -->

    <dimen name="dream_overlay_notifications_drag_area_height">100dp</dimen>



    <!-- Dream overlay complications related dimensions -->

    <dimen name="dream_overlay_complication_clock_time_padding_left">50dp</dimen>

    <dimen name="dream_overlay_complication_clock_time_text_size">72sp</dimen>

    <dimen name="dream_overlay_complication_clock_date_padding_left">60dp</dimen>

    <dimen name="dream_overlay_complication_clock_date_padding_bottom">50dp</dimen>

    <dimen name="dream_overlay_complication_clock_date_text_size">18sp</dimen>

    <dimen name="dream_overlay_complication_weather_padding_left">20dp</dimen>

    <dimen name="dream_overlay_complication_weather_padding_bottom">50dp</dimen>

    <dimen name="dream_overlay_complication_weather_text_size">18sp</dimen>



    <!-- The position of the end guide, which dream overlay complications can align their start with

         if their end is aligned with the parent end. Represented as the percentage over from the

         start of the parent container. -->