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

Commit 2d8936cf authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "TouchFeedbackDrawable is now RippleDrawable"

parents bc2111be ba348ca9

res/drawable/dashboard_tile_background.xml

+2 −2
Original line number Diff line number Diff line
@@ -14,10 +14,10 @@ 
     limitations under the License.

-->



<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android"

<ripple xmlns:android="http://schemas.android.com/apk/res/android"

                android:tint="?android:attr/colorButtonPressed">

    <item>

        <color android:color="@android:color/white" />

    </item>

</touch-feedback>

</ripple>

res/drawable/preference_highlight.xml

+2 −2
Original line number Diff line number Diff line
@@ -14,10 +14,10 @@ 
     limitations under the License.

-->



<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android"

<ripple xmlns:android="http://schemas.android.com/apk/res/android"

                android:tint="?android:attr/colorButtonPressed"

                android:pinned="true">

    <item android:id="@android:id/mask"

          android:drawable="@android:color/white" />

</touch-feedback>

</ripple>

src/com/android/settings/HighlightingFragment.java

+3 −2
Original line number Diff line number Diff line
@@ -83,8 +83,9 @@ public class HighlightingFragment extends Fragment { 
                public void run() {

                    final int centerX = view.getWidth() / 2;

                    final int centerY = view.getHeight() / 2;

                    highlight.setHotspot(0, centerX, centerY);

                    highlight.clearHotspots();

                    highlight.setHotspot(centerX, centerY);

                    view.setPressed(true);

                    view.setPressed(false);

                }

            }, DELAY_HIGHLIGHT_DURATION_MILLIS);

src/com/android/settings/SettingsPreferenceFragment.java

+9 −6
Original line number Diff line number Diff line
@@ -183,10 +183,12 @@ public class SettingsPreferenceFragment extends PreferenceFragment implements Di 
                    listView.postDelayed(new Runnable() {

                        @Override

                        public void run() {

                            final int centerX = listView.getWidth() / 2;

                            final int centerY = listView.getChildAt(0).getHeight() / 2;

                            highlight.setHotspot(0, centerX, centerY);

                            highlight.clearHotspots();

                            final View v = listView.getChildAt(0);

                            final int centerX = v.getWidth() / 2;

                            final int centerY = v.getHeight() / 2;

                            highlight.setHotspot(centerX, centerY);

                            v.setPressed(true);

                            v.setPressed(false);

                            ((PreferenceGroupAdapter) adapter).setHighlighted(-1);

                        }

                    }, DELAY_HIGHLIGHT_DURATION_MILLIS);
@@ -201,8 +203,9 @@ public class SettingsPreferenceFragment extends PreferenceFragment implements Di 
                preferenceView.setBackground(highlight);

                final int centerX = preferenceView.getWidth() / 2;

                final int centerY = preferenceView.getHeight() / 2;

                highlight.setHotspot(0, centerX, centerY);

                highlight.clearHotspots();

                highlight.setHotspot(centerX, centerY);

                preferenceView.setPressed(true);

                preferenceView.setPressed(false);

            }

        }

    }