Merge "Handle insets (status bar, navigation bar, etc) properly in adb... (31090d7e) · Commits · e / os / android_frameworks_base

packages/BackupRestoreConfirmation/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ android_app {
		name: "BackupRestoreConfirmation",
		defaults: ["platform_app_defaults"],
		srcs: ["src/*/.java"],
		static_libs: ["androidx.core_core"],
		platform_apis: true,
		certificate: "platform",
		privileged: true,

+0 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@
		android:permission="android.permission.CONFIRM_FULL_BACKUP" >

		<activity android:name=".BackupRestoreConfirmation"
		android:theme="@style/OptOutEdgeToEdgeEnforcement"
		android:title=""
		android:windowSoftInputMode="stateAlwaysHidden"
		android:excludeFromRecents="true"

+5 −4

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@
		android:orientation="vertical" >

		<ScrollView
		android:id="@+id/scroll_view"
		android:layout_height="0dp"
		android:layout_weight="1"
		android:layout_width="match_parent"
		@@ -84,11 +85,11 @@
		android:layout_width="match_parent" />

		<!-- button bar -->
		<LinearLayout android:orientation="horizontal"
		<LinearLayout android:id="@+id/button_bar"
		android:orientation="horizontal"
		style="?android:attr/buttonBarStyle"
		android:layout_height="wrap_content"
		android:layout_width="match_parent"
		android:layout_gravity="bottom">
		android:layout_width="match_parent">

		<Button android:id="@+id/button_deny"
		style="?android:attr/buttonBarButtonStyle"

+7 −4

Original line number	Diff line number	Diff line
		@@ -24,10 +24,12 @@
		android:orientation="vertical">

		<ScrollView
		android:id="@+id/scroll_view"
		android:padding="16dp"
		android:layout_height="0dp"
		android:layout_weight="1"
		android:layout_width="match_parent">
		android:layout_width="match_parent"
		android:clipToPadding="false" >
		<LinearLayout
		android:orientation="vertical"
		android:layout_height="wrap_content"
		@@ -82,7 +84,8 @@
		android:layout_width="match_parent" />

		<!-- button bar -->
		<LinearLayout android:orientation="horizontal"
		<LinearLayout android:id="@+id/button_bar"
		android:orientation="horizontal"
		style="?android:attr/buttonBarStyle"
		android:layout_height="wrap_content"
		android:layout_width="match_parent"

deleted100644 → 0

+0 −24

Original line number	Diff line number	Diff line
		<?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.
		-->

		<resources xmlns:android="http://schemas.android.com/apk/res/android">
		<!--
		TODO(b/309578419): Make activities handle insets properly and then remove this.
		-->
		<style name="OptOutEdgeToEdgeEnforcement">
		<item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
		</style>
		</resources>