Projects >> platform_frameworks_base >>8f080ec4292be02fad9896260bbd3cf5461f9399

Chunk
Conflicting content
     * @return the background drawable
     * 
     * @attr ref android.R.styleable#PopupWindow_popupBackground
<<<<<<< HEAD
=======
     *
     * @hide Pending API council approval
>>>>>>> f3ccf8a5a5a3f6e46781538358bddca992a70e3d
     */
    public Drawable getDropDownBackground() {
        return mPopup.getBackground();
Solution content
     * @return the background drawable
     * 
     * @attr ref android.R.styleable#PopupWindow_popupBackground
     */
    public Drawable getDropDownBackground() {
        return mPopup.getBackground();
File
AutoCompleteTextView.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content
     * @param d the drawable to set as the background
     * 
     * @attr ref android.R.styleable#PopupWindow_popupBackground
<<<<<<< HEAD
=======
     *
     * @hide Pending API council approval
>>>>>>> f3ccf8a5a5a3f6e46781538358bddca992a70e3d
     */
    public void setDropDownBackgroundDrawable(Drawable d) {
        mPopup.setBackgroundDrawable(d);
Solution content
     * @param d the drawable to set as the background
     * 
     * @attr ref android.R.styleable#PopupWindow_popupBackground
     */
    public void setDropDownBackgroundDrawable(Drawable d) {
        mPopup.setBackgroundDrawable(d);
File
AutoCompleteTextView.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content
     * @param id the id of the drawable to set as the background
     * 
     * @attr ref android.R.styleable#PopupWindow_popupBackground
<<<<<<< HEAD
=======
     *
     * @hide Pending API council approval
>>>>>>> f3ccf8a5a5a3f6e46781538358bddca992a70e3d
     */
    public void setDropDownBackgroundResource(int id) {
        mPopup.setBackgroundDrawable(getResources().getDrawable(id));
Solution content
     * @param id the id of the drawable to set as the background
     * 
     * @attr ref android.R.styleable#PopupWindow_popupBackground
     */
    public void setDropDownBackgroundResource(int id) {
        mPopup.setBackgroundDrawable(getResources().getDrawable(id));
File
AutoCompleteTextView.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content
    public void setDropDownBackgroundResource(int id) {
        mPopup.setBackgroundDrawable(getResources().getDrawable(id));
    }
<<<<<<< HEAD
    
    /**
     * 

Sets the vertical offset used for the auto-complete drop-down list.

* * @param offset the vertical offset */ public void setDropDownVerticalOffset(int offset) { mDropDownVerticalOffset = offset; } /** *

Gets the vertical offset used for the auto-complete drop-down list.

* * @return the vertical offset */ public int getDropDownVerticalOffset() { return mDropDownVerticalOffset; } /** *

Sets the horizontal offset used for the auto-complete drop-down list.

* * @param offset the horizontal offset */ public void setDropDownHorizontalOffset(int offset) { mDropDownHorizontalOffset = offset; } /** *

Gets the horizontal offset used for the auto-complete drop-down list.

* * @return the horizontal offset */ public int getDropDownHorizontalOffset() { return mDropDownHorizontalOffset; } ======= /** *

Sets the animation style of the auto-complete drop-down list.

* *

If the drop-down is showing, calling this method will take effect only * the next time the drop-down is shown.

* * @param animationStyle animation style to use when the drop-down appears * and disappears. Set to -1 for the default animation, 0 for no * animation, or a resource identifier for an explicit animation. * * @hide Pending API council approval */ public void setDropDownAnimationStyle(int animationStyle) { mPopup.setAnimationStyle(animationStyle); } >>>>>>> f3ccf8a5a5a3f6e46781538358bddca992a70e3d /** *

Returns the animation style that is used when the drop-down list appears and disappears *

Solution content
    public void setDropDownBackgroundResource(int id) {
        mPopup.setBackgroundDrawable(getResources().getDrawable(id));
    }
    
    /**
     * 

Sets the vertical offset used for the auto-complete drop-down list.

* * @param offset the vertical offset */ public void setDropDownVerticalOffset(int offset) { mDropDownVerticalOffset = offset; } /** *

Gets the vertical offset used for the auto-complete drop-down list.

* * @return the vertical offset */ public int getDropDownVerticalOffset() { return mDropDownVerticalOffset; } /** *

Sets the horizontal offset used for the auto-complete drop-down list.

* * @param offset the horizontal offset */ public void setDropDownHorizontalOffset(int offset) { mDropDownHorizontalOffset = offset; } /** *

Gets the horizontal offset used for the auto-complete drop-down list.

* * @return the horizontal offset */ public int getDropDownHorizontalOffset() { return mDropDownHorizontalOffset; } ||||||| ======= /** *

Gets the background of the auto-complete drop-down list.

* * @return the background drawable * * @attr ref android.R.styleable#PopupWindow_popupBackground * * @hide Pending API council approval */ public Drawable getDropDownBackground() { return mPopup.getBackground(); } /** *

Sets the background of the auto-complete drop-down list.

* * @param d the drawable to set as the background * * @attr ref android.R.styleable#PopupWindow_popupBackground * * @hide Pending API council approval */ public void setDropDownBackgroundDrawable(Drawable d) { mPopup.setBackgroundDrawable(d); } /** *

Sets the background of the auto-complete drop-down list.

* * @param id the id of the drawable to set as the background * * @attr ref android.R.styleable#PopupWindow_popupBackground * * @hide Pending API council approval */ public void setDropDownBackgroundResource(int id) { mPopup.setBackgroundDrawable(getResources().getDrawable(id)); } /** *

Sets the animation style of the auto-complete drop-down list.

* *

If the drop-down is showing, calling this method will take effect only * the next time the drop-down is shown.

* * @param animationStyle animation style to use when the drop-down appears * and disappears. Set to -1 for the default animation, 0 for no * animation, or a resource identifier for an explicit animation. * * @hide Pending API council approval */ public void setDropDownAnimationStyle(int animationStyle) { mPopup.setAnimationStyle(animationStyle); } >>>>>>> f3ccf8a5a5a3f6e46781538358bddca992a70e3d:core/java/android/widget/AutoCompleteTextView.java /** *

Returns the animation style that is used when the drop-down list appears and disappears *

File
AutoCompleteTextView.java
Developer's decision
Manual
Kind of conflict
Comment
Method declaration