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

Commit bcec6f8c authored by Darrell Shi's avatar Darrell Shi
Browse files

Flatten clock complication layout 

This change removes the unnecessary FrameLayout from clock dream complication.

Bug: 284028343
Test: verify that clock complication renders correctly
Change-Id: I53dbae504935663f3f70875e6d5d63deee3e1261
parent eaf5ec33

packages/SystemUI/res/layout/dream_overlay_complication_clock_time.xml

+21 −28
Original line number Diff line number Diff line
@@ -14,15 +14,10 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

-->

<FrameLayout

<com.android.systemui.shared.shadow.DoubleShadowTextClock

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

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

    android:layout_width="wrap_content"

    android:layout_height="wrap_content">



    <com.android.systemui.shared.shadow.DoubleShadowTextClock

        android:id="@+id/time_view"

        android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:fontFamily="@*android:string/config_clockFontFamily"

    android:textColor="@android:color/white"
@@ -43,5 +38,3 @@ 
    app:ambientShadowAlpha="0.3"

    app:removeTextDescent="true"

    app:textDescentExtraPadding="@dimen/dream_overlay_clock_text_descent_extra_padding" />
 


</FrameLayout>

packages/SystemUI/src/com/android/systemui/complication/dagger/DreamClockTimeComplicationModule.java

+2 −3
Original line number Diff line number Diff line
@@ -45,12 +45,11 @@ public interface DreamClockTimeComplicationModule { 
    @Provides

    @Named(DREAM_CLOCK_TIME_COMPLICATION_VIEW)

    static View provideComplicationView(LayoutInflater layoutInflater) {

        final View view = Preconditions.checkNotNull(

        final TextClock view = (TextClock) Preconditions.checkNotNull(

                        layoutInflater.inflate(R.layout.dream_overlay_complication_clock_time,

                                null, false),

                "R.layout.dream_overlay_complication_clock_time did not properly inflated");

        ((TextClock) view.findViewById(R.id.time_view)).setFontVariationSettings(

                TAG_WEIGHT + WEIGHT);

        view.setFontVariationSettings(TAG_WEIGHT + WEIGHT);

        return view;

    }

}