Merge changes from topic "yl-interstitial" into main

* changes:
  Resize & round corners on a placeholder interstitial image
  Add interstitial for modes that are disabled but not by user
This commit is contained in:
Yuri Lin
2024-08-06 19:38:45 +00:00
committed by Android (Google) Code Review
9 changed files with 901 additions and 3 deletions

View File

@@ -0,0 +1,96 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2024 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.
-->
<LinearLayout
android:id="@+id/interstitial_page"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:transitionGroup="true"
android:orientation="vertical">
<Toolbar
android:id="@+id/action_bar"
style="?android:attr/actionBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="?android:attr/actionBarTheme"
android:elevation="0dp"
android:background="@android:color/transparent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="12dp"
android:paddingBottom="64dp"
android:paddingLeft="24dp"
android:paddingRight="24dp"
android:orientation="vertical">
<!-- image goes here -->
<FrameLayout
android:id="@+id/image_frame"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@+id/mode_name_title"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/image"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:adjustViewBounds="true"
android:clickable="false"
android:scaleType="centerCrop"
android:layout_gravity="center" />
</FrameLayout>
<TextView
android:id="@+id/mode_name_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="false"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Title"
app:layout_constraintBottom_toTopOf="@+id/mode_name_subtitle"
android:textSize="36sp"
android:paddingVertical="12dp" />
<TextView
android:id="@+id/mode_name_subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="false"
android:text="@string/zen_mode_setup_page_summary"
android:textSize="18sp"
android:paddingBottom="12dp"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
app:layout_constraintBottom_toTopOf="@+id/enable_mode_button" />
<Button
android:id="@+id/enable_mode_button"
style="@style/ActionPrimaryButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="12dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintVertical_bias="1" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>