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

Commit 568b59c6 authored by Alan Viverette's avatar Alan Viverette Committed by android-build-merger
Browse files

Merge "Update more implementations of findViewById()" into oc-dev am: b7f0db8d 

am: 2de6b0da

Change-Id: I03772206b8849237e1138303229c6ed1c3c2b432
parents 65cf224a 2de6b0da

api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -4700,7 +4700,7 @@ package android.app { 
  public abstract class FragmentContainer {

    ctor public FragmentContainer();

    method public android.app.Fragment instantiate(android.content.Context, java.lang.String, android.os.Bundle);

    method public abstract android.view.View onFindViewById(int);

    method public abstract <T extends android.view.View> T onFindViewById(int);

    method public abstract boolean onHasView();

  }










@@ -4751,7 +4751,7 @@ package android.app {













    ctor public FragmentHostCallback(android.content.Context, android.os.Handler, int);















    method public void onAttachFragment(android.app.Fragment);















    method public void onDump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);













    method public android.view.View onFindViewById(int);













    method public <T extends android.view.View> T onFindViewById(int);















    method public abstract E onGetHost();















    method public android.view.LayoutInflater onGetLayoutInflater();















    method public int onGetWindowAnimations();










@@ -37221,7 +37221,7 @@ package android.service.dreams {













    method public boolean dispatchPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent);















    method public boolean dispatchTouchEvent(android.view.MotionEvent);















    method public boolean dispatchTrackballEvent(android.view.MotionEvent);













    method public android.view.View findViewById(int);













    method public <T extends android.view.View> T findViewById(int);















    method public final void finish();















    method public android.view.Window getWindow();















    method public android.view.WindowManager getWindowManager();

























api/system-current.txt



+3
−3




























Original line number
Diff line number
Diff line








@@ -4867,7 +4867,7 @@ package android.app {













  public abstract class FragmentContainer {















    ctor public FragmentContainer();















    method public android.app.Fragment instantiate(android.content.Context, java.lang.String, android.os.Bundle);













    method public abstract android.view.View onFindViewById(int);













    method public abstract <T extends android.view.View> T onFindViewById(int);















    method public abstract boolean onHasView();















  }
























@@ -4918,7 +4918,7 @@ package android.app {













    ctor public FragmentHostCallback(android.content.Context, android.os.Handler, int);















    method public void onAttachFragment(android.app.Fragment);















    method public void onDump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);













    method public android.view.View onFindViewById(int);













    method public <T extends android.view.View> T onFindViewById(int);















    method public abstract E onGetHost();















    method public android.view.LayoutInflater onGetLayoutInflater();















    method public int onGetWindowAnimations();










@@ -40339,7 +40339,7 @@ package android.service.dreams {













    method public boolean dispatchPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent);















    method public boolean dispatchTouchEvent(android.view.MotionEvent);















    method public boolean dispatchTrackballEvent(android.view.MotionEvent);













    method public android.view.View findViewById(int);













    method public <T extends android.view.View> T findViewById(int);















    method public final void finish();















    method public android.view.Window getWindow();















    method public android.view.WindowManager getWindowManager();

























api/test-current.txt



+3
−3




























Original line number
Diff line number
Diff line








@@ -4713,7 +4713,7 @@ package android.app {













  public abstract class FragmentContainer {















    ctor public FragmentContainer();















    method public android.app.Fragment instantiate(android.content.Context, java.lang.String, android.os.Bundle);













    method public abstract android.view.View onFindViewById(int);













    method public abstract <T extends android.view.View> T onFindViewById(int);















    method public abstract boolean onHasView();















  }
























@@ -4764,7 +4764,7 @@ package android.app {













    ctor public FragmentHostCallback(android.content.Context, android.os.Handler, int);















    method public void onAttachFragment(android.app.Fragment);















    method public void onDump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);













    method public android.view.View onFindViewById(int);













    method public <T extends android.view.View> T onFindViewById(int);















    method public abstract E onGetHost();















    method public android.view.LayoutInflater onGetLayoutInflater();















    method public int onGetWindowAnimations();










@@ -37374,7 +37374,7 @@ package android.service.dreams {













    method public boolean dispatchPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent);















    method public boolean dispatchTouchEvent(android.view.MotionEvent);















    method public boolean dispatchTrackballEvent(android.view.MotionEvent);













    method public android.view.View findViewById(int);













    method public <T extends android.view.View> T findViewById(int);















    method public final void finish();















    method public android.view.Window getWindow();















    method public android.view.WindowManager getWindowManager();

























core/java/android/app/Activity.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -7526,7 +7526,7 @@ public class Activity extends ContextThemeWrapper





























        @Nullable















        @Override













        public View onFindViewById(int id) {













        public <T extends View> T onFindViewById(int id) {















            return Activity.this.findViewById(id);















        }

















































core/java/android/app/Fragment.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -2527,7 +2527,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene













        mChildFragmentManager.attachController(mHost, new FragmentContainer() {















            @Override















            @Nullable













            public View onFindViewById(int id) {













            public <T extends View> T onFindViewById(int id) {















                if (mView == null) {















                    throw new IllegalStateException("Fragment does not have a view");















                }