Merging from ub-launcher3-master @ build 6476761 am: b2c43c5cb1 (2009e8a1) · Commits · e / os / android_packages_apps_ThemePicker

AndroidManifest.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,10 @@
		<activity android:name="com.android.customization.picker.theme.CustomThemeActivity"
		android:resizeableActivity="false"
		android:theme="@style/CustomizationTheme.NoActionBar"/>

		<activity android:name="com.android.customization.picker.ViewOnlyFullPreviewActivity"
		android:resizeableActivity="false"
		android:theme="@style/CustomizationTheme.NoActionBar"/>
		</application>

		</manifest>

res/layout/activity_full_preview.xml

0 → 100644

+28 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2020 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.
		-->
		<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent">

		<FrameLayout
		android:id="@+id/preview_fragment_container"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_marginBottom="@dimen/bottom_navbar_height" />

		<include layout="@layout/bottom_action_bar" />
		</FrameLayout>

res/layout/fragment_clock_scalable_picker.xml

deleted100644 → 0

+0 −119

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2020 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.
		-->
		<androidx.coordinatorlayout.widget.CoordinatorLayout
		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:background="?android:colorPrimary"
		android:orientation="vertical">

		<include layout="@layout/section_header" />

		<FrameLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		app:layout_behavior="@string/scalable_container_behavior">

		<com.android.wallpaper.widget.PreviewPager
		android:id="@+id/clock_preview_pager"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:background="@color/preview_pager_background" />
		</FrameLayout>

		<FrameLayout
		android:id="@+id/scalable_content_container"
		android:layout_width="wrap_content"
		android:layout_height="@dimen/content_container_maximum_height"
		app:behavior_peekHeight="@dimen/content_container_minimum_height"
		app:layout_behavior="@string/bottom_sheet_behavior">

		<androidx.constraintlayout.widget.ConstraintLayout
		android:id="@+id/content_section"
		android:layout_width="match_parent"
		android:layout_height="match_parent">

		<androidx.recyclerview.widget.RecyclerView
		android:id="@+id/options_container"
		android:layout_width="match_parent"
		android:layout_height="@dimen/options_container_height"
		android:layout_gravity="center_horizontal"
		android:layout_marginTop="10dp"
		app:layout_constraintBottom_toTopOf="@id/placeholder"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintVertical_bias="1.0" />

		<Space
		android:id="@+id/placeholder"
		android:layout_width="match_parent"
		android:layout_height="@dimen/min_taptarget_height"
		app:layout_constraintBottom_toTopOf="@id/apply_button"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintHeight_min="@dimen/min_taptarget_height"
		app:layout_constraintHorizontal_bias="0.0"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintTop_toBottomOf="@id/options_container"
		app:layout_constraintVertical_bias="1.0" />

		<Button
		android:id="@+id/apply_button"
		style="@style/ActionPrimaryButton"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="end"
		android:layout_marginVertical="10dp"
		android:layout_marginEnd="10dp"
		android:layout_weight="1"
		android:text="@string/apply_theme_btn"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintEnd_toEndOf="parent" />
		</androidx.constraintlayout.widget.ConstraintLayout>
		</FrameLayout>

		<FrameLayout
		android:layout_width="match_parent"
		android:layout_height="match_parent">

		<androidx.core.widget.ContentLoadingProgressBar
		android:id="@+id/loading_indicator"
		style="@android:style/Widget.DeviceDefault.ProgressBar"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal\|top"
		android:layout_marginTop="200dp"
		android:indeterminate="true" />

		<FrameLayout
		android:id="@+id/error_section"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:visibility="gone">

		<TextView
		android:id="@+id/error_message"
		style="@style/TitleTextAppearance"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:gravity="center"
		android:text="@string/something_went_wrong" />
		</FrameLayout>
		</FrameLayout>
		</androidx.coordinatorlayout.widget.CoordinatorLayout>

res/layout/fragment_grid_full_preview.xml

0 → 100644

+58 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2020 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
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical">

		<include layout="@layout/section_header"/>

		<FrameLayout
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1"
		android:background="@color/fullscreen_preview_background">

		<androidx.cardview.widget.CardView
		style="@style/FullContentPreviewCard"
		android:id="@+id/grid_full_preview_card"
		android:layout_marginTop="24dp"
		android:layout_marginBottom="32dp"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_gravity="center">

		<ImageView
		android:id="@+id/grid_full_preview_image"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:background="@color/primary_color"/>

		<SurfaceView
		android:id="@+id/grid_full_preview_option_surface"
		android:layout_width="match_parent"
		android:layout_height="match_parent"/>

		<SurfaceView
		android:id="@+id/grid_full_preview_wallpaper_surface"
		android:layout_width="match_parent"
		android:layout_height="match_parent" />

		</androidx.cardview.widget.CardView>
		</FrameLayout>
		</LinearLayout>

res/layout/fragment_grid_scalable_picker.xml

deleted100644 → 0

+0 −101

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2020 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.
		-->
		<androidx.coordinatorlayout.widget.CoordinatorLayout
		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:background="?android:colorPrimary"
		android:orientation="vertical">

		<include layout="@layout/section_header" />

		<FrameLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		app:layout_behavior="@string/scalable_container_behavior">

		<com.android.wallpaper.widget.PreviewPager
		android:id="@+id/grid_preview_pager"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:background="@color/preview_pager_background"
		app:card_style="screen_aspect_ratio" />
		</FrameLayout>

		<FrameLayout
		android:id="@+id/scalable_content_container"
		android:layout_width="wrap_content"
		android:layout_height="@dimen/content_container_maximum_height"
		app:behavior_peekHeight="@dimen/content_container_minimum_height"
		app:layout_behavior="@string/bottom_sheet_behavior">

		<LinearLayout
		android:id="@+id/content_section"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical">

		<TextView
		android:id="@+id/options_title"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:gravity="center"
		android:paddingVertical="18dp"
		android:lineHeight="24dp"
		android:singleLine="true"
		android:text="@string/grid_options_title"
		android:textAppearance="@style/TitleTextAppearance"/>

		<androidx.recyclerview.widget.RecyclerView
		android:id="@+id/options_container"
		android:layout_width="match_parent"
		android:layout_height="@dimen/options_container_height"
		android:layout_gravity="center_horizontal"/>
		</LinearLayout>
		</FrameLayout>

		<FrameLayout
		android:layout_width="match_parent"
		android:layout_height="match_parent">

		<androidx.core.widget.ContentLoadingProgressBar
		android:id="@+id/loading_indicator"
		style="@android:style/Widget.DeviceDefault.ProgressBar"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal\|top"
		android:layout_marginTop="200dp"
		android:indeterminate="true" />

		<FrameLayout
		android:id="@+id/error_section"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:visibility="gone">

		<TextView
		android:id="@+id/error_message"
		style="@style/TitleTextAppearance"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:gravity="center"
		android:text="@string/something_went_wrong" />
		</FrameLayout>
		</FrameLayout>
		</androidx.coordinatorlayout.widget.CoordinatorLayout>