Fixed shadow in search, Fixed NPE in ResourceManager
This commit is contained in:
parent
c9c2d491ba
commit
7b8a3a76fa
6 changed files with 6 additions and 8 deletions
|
@ -9,7 +9,7 @@
|
||||||
<!-- uncomment it to allow different screen supports (large/small)-->
|
<!-- uncomment it to allow different screen supports (large/small)-->
|
||||||
<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="4"/>
|
<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="4"/>
|
||||||
|
|
||||||
<application android:icon="@drawable/icon" android:label="@string/app_name"
|
<application android:icon="@drawable/icon" android:label="@string/app_name" android:theme="@style/OsmandTheme"
|
||||||
android:debuggable="true" android:name="net.osmand.plus.activities.OsmandApplication" android:description="@string/app_description"
|
android:debuggable="true" android:name="net.osmand.plus.activities.OsmandApplication" android:description="@string/app_description"
|
||||||
android:backupAgent="net.osmand.plus.OsmandBackupAgent" android:restoreAnyVersion="true">
|
android:backupAgent="net.osmand.plus.OsmandBackupAgent" android:restoreAnyVersion="true">
|
||||||
<activity android:name="net.osmand.plus.activities.MainMenuActivity"
|
<activity android:name="net.osmand.plus.activities.MainMenuActivity"
|
||||||
|
|
|
@ -33,10 +33,9 @@
|
||||||
android:id="@android:id/tabs"
|
android:id="@android:id/tabs"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
<FrameLayout
|
<FrameLayout
|
||||||
android:id="@android:id/tabcontent"
|
android:id="@android:id/tabcontent"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="fill_parent" />
|
||||||
/>
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</TabHost>
|
</TabHost>
|
|
@ -51,7 +51,7 @@
|
||||||
<style name="WhiteText">
|
<style name="WhiteText">
|
||||||
<item name="android:textColor">@color/activity_text</item>
|
<item name="android:textColor">@color/activity_text</item>
|
||||||
</style>
|
</style>
|
||||||
<style name="NiceActivity" parent="android:Theme">
|
<style name="OsmandTheme" parent="android:style/Theme">
|
||||||
<item name="android:windowContentOverlay">@null</item>
|
<item name="android:windowContentOverlay">@null</item>
|
||||||
</style>
|
</style>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -802,7 +802,7 @@ public class ResourceManager {
|
||||||
|
|
||||||
public Map<String, String> getBackupIndexes(Map<String, String> map) {
|
public Map<String, String> getBackupIndexes(Map<String, String> map) {
|
||||||
File file = context.getSettings().extendOsmandPath(BACKUP_PATH);
|
File file = context.getSettings().extendOsmandPath(BACKUP_PATH);
|
||||||
if (file != null) {
|
if (file != null && file.isDirectory()) {
|
||||||
for (File f : file.listFiles()) {
|
for (File f : file.listFiles()) {
|
||||||
if (f != null && f.getName().endsWith(IndexConstants.BINARY_MAP_INDEX_EXT)) {
|
if (f != null && f.getName().endsWith(IndexConstants.BINARY_MAP_INDEX_EXT)) {
|
||||||
map.put(f.getName(), MessageFormat.format("{0,date,dd.MM.yyyy}", new Date(f.lastModified()))); //$NON-NLS-1$
|
map.put(f.getName(), MessageFormat.format("{0,date,dd.MM.yyyy}", new Date(f.lastModified()))); //$NON-NLS-1$
|
||||||
|
|
|
@ -350,7 +350,7 @@ public class MapActivityLayers {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
Builder b = new AlertDialog.Builder(activity);
|
Builder b = new AlertDialog.Builder(activity);
|
||||||
ListView list = new ListView(activity, null, R.style.NiceActivity);
|
ListView list = new ListView(activity);
|
||||||
// list.setBackgroundColor(R.color.color_white);
|
// list.setBackgroundColor(R.color.color_white);
|
||||||
b.setView(list);
|
b.setView(list);
|
||||||
final List<String> layerNames = new ArrayList<String>();
|
final List<String> layerNames = new ArrayList<String>();
|
||||||
|
|
|
@ -84,7 +84,6 @@ public class SearchActivity extends TabActivity {
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
requestWindowFeature(Window.FEATURE_NO_TITLE);
|
requestWindowFeature(Window.FEATURE_NO_TITLE);
|
||||||
setTheme(R.style.NiceActivity);
|
|
||||||
setContentView(R.layout.search_main);
|
setContentView(R.layout.search_main);
|
||||||
|
|
||||||
Button backButton = (Button) findViewById(R.id.search_back_button);
|
Button backButton = (Button) findViewById(R.id.search_back_button);
|
||||||
|
|
Loading…
Reference in a new issue