Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/1.1.762_274' into 1.1.762_274
Browse files Browse the repository at this point in the history 
Conflicts:
	build/rebuilt.apk
  • Loading branch information
KashaMalaga committed Nov 25, 2014
2 parents 9c11b0d + e0be8a8 commit 94d5e8d
Show file tree
Hide file tree
Showing 10 changed files with 33 additions and 30 deletions.
Binary file modified res/drawable-xxhdpi/share_facebook.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-xxhdpi/share_facebook_uninstall.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-xxhdpi/share_qq_zone_select.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-xxhdpi/share_qq_zone_uninstall.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-xxhdpi/share_weibo_select.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-xxhdpi/share_weibo_uninstall.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions res/layout/activity_share.xml
View file
Expand Up @@ -38,10 +38,10 @@
<ImageButton android:id="@id/share_to_weixin_btn" android:background="@color/trans" android:layout_width="0.0dip" android:layout_height="fill_parent" android:src="@drawable/share_weixin_select" android:layout_weight="1.0" />
<ImageButton android:id="@id/share_to_pengyouquan_btn" android:background="@color/trans" android:layout_width="0.0dip" android:layout_height="fill_parent" android:src="@drawable/share_pengyouquan_select" android:layout_weight="1.0" />
<ImageButton android:id="@id/share_to_miliao_btn" android:background="@color/trans" android:layout_width="0.0dip" android:layout_height="fill_parent" android:src="@drawable/share_miliao" android:layout_weight="1.0" />
<ImageButton android:id="@id/share_to_weibo_btn" android:background="@color/trans" android:layout_width="0.0dip" android:layout_height="fill_parent" android:src="@drawable/share_weibo_select" android:layout_weight="1.0" />
<ImageButton android:id="@id/share_to_qq_zone_btn" android:background="@color/trans" android:layout_width="0.0dip" android:layout_height="fill_parent" android:src="@drawable/share_qq_zone_select" android:layout_weight="1.0" />
<ImageButton android:id="@id/share_to_qq_btn" android:background="@color/trans" android:layout_width="0.0dip" android:layout_height="fill_parent" android:src="@drawable/share_qq_select" android:layout_weight="1.0" />
<ImageButton android:id="@id/share_to_weibo_btn" android:background="@color/trans" android:layout_width="0.0dip" android:layout_height="fill_parent" android:src="@drawable/share_weibo_select" android:layout_weight="1.0" />
<ImageButton android:id="@id/share_to_line_btn" android:background="@color/trans" android:layout_width="0.0dip" android:layout_height="fill_parent" android:src="@drawable/share_line" android:layout_weight="1.0" />
<ImageButton android:id="@id/share_to_facebook_btn" android:background="@color/trans" android:layout_width="0.0dip" android:layout_height="fill_parent" android:src="@drawable/share_facebook" android:layout_weight="1.0" />
<ImageButton android:id="@id/share_to_qq_btn" android:background="@color/trans" android:layout_width="0.0dip" android:layout_height="fill_parent" android:src="@drawable/share_qq_select" android:layout_weight="1.0" />
<ImageButton android:id="@id/share_to_qq_zone_btn" android:background="@color/trans" android:layout_width="0.0dip" android:layout_height="fill_parent" android:src="@drawable/share_qq_zone_select" android:layout_weight="1.0" />
</LinearLayout>
</RelativeLayout>
2 changes: 1 addition & 1 deletion res/values-es/strings.xml
View file
Expand Up @@ -434,7 +434,7 @@ Necesita una red disponible."</string>
<string name="setting_about_app">"Version de la app:
Tweaked by dezmen3
Notifications by mksaint13
Modded ES KashaMalaga"</string>
Modded ES KashaMalaga, Daneel_"</string>
<string name="setting_about_fw">Versión de firmware </string>
<string name="setting_feedback_address">¿Cómo podemos contactar contigo?</string>
<string name="setting_feedback_hint">Gracias por su tiempo. Su opinión es importante para nosotros.</string>
Expand Down
2 changes: 1 addition & 1 deletion res/values/strings.xml
View file
Expand Up @@ -438,7 +438,7 @@ or about 12,000 steps a day for a healthy lifestyle."</string>
<string name="setting_about_app">"App version:
Tweaked by dezmen3
Notifications by mksaint13
Modded ES KashaMalaga"</string>
Modded ES KashaMalaga, Daneel_"</string>
<string name="setting_about_fw">Version </string>
<string name="setting_feedback_address">Contact info</string>
<string name="setting_feedback_hint">We love feedback.</string>
Expand Down
53 changes: 28 additions & 25 deletions smali/cn/com/smartdevices/bracelet/ui/ShareActivity.smali
View file
Expand Up @@ -1650,19 +1650,19 @@
goto/16 :goto_0

:cond_9
iget-object v0, p0, Lcn/com/smartdevices/bracelet/ui/ShareActivity;->t:Landroid/widget/ImageButton;
iget-object v0, p0, Lcn/com/smartdevices/bracelet/ui/ShareActivity;->p:Landroid/widget/ImageButton;

invoke-virtual {v0, v3}, Landroid/widget/ImageButton;->setVisibility(I)V

iget-object v0, p0, Lcn/com/smartdevices/bracelet/ui/ShareActivity;->s:Landroid/widget/ImageButton;
iget-object v0, p0, Lcn/com/smartdevices/bracelet/ui/ShareActivity;->o:Landroid/widget/ImageButton;

invoke-virtual {v0, v3}, Landroid/widget/ImageButton;->setVisibility(I)V

iget-object v0, p0, Lcn/com/smartdevices/bracelet/ui/ShareActivity;->r:Landroid/widget/ImageButton;
iget-object v0, p0, Lcn/com/smartdevices/bracelet/ui/ShareActivity;->t:Landroid/widget/ImageButton;

invoke-virtual {v0, v3}, Landroid/widget/ImageButton;->setVisibility(I)V

iget-object v0, p0, Lcn/com/smartdevices/bracelet/ui/ShareActivity;->q:Landroid/widget/ImageButton;
iget-object v0, p0, Lcn/com/smartdevices/bracelet/ui/ShareActivity;->r:Landroid/widget/ImageButton;

invoke-virtual {v0, v3}, Landroid/widget/ImageButton;->setVisibility(I)V

Expand Down Expand Up @@ -1727,11 +1727,11 @@

move-result v0

if-nez v0, :cond_1
if-eqz v0, :cond_7



return-void

:cond_1
invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;

move-result-object v0
Expand All @@ -1748,13 +1748,13 @@

iget-object v3, v3, Landroid/content/pm/ActivityInfo;->name:Ljava/lang/String;

const-string v4, "com.sina.weibo"
const-string v4, "com.whatsapp"

invoke-virtual {v2, v4}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z

move-result v4

if-eqz v4, :cond_2
if-eqz v4, :cond_1

iget-object v2, p0, Lcn/com/smartdevices/bracelet/ui/ShareActivity;->M:Ljava/util/HashMap;

Expand All @@ -1764,22 +1764,22 @@

goto :goto_0

:cond_2
:cond_1
const-string v4, "com.tencent.mm"

invoke-virtual {v2, v4}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z

move-result v4

if-eqz v4, :cond_4
if-eqz v4, :cond_3

const-string v2, "com.tencent.mm.ui.tools.ShareToTimeLineUI"

invoke-virtual {v3, v2}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z

move-result v2

if-eqz v2, :cond_3
if-eqz v2, :cond_2

iget-object v2, p0, Lcn/com/smartdevices/bracelet/ui/ShareActivity;->M:Ljava/util/HashMap;

Expand All @@ -1789,7 +1789,7 @@

goto :goto_0

:cond_3
:cond_2
const-string v2, "com.tencent.mm.ui.tools.ShareImgUI"

invoke-virtual {v3, v2}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
Expand All @@ -1806,31 +1806,32 @@

goto :goto_0

:cond_4
const-string v4, "com.qzone"
:cond_3
const-string v4, "com.android.bluetooth"

invoke-virtual {v2, v4}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z

move-result v4

if-eqz v4, :cond_5
if-eqz v4, :cond_4

iget-object v2, p0, Lcn/com/smartdevices/bracelet/ui/ShareActivity;->M:Ljava/util/HashMap;

const-string v3, "share_qq_zone"
const/4 v5, 0x0

invoke-virtual {v2, v3, v0}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
invoke-virtual {v2, v3, v5}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

goto :goto_0

:cond_5
:cond_4
const-string v4, "com.tencent.mobileqq"

invoke-virtual {v2, v4}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z

move-result v4

if-eqz v4, :cond_6
if-eqz v4, :cond_5

const-string v2, "com.tencent.mobileqq.activity.JumpActivity"

Expand All @@ -1848,14 +1849,14 @@

goto :goto_0

:cond_6
:cond_5
const-string v3, "jp.naver.line.android"

invoke-virtual {v2, v3}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z

move-result v3

if-eqz v3, :cond_7
if-eqz v3, :cond_6

iget-object v2, p0, Lcn/com/smartdevices/bracelet/ui/ShareActivity;->M:Ljava/util/HashMap;

Expand All @@ -1865,8 +1866,8 @@

goto/16 :goto_0

:cond_7
const-string v3, "com.android.bluetooth"
:cond_6
const-string v3, "com.facebook.katana"

invoke-virtual {v2, v3}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z

Expand All @@ -1878,11 +1879,13 @@

const-string v3, "share_facebook"

const/4 v5, 0x0


invoke-virtual {v2, v3, v5}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
invoke-virtual {v2, v3, v0}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

goto/16 :goto_0
:cond_7
return-void
.end method

.method private i()Ljava/lang/String;
Expand Down

0 comments on commit 94d5e8d

Please sign in to comment.