Bug 1232868 - Consolidate usage of arrow resource. r=mcomella draft
authorChenxia Liu <liuche@mozilla.com>
Thu, 03 Mar 2016 16:29:57 -0800
changeset 336640 5a7a7b4f42994ba9d4800a337b4c7bbe72776df1
parent 336639 465c07d67419b7dedee7eaff81340e1cf1f0be50
child 336984 772088eabf205215179a99f26d704261780531e3
push id12157
push usercliu@mozilla.com
push dateFri, 04 Mar 2016 00:35:24 +0000
reviewersmcomella
bugs1232868
milestone47.0a1
Bug 1232868 - Consolidate usage of arrow resource. r=mcomella MozReview-Commit-ID: LwUmDt4E9K5
mobile/android/base/java/org/mozilla/gecko/RemoteTabsExpandableListAdapter.java
mobile/android/base/resources/drawable-hdpi/home_group_expanded.png
mobile/android/base/resources/drawable-xhdpi/home_group_expanded.png
mobile/android/base/resources/drawable-xxhdpi/home_group_expanded.png
mobile/android/base/resources/drawable/arrow_down.xml
mobile/android/base/resources/layout/home_remote_tabs_group.xml
--- a/mobile/android/base/java/org/mozilla/gecko/RemoteTabsExpandableListAdapter.java
+++ b/mobile/android/base/java/org/mozilla/gecko/RemoteTabsExpandableListAdapter.java
@@ -148,17 +148,17 @@ public class RemoteTabsExpandableListAda
         // indicator.
         final int deviceTypeResId;
         final int textColorResId;
         final int deviceExpandedResId;
 
         if (isExpanded && !client.tabs.isEmpty()) {
             deviceTypeResId = "desktop".equals(client.deviceType) ? R.drawable.sync_desktop : R.drawable.sync_mobile;
             textColorResId = R.color.placeholder_active_grey;
-            deviceExpandedResId = showGroupIndicator ? R.drawable.home_group_expanded : R.drawable.home_group_collapsed;
+            deviceExpandedResId = showGroupIndicator ? R.drawable.arrow_down: R.drawable.home_group_collapsed;
         } else {
             deviceTypeResId = "desktop".equals(client.deviceType) ? R.drawable.sync_desktop_inactive : R.drawable.sync_mobile_inactive;
             textColorResId = R.color.tabs_tray_icon_grey;
             deviceExpandedResId = showGroupIndicator ? R.drawable.home_group_collapsed : 0;
         }
 
         // Now update the UI.
         holder.nameView.setText(client.name);
deleted file mode 100644
index d1e602d67dd513b51f7ec5f3186aef1dfe5bb496..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 4326616aa81271f651685ece526d3e1c72a8cd43..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 2d9d03e5ffd9004b5dc8086f973138c072e034a1..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
--- /dev/null
+++ b/mobile/android/base/resources/drawable/arrow_down.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<rotate xmlns:android="http://schemas.android.com/apk/res/android"
+        android:drawable="@drawable/arrow_up"
+        android:fromDegrees="180"
+        android:toDegrees="180"/>
+
--- a/mobile/android/base/resources/layout/home_remote_tabs_group.xml
+++ b/mobile/android/base/resources/layout/home_remote_tabs_group.xml
@@ -49,11 +49,11 @@
 
     <ImageView
         android:id="@+id/device_expanded"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:layout_marginLeft="15dip"
         android:layout_marginRight="15dip"
         android:scaleType="center"
-        tools:src="@drawable/home_group_expanded"/>
+        tools:src="@drawable/arrow_down"/>
 
 </LinearLayout>