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

Commit a0d6b59d authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix bug 2523989"

parents 0d6deeaa c9006872

core/java/android/app/AlertDialog.java

+3 −3
Original line number Diff line number Diff line
@@ -35,12 +35,12 @@ import com.android.internal.app.AlertController; 
/**

 * A subclass of Dialog that can display one, two or three buttons. If you only want to

 * display a String in this dialog box, use the setMessage() method.  If you

 * want to display a more complex view, look up the FrameLayout called "body"

 * want to display a more complex view, look up the FrameLayout called "custom"

 * and add your view to it:

 *

 * <pre>

 * FrameLayout fl = (FrameLayout) findViewById(R.id.body);

 * fl.add(myView, new LayoutParams(MATCH_PARENT, WRAP_CONTENT));

 * FrameLayout fl = (FrameLayout) findViewById(android.R.id.custom);

 * fl.addView(myView, new LayoutParams(MATCH_PARENT, WRAP_CONTENT));

 * </pre>

 * 

 * <p>The AlertDialog class takes care of automatically setting

core/res/res/values/ids.xml

+1 −0
Original line number Diff line number Diff line
@@ -67,4 +67,5 @@ 
  <item type="id" name="addToDictionary" />

  <item type="id" name="accountPreferences" />

  <item type="id" name="smallIcon" />

  <item type="id" name="custom" />

</resources>

core/res/res/values/public.xml

+3 −1
Original line number Diff line number Diff line
@@ -1238,6 +1238,8 @@ 
  <public type="attr" name="overscrollHeader" id="0x010102bf" />

  <public type="attr" name="overscrollFooter" id="0x010102c0" />



  <public type="id" name="custom" id="0x0102002b" />

    

  <public type="anim" name="cycle_interpolator" id="0x010a000c" />



</resources>