summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Utilities.java
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2016-05-16 09:54:06 -0700
committerTony Wickham <twickham@google.com>2016-05-17 18:53:57 -0700
commitf549dab31d0fa3e4d0cf8d6025b20e49aafb2d59 (patch)
treea10ccc74b4d0ad6f353a0a6853950335156c748b /src/com/android/launcher3/Utilities.java
parent192ae6ca71b0a1401ad44020b631c634a348597e (diff)
downloadandroid_packages_apps_Trebuchet-f549dab31d0fa3e4d0cf8d6025b20e49aafb2d59.tar.gz
android_packages_apps_Trebuchet-f549dab31d0fa3e4d0cf8d6025b20e49aafb2d59.tar.bz2
android_packages_apps_Trebuchet-f549dab31d0fa3e4d0cf8d6025b20e49aafb2d59.zip
Add PageIndicator interface and custom PageIndicatorLine view.
- The current PageIndicator has been renamed to PageIndicatorDots and PageIndicatorMarker has been renamed to PageIndicatorDot. - PageIndicatorDots and PageIndicatorLine implement PageIndicator. - PageIndicatorLine uses scroll progress and number of pages to draw a line of the correct size and position. - All of these page indicator files are now in a pageindicators package. Bug: 27227498 Change-Id: I9230d2e0600ce583989bd31d0b0e252b148d15c2
Diffstat (limited to 'src/com/android/launcher3/Utilities.java')
-rw-r--r--src/com/android/launcher3/Utilities.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 53522fb83..e3b959b39 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -798,7 +798,14 @@ public final class Utilities {
* If value is less than lowerBound, return lowerBound; else if value is greater than upperBound,
* return upperBound; else return value unchanged.
*/
- public static int boundInRange(int value, int lowerBound, int upperBound) {
+ public static int boundToRange(int value, int lowerBound, int upperBound) {
+ return Math.max(lowerBound, Math.min(value, upperBound));
+ }
+
+ /**
+ * @see #boundToRange(int, int, int).
+ */
+ public static float boundToRange(float value, float lowerBound, float upperBound) {
return Math.max(lowerBound, Math.min(value, upperBound));
}