phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

new actionbar title for permalink

Browse Source
This commit is contained in:
Philipp Schaefer 2013-12-10 22:14:24 +01:00
parent 18afab9952
commit 58b85e4c24
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/utils_misc.js
View File

@ -267,11 +267,11 @@ window.androidCopy = function(text) {
} }
window.androidPermalink = function() { window.androidPermalink = function() {
if(typeof android === 'undefined' || !android || !android.copy) if(typeof android === 'undefined' || !android || !android.intentPosLink)
return true; // i.e. execute other actions return true; // i.e. execute other actions
var center = map.getCenter(); var center = map.getCenter();
android.intentPosLink(center.lat, center.lng, map.getZoom(), "Intel Map", false); android.intentPosLink(center.lat, center.lng, map.getZoom(), "Selected map view", false);
return false; return false;
} }

4
mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java
View File

@ -116,15 +116,13 @@ public class ShareActivity extends FragmentActivity implements ActionBar.TabList
mZoom = intent.getIntExtra("zoom", 0); mZoom = intent.getIntExtra("zoom", 0);
mIsPortal = intent.getBooleanExtra("isPortal", false); mIsPortal = intent.getBooleanExtra("isPortal", false);
actionBar.setTitle(mTitle);
setupIntents(); setupIntents();
} else { } else {
mTitle = getString(R.string.app_name); mTitle = getString(R.string.app_name);
setupShareIntent(intent.getStringExtra("shareString")); setupShareIntent(intent.getStringExtra("shareString"));
} }
// show portal name as action bar title, if available
if (mTitle != getString(R.string.app_name)) actionBar.setTitle(mTitle);
mViewPager = (ViewPager) findViewById(R.id.pager); mViewPager = (ViewPager) findViewById(R.id.pager);
mViewPager.setAdapter(mFragmentAdapter); mViewPager.setAdapter(mFragmentAdapter);