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

Commit 4b1faeb1 authored by John Reck's avatar John Reck Committed by Android Git Automerger
Browse files

am 75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryce 

* commit '75084da1':
  toUpper() some strings
parents acdef4fa 75084da1

res/layout-land/filtershow_editor_panel.xml

+2 −1
Original line number Diff line number Diff line
@@ -101,7 +101,8 @@ 
                        android:gravity="center"

                        android:text="@string/apply_effect"

                        android:textSize="18dip"

                        android:drawableRight="@drawable/filtershow_menu_marker"/>

                        android:drawableRight="@drawable/filtershow_menu_marker"

                        android:textAllCaps="true" />



            </LinearLayout>

res/layout/filtershow_editor_panel.xml

+2 −1
Original line number Diff line number Diff line
@@ -85,7 +85,8 @@ 
                        android:gravity="center"

                        android:text="@string/apply_effect"

                        android:textSize="18dip"

                        android:drawableRight="@drawable/filtershow_menu_marker"/>

                        android:drawableRight="@drawable/filtershow_menu_marker"

                        android:textAllCaps="true" />



            </LinearLayout>

src/com/android/gallery3d/filtershow/editors/Editor.java

+8 −0
Original line number Diff line number Diff line
@@ -59,6 +59,14 @@ public class Editor implements OnSeekBarChangeListener, SwapButton.SwapButtonLis 
    public static byte SHOW_VALUE_OFF = 0;

    public static byte SHOW_VALUE_INT = 1;



    public static void hackFixStrings(Menu menu) {

        int count = menu.size();

        for (int i = 0; i < count; i++) {

            MenuItem item = menu.getItem(i);

            item.setTitle(item.getTitle().toString().toUpperCase());

        }

    }



    public String calculateUserMessage(Context context, String effectName, Object parameterValue) {

        return effectName.toUpperCase() + " " + parameterValue;

    }

src/com/android/gallery3d/filtershow/editors/SwapButton.java

+0 −8
Original line number Diff line number Diff line
@@ -51,14 +51,6 @@ public class SwapButton extends Button implements GestureDetector.OnGestureListe 
        mListener = listener;

    }



    public Menu getMenu() {

        return mMenu;

    }



    public void setMenu(Menu menu) {

        mMenu = menu;

    }



    public boolean onTouchEvent(MotionEvent me) {

        if (!mDetector.onTouchEvent(me)) {

            return super.onTouchEvent(me);

src/com/android/gallery3d/filtershow/ui/ImageCurves.java

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.widget.LinearLayout; 
import android.widget.PopupMenu;



import com.android.gallery3d.R;

import com.android.gallery3d.filtershow.editors.Editor;

import com.android.gallery3d.filtershow.editors.EditorCurves;

import com.android.gallery3d.filtershow.filters.FilterCurvesRepresentation;

import com.android.gallery3d.filtershow.filters.FiltersManager;
@@ -116,6 +117,7 @@ public class ImageCurves extends ImageShow { 
                return true;

            }

        });

        Editor.hackFixStrings(popupMenu.getMenu());

        popupMenu.show();

    }