Skip to content

Commit 7ad3d34

Browse files
xiegeoxiegeo
committed
update target api to latest, and change menu button to bottom right
1 parent ed20ad4 commit 7ad3d34

File tree

4 files changed

+60
-41
lines changed

4 files changed

+60
-41
lines changed

‎.settings/org.eclipse.jdt.core.prefs

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
eclipse.preferences.version=1
2+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
3+
org.eclipse.jdt.core.compiler.compliance=1.6
4+
org.eclipse.jdt.core.compiler.source=1.6

‎AndroidManifest.xml

+54-38
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,64 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.xiegeo.cssr"
4-
android:versionCode="7"
5-
android:versionName="1.1.1">
6-
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="15"/>
7-
3+
package="com.xiegeo.cssr"
4+
android:versionCode="8"
5+
android:versionName="1.1.2" >
6+
7+
<uses-sdk
8+
android:minSdkVersion="8"
9+
android:targetSdkVersion="19" />
10+
811
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
9-
10-
<uses-permission android:name="android.permission.CAMERA" />
11-
<uses-feature android:name="android.hardware.camera" android:required="false"/>
12-
13-
<application android:icon="@drawable/ic_launcher" android:label="@string/app_name"
14-
>
15-
<activity android:name=".MainActivity"
16-
android:screenOrientation="landscape"
17-
android:label="@string/app_name"
18-
android:configChanges="orientation"
19-
android:launchMode="singleTask">
20-
<!-- android:theme="@style/Theme.NoBackground" -->
12+
<uses-permission android:name="android.permission.CAMERA" />
13+
14+
<uses-feature
15+
android:name="android.hardware.camera"
16+
android:required="false" />
17+
18+
<application
19+
android:allowBackup="true"
20+
android:icon="@drawable/ic_launcher"
21+
android:label="@string/app_name" >
22+
<activity
23+
android:name=".MainActivity"
24+
android:configChanges="orientation"
25+
android:label="@string/app_name"
26+
android:launchMode="singleTask"
27+
android:screenOrientation="landscape" >
28+
29+
<!-- android:theme="@style/Theme.NoBackground" -->
2130
<intent-filter>
2231
<action android:name="android.intent.action.MAIN" />
32+
2333
<category android:name="android.intent.category.LAUNCHER" />
24-
2534
</intent-filter>
26-
2735
</activity>
28-
<activity android:name="Preferences"
29-
></activity>
30-
<activity android:name="HelpActivity"
31-
></activity>
32-
<activity android:name="ImageGridActivity"
33-
></activity>
34-
<activity android:name="GroupsActivity"
35-
></activity>
36-
<activity android:name="ListOfLibrarysActivity"
37-
android:label="@string/app_name">
38-
<intent-filter>
39-
<action android:name="android.intent.action.VIEW" />
40-
<category android:name="android.intent.category.DEFAULT" />
41-
<category android:name="android.intent.category.BROWSABLE" />
42-
<data android:scheme="file" android:mimeType="*/*" android:host="*" android:pathPattern=".*\\.cssl" />
43-
</intent-filter>
44-
45-
</activity>
46-
<activity android:name="com.xiegeo.cssr.FileListActivity"></activity>
36+
<activity android:name="Preferences" >
37+
</activity>
38+
<activity android:name="HelpActivity" >
39+
</activity>
40+
<activity android:name="ImageGridActivity" >
41+
</activity>
42+
<activity android:name="GroupsActivity" >
43+
</activity>
44+
<activity
45+
android:name="ListOfLibrarysActivity"
46+
android:label="@string/app_name" >
47+
<intent-filter>
48+
<action android:name="android.intent.action.VIEW" />
49+
50+
<category android:name="android.intent.category.DEFAULT" />
51+
<category android:name="android.intent.category.BROWSABLE" />
52+
53+
<data
54+
android:host="*"
55+
android:mimeType="*/*"
56+
android:pathPattern=".*\\.cssl"
57+
android:scheme="file" />
58+
</intent-filter>
59+
</activity>
60+
<activity android:name="com.xiegeo.cssr.FileListActivity" >
61+
</activity>
4762
</application>
63+
4864
</manifest>

‎project.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
# project structure.
99

1010
# Project target.
11-
target=android-16
11+
target=android-19
1212
proguard.config=proguard.cfg

‎src/com/xiegeo/cssr/MainActivity.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ public void onCreate(Bundle savedInstanceState) {
6868
mLayout = new RelativeLayout(this);
6969
mLayout.setKeepScreenOn(true);
7070

71-
72-
7371
mCallback=new CameraCallback(this){
7472
public boolean onTouchEvent (MotionEvent event) {
7573
if(event.getAction() == MotionEvent.ACTION_DOWN) {
@@ -150,6 +148,7 @@ public void onClick(View v) {
150148
});
151149
params = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
152150
params.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM );
151+
params.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
153152
mLayout.addView(mInforButton,params);
154153

155154

0 commit comments

Comments
 (0)