diff --git a/android/sdremote/AndroidManifest.xml b/android/sdremote/AndroidManifest.xml index 82bf17eb3930..098345064572 100644 --- a/android/sdremote/AndroidManifest.xml +++ b/android/sdremote/AndroidManifest.xml @@ -78,6 +78,13 @@ + + + + + + + + + 12dp 8dp 8dp + 4dp 12dp 8dp diff --git a/android/sdremote/res/values/strings.xml b/android/sdremote/res/values/strings.xml index fb31b46978e8..4ec816af049b 100644 --- a/android/sdremote/res/values/strings.xml +++ b/android/sdremote/res/values/strings.xml @@ -59,9 +59,9 @@ Time is up! Make sure LibreOffice is running on a computer on the same WiFi network. Make sure LibreOffice is running on a computer with Bluetooth enabled. + Learn more Paused Nothing here. - IP address Name (optional) diff --git a/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java b/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java index 5527ea4d61c4..19657cd0f09b 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java +++ b/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java @@ -23,7 +23,10 @@ import android.os.Bundle; import android.os.Handler; import android.os.IBinder; import android.support.v4.content.LocalBroadcastManager; +import android.text.Html; import android.text.TextUtils; +import android.text.method.LinkMovementMethod; +import android.text.util.Linkify; import android.view.ContextMenu; import android.view.LayoutInflater; import android.view.View; @@ -107,6 +110,7 @@ public class ComputersFragment extends SherlockListFragment implements ServiceCo if (aProgressMessageDisplayed) { showProgressMessage(); + showLearnMoreMessage(); } } @@ -124,6 +128,20 @@ public class ComputersFragment extends SherlockListFragment implements ServiceCo return (TextView) getView().findViewById(R.id.text_progress_message); } + private void showLearnMoreMessage() { + TextView learnMoreView = getLearnMoreView(); + Animation aFadeInAnimation = AnimationUtils.loadAnimation(getActivity(), android.R.anim.fade_in); + + learnMoreView.setMovementMethod(LinkMovementMethod.getInstance()); + + learnMoreView.startAnimation(aFadeInAnimation); + learnMoreView.setVisibility(View.VISIBLE); + } + + private TextView getLearnMoreView() { + return (TextView) getView().findViewById(R.id.text_learn_more); + } + private String getProgressMessage() { switch (getType()) { case WIFI: @@ -238,6 +256,7 @@ public class ComputersFragment extends SherlockListFragment implements ServiceCo } showProgressMessage(); + showLearnMoreMessage(); } private boolean isShowingProgressMessageRequired() {