summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Bertschler <bmario@google.com>2017-05-16 20:13:42 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-05-16 20:13:42 +0000
commit7f91393c5518584fd48913a16f2dd2759bad31ea (patch)
tree7fd817c3b0c7e9bd74b9995d82efdeccde562fca
parentec6a48ce608b5d18a09ce709d6f47803dcf451b0 (diff)
parent8ffddbb7c215f280b714661b8cae01246bde9956 (diff)
downloadandroid_packages_apps_Trebuchet-7f91393c5518584fd48913a16f2dd2759bad31ea.tar.gz
android_packages_apps_Trebuchet-7f91393c5518584fd48913a16f2dd2759bad31ea.tar.bz2
android_packages_apps_Trebuchet-7f91393c5518584fd48913a16f2dd2759bad31ea.zip
Merge "Minor polishment on app discovery UI." into ub-launcher3-dorval
am: 8ffddbb7c2 Change-Id: I611a4707882a0fb5c78c223ebd9f5c8e0e67d411
-rw-r--r--res/layout/all_apps_discovery_item.xml5
-rw-r--r--res/layout/all_apps_discovery_loading_divider.xml4
-rw-r--r--src/com/android/launcher3/discovery/AppDiscoveryItemView.java2
3 files changed, 6 insertions, 5 deletions
diff --git a/res/layout/all_apps_discovery_item.xml b/res/layout/all_apps_discovery_item.xml
index 1a7eaa72d..3350530af 100644
--- a/res/layout/all_apps_discovery_item.xml
+++ b/res/layout/all_apps_discovery_item.xml
@@ -51,11 +51,12 @@
android:layout_height="wrap_content"
android:textColor="?android:textColorSecondary"
android:textSize="14sp"
- android:layout_gravity="center_vertical"/>
+ android:layout_gravity="center_vertical"
+ android:includeFontPadding="false"/>
<com.android.launcher3.discovery.RatingView
android:id="@+id/rating_view"
- android:layout_width="80dp"
+ android:layout_width="70dp"
android:layout_height="16dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
diff --git a/res/layout/all_apps_discovery_loading_divider.xml b/res/layout/all_apps_discovery_loading_divider.xml
index c7b5ad23d..1ad552142 100644
--- a/res/layout/all_apps_discovery_loading_divider.xml
+++ b/res/layout/all_apps_discovery_loading_divider.xml
@@ -15,7 +15,7 @@
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="20dp"
+ android:layout_height="6dp"
android:paddingLeft="@dimen/container_fastscroll_thumb_max_width"
android:paddingRight="@dimen/container_fastscroll_thumb_max_width">
@@ -34,7 +34,7 @@
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@drawable/all_apps_divider"
- android:layout_gravity="center"
+ android:layout_gravity="bottom"
android:visibility="invisible"/>
</FrameLayout> \ No newline at end of file
diff --git a/src/com/android/launcher3/discovery/AppDiscoveryItemView.java b/src/com/android/launcher3/discovery/AppDiscoveryItemView.java
index 9bb3b100e..809d7249d 100644
--- a/src/com/android/launcher3/discovery/AppDiscoveryItemView.java
+++ b/src/com/android/launcher3/discovery/AppDiscoveryItemView.java
@@ -82,7 +82,7 @@ public class AppDiscoveryItemView extends RelativeLayout {
mPrice.setText(info.priceFormatted != null ? info.priceFormatted : "");
mReviewCount.setVisibility(SHOW_REVIEW_COUNT ? View.VISIBLE : View.GONE);
if (info.rating >= 0) {
- mRatingText.setText(new DecimalFormat("#.#").format(info.rating));
+ mRatingText.setText(new DecimalFormat("#.0").format(info.rating));
mRatingView.setRating(info.rating);
mRatingView.setVisibility(View.VISIBLE);
String reviewCountFormatted = NumberFormat.getInstance().format(info.reviewCount);