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

Merge branch 'intents' of git://github.com/fkloft/ingress-intel-total-conversion into fkloft-intents

Browse Source 
Conflicts:
	mobile/res/values/strings.xml
This commit is contained in:
Philipp Schaefer
2013-07-27 11:23:51 +02:00
parent c4b289f564 fa4d4c64f7
commit ab164cfde5
24 changed files with 547 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/res/values/dimens.xml
View File

@ -8,4 +8,6 @@
<dimen name="app_minimumsize_w">400dip</dimen>
<dimen name="app_minimumsize_h">200dip</dimen>
<dimen name="icon_margin">8dp</dimen>
</resources>

10
mobile/res/values/strings.xml
View File

@ -61,8 +61,14 @@
<string name="menu_faction">Faction</string>
<string name="menu_info">Info</string>
<string name="menu_debug">Debug</string>
<string name="menu_search">Search</string>
<string name="choose_account_to_login">Choose account to login</string>
<string name="login_failed">Login failed.</string>
<string name="search_hint">Search Locations</string>
<string name="menu_search">Search</string>
</resources>
<string name="intent_error">Address could not be opened</string>
<string name="msg_copied">Copied to clipboard…</string>
<string name="tab_map">Map</string>
<string name="tab_share">Share</string>
<string name="tab_browser">Browser</string>
</resources>