summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--api/current.txt2
-rw-r--r--api/system-current.txt2
-rw-r--r--api/test-current.txt2
-rw-r--r--core/java/android/view/Window.java23
-rw-r--r--core/java/com/android/internal/policy/PhoneWindow.java24
-rw-r--r--core/res/res/layout/decor_caption_dark.xml7
-rw-r--r--core/res/res/layout/decor_caption_light.xml7
-rw-r--r--core/res/res/values/symbols.xml1
8 files changed, 4 insertions, 64 deletions
diff --git a/api/current.txt b/api/current.txt
index 24b45702d8ab..732a32257a56 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -41844,8 +41844,6 @@ package android.view {
method public abstract void setContentView(int);
method public abstract void setContentView(android.view.View);
method public abstract void setContentView(android.view.View, android.view.ViewGroup.LayoutParams);
- method public abstract void setDecorView(android.view.View);
- method public abstract void setDecorView(int);
method protected void setDefaultWindowFormat(int);
method public void setDimAmount(float);
method public void setElevation(float);
diff --git a/api/system-current.txt b/api/system-current.txt
index 3c10294fe1ac..40347cbfa1ac 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -44177,8 +44177,6 @@ package android.view {
method public abstract void setContentView(int);
method public abstract void setContentView(android.view.View);
method public abstract void setContentView(android.view.View, android.view.ViewGroup.LayoutParams);
- method public abstract void setDecorView(android.view.View);
- method public abstract void setDecorView(int);
method protected void setDefaultWindowFormat(int);
method public void setDimAmount(float);
method public void setDisableWallpaperTouchEvents(boolean);
diff --git a/api/test-current.txt b/api/test-current.txt
index c46a4ea0e9a3..8a471964a001 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -41846,8 +41846,6 @@ package android.view {
method public abstract void setContentView(int);
method public abstract void setContentView(android.view.View);
method public abstract void setContentView(android.view.View, android.view.ViewGroup.LayoutParams);
- method public abstract void setDecorView(android.view.View);
- method public abstract void setDecorView(int);
method protected void setDefaultWindowFormat(int);
method public void setDimAmount(float);
method public void setElevation(float);
diff --git a/core/java/android/view/Window.java b/core/java/android/view/Window.java
index 3c4d45a244b9..7a359e79d4c5 100644
--- a/core/java/android/view/Window.java
+++ b/core/java/android/view/Window.java
@@ -1158,27 +1158,6 @@ public abstract class Window {
public abstract void setContentView(View view);
/**
- * Install a view in the decoration (title) area, to be shown when
- * the window is in multi-window mode. This view will be placed
- * next to the window controls.
- *
- * The view may be restored to defaults by passing null.
- *
- * @param view The desired view to display in window decorations.
- */
- public abstract void setDecorView(View view);
-
- /**
- * Convenience for
- * {@link #setDecorView(View)}
- * to set the custom window decoration from a layout resource. The layout will be inflated
- * adding all top level views to the decoration
- *
- * @param layoutResID Resource ID to be inflated.
- */
- public abstract void setDecorView(@LayoutRes int layoutResID);
-
- /**
* Set the screen content to an explicit view. This view is placed
* directly into the screen's view hierarchy. It can itself be a complex
* view hierarchy.
@@ -2060,4 +2039,6 @@ public abstract class Window {
public boolean getOverlayDecorCaption() {
return mOverlayWithDecorCaption;
}
+
+
}
diff --git a/core/java/com/android/internal/policy/PhoneWindow.java b/core/java/com/android/internal/policy/PhoneWindow.java
index 2178344e8351..337bb693561e 100644
--- a/core/java/com/android/internal/policy/PhoneWindow.java
+++ b/core/java/com/android/internal/policy/PhoneWindow.java
@@ -423,30 +423,6 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
}
@Override
- public void setDecorView(int layoutResID) {
- View v = mLayoutInflater.inflate(layoutResID, null);
- setDecorView(v);
- }
-
- @Override
- public void setDecorView(View view) {
- if (mContentParent == null) {
- installDecor();
- }
-
- LinearLayout clientDecorPlaceholder =
- (LinearLayout) findViewById(R.id.client_decor_placeholder);
-
- if (clientDecorPlaceholder != null) {
- clientDecorPlaceholder.removeAllViews();
-
- if (view != null) {
- clientDecorPlaceholder.addView(view);
- }
- }
- }
-
- @Override
public void addContentView(View view, ViewGroup.LayoutParams params) {
if (mContentParent == null) {
installDecor();
diff --git a/core/res/res/layout/decor_caption_dark.xml b/core/res/res/layout/decor_caption_dark.xml
index 273264d3d85f..95d228971a06 100644
--- a/core/res/res/layout/decor_caption_dark.xml
+++ b/core/res/res/layout/decor_caption_dark.xml
@@ -25,16 +25,11 @@
<LinearLayout
android:id="@+id/caption"
android:layout_width="match_parent"
- android:layout_gravity="end"
android:layout_height="wrap_content"
+ android:gravity="end"
android:background="@drawable/decor_caption_title"
android:focusable="false"
android:descendantFocusability="blocksDescendants" >
- <LinearLayout
- android:id="@+id/client_decor_placeholder"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1"/>
<Button
android:id="@+id/maximize_window"
android:layout_width="32dp"
diff --git a/core/res/res/layout/decor_caption_light.xml b/core/res/res/layout/decor_caption_light.xml
index fd9198ece271..f0f661e0fef0 100644
--- a/core/res/res/layout/decor_caption_light.xml
+++ b/core/res/res/layout/decor_caption_light.xml
@@ -25,16 +25,11 @@
<LinearLayout
android:id="@+id/caption"
android:layout_width="match_parent"
- android:layout_gravity="end"
android:layout_height="wrap_content"
+ android:gravity="end"
android:background="@drawable/decor_caption_title"
android:focusable="false"
android:descendantFocusability="blocksDescendants" >
- <LinearLayout
- android:id="@+id/client_decor_placeholder"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1"/>
<Button
android:id="@+id/maximize_window"
android:layout_width="32dp"
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 1de4c456b980..47053efaacb8 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -1959,7 +1959,6 @@
<java-symbol type="bool" name="config_built_in_sip_phone" />
<java-symbol type="id" name="maximize_window" />
<java-symbol type="id" name="close_window" />
- <java-symbol type="id" name="client_decor_placeholder" />
<java-symbol type="layout" name="decor_caption_light" />
<java-symbol type="layout" name="decor_caption_dark" />
<java-symbol type="drawable" name="decor_caption_title_focused" />
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-12-27 07:57:30 +0000