Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d38c4a2 authored by Wysie's avatar Wysie
Browse files

Release 1.51. Added drawable for navigation in contact details :). Fixed some minor bugs.

parent 4edfbcc1

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -327,6 +327,8 @@ 
    <!-- Separator in the contact details list describing that the items below it will open maps with the given address -->

    <string name="listSeparatorMapAddress">Map address</string>

    

    <string name="listSeparatorNaviAddress">Navigate to address</string>



    <!-- Section header in the Edit Contacts screen for map addresses -->

    <string name="listSeparatorMapAddress_edit">Postal addresses</string>

res/values/strings.xml~

+2 −0
Original line number Diff line number Diff line
@@ -327,6 +327,8 @@ 
    <!-- Separator in the contact details list describing that the items below it will open maps with the given address -->

    <string name="listSeparatorMapAddress">Map address</string>

    

    <string name="listSeparatorNaviAddress">Navigate to address</string>



    <!-- Section header in the Edit Contacts screen for map addresses -->

    <string name="listSeparatorMapAddress_edit">Postal addresses</string>

src/com/android/contacts/ViewContactActivity.java

+14 −4
Original line number Diff line number Diff line
@@ -730,6 +730,11 @@ public class ViewContactActivity extends ListActivity 
        separator.data = getString(R.string.listSeparatorMapAddress);

        mPostalEntries.add(separator);

        

        separator = new ViewEntry();

        separator.kind = ViewEntry.KIND_SEPARATOR;

        separator.data = getString(R.string.listSeparatorNaviAddress);

        mPostalEntries.add(separator);



        separator = new ViewEntry();

        separator.kind = ViewEntry.KIND_SEPARATOR;

        separator.data = getString(R.string.listSeparatorOrganizations);
@@ -876,11 +881,13 @@ public class ViewContactActivity extends ListActivity 
                        entry2.label = "Navigate to";

                        entry2.data = data;

                        entry2.maxLines = 4;

                        entry2.actionIcon = R.drawable.sym_action_navi;

                        Intent i = startNavigation(data);

                        

                        if (i != null)

                        if (i != null) {

                        	entry2.intent = i;

                        	mNavigationEntries.add(entry2);

                        }

                        break;



                    case Contacts.KIND_IM: {
@@ -1225,14 +1232,17 @@ public class ViewContactActivity extends ListActivity 
        	i.addFlags(0x10800000);

        	i.setClassName("com.google.android.apps.m4ps", "com.google.android.maps.driveabout.app.NavigationActivity");

        	

        	if (isIntentAvailable(i))

        	if (isIntentAvailable(i)) {

        		return i;

        	}

        	else {

        		i.setClassName("com.google.android.apps.maps", "com.google.android.maps.driveabout.app.NavigationActivity");

        		if (isIntentAvailable(i))

        		if (isIntentAvailable(i)) {

        			return i;

        		else

        		}

        		else {

        			return null;

        		}

        	}

        }

}

src/com/android/contacts/ViewContactActivity.java~

+14 −4
Original line number Diff line number Diff line
@@ -730,6 +730,11 @@ public class ViewContactActivity extends ListActivity 
        separator.data = getString(R.string.listSeparatorMapAddress);

        mPostalEntries.add(separator);

        

        separator = new ViewEntry();

        separator.kind = ViewEntry.KIND_SEPARATOR;

        separator.data = getString(R.string.listSeparatorNaviAddress);

        mPostalEntries.add(separator);



        separator = new ViewEntry();

        separator.kind = ViewEntry.KIND_SEPARATOR;

        separator.data = getString(R.string.listSeparatorOrganizations);
@@ -876,11 +881,13 @@ public class ViewContactActivity extends ListActivity 
                        entry2.label = "Navigate to";

                        entry2.data = data;

                        entry2.maxLines = 4;

                        entry2.actionIcon = R.drawable.sym_action_navi;

                        Intent i = startNavigation(data);

                        

                        if (i != null)

                        if (i != null) {

                        	entry2.intent = i;

                        	mNavigationEntries.add(entry2);

                        }

                        break;



                    case Contacts.KIND_IM: {
@@ -1225,14 +1232,17 @@ public class ViewContactActivity extends ListActivity 
        	i.addFlags(0x10800000);

        	i.setClassName("com.google.android.apps.m4ps", "com.google.android.maps.driveabout.app.NavigationActivity");

        	

        	if (isIntentAvailable(i))

        	if (isIntentAvailable(i)) {

        		return i;

        	}

        	else {

        		i.setClassName("com.google.android.apps.maps", "com.google.android.maps.driveabout.app.NavigationActivity");

        		if (isIntentAvailable(i))

        		if (isIntentAvailable(i)) {

        			return i;

        		else

        		}

        		else {

        			return null;

        		}

        	}

        }

}