mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-09-02 07:05:09 +00:00
Code Issues Releases Wiki Activity

Merge branch '0.9'

Browse Source 
# Conflicts:
#	res/values-ca/strings.xml
#	res/values-fi/strings.xml
#	res/values-nl/strings.xml
#	res/values-pt-rBR/strings.xml
#	res/values-pt/strings.xml
#	res/values-sv/strings.xml
#	res/values-uk/strings.xml
#	res/values/strings.xml
#	src/org/kde/kdeconnect/Device.java
This commit is contained in:
Albert Vaca
2015-09-18 08:11:44 -07:00
parent a9676be722 47c9729e04
commit 9322970d58
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/org/kde/kdeconnect/UserInterface/DeviceFragment.java
View File

@@ -301,7 +301,6 @@ public class DeviceFragment extends Fragment {
@Override
public void run() {
Log.e("DEVICE",device.getName() + device.isPairRequestedByOtherEnd() + device.isPairRequested());
if (device.isPairRequestedByOtherEnd()) {
((TextView) rootView.findViewById(R.id.pair_message)).setText(R.string.pair_requested);
rootView.findViewById(R.id.pair_progress).setVisibility(View.GONE);