- Fix a bug where the client wouldn't update the uptime at the server - Languages updatesmaster
bovenliggende
5b2431be5f
commit
11b7e2e339
@ -1,31 +1,41 @@ |
||||
<?xml version="1.0" encoding="utf-8"?> |
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" |
||||
package="org.r3pek.droiduptime" |
||||
android:versionCode="8" android:versionName="1.3.2"> |
||||
<application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="false"> |
||||
package="org.r3pek.droiduptime" android:versionCode="8" |
||||
android:versionName="1.3.2"> |
||||
<application android:icon="@drawable/icon" android:label="@string/app_name" |
||||
android:debuggable="false"> |
||||
|
||||
|
||||
<service android:name="DroidUptimeService"></service> |
||||
<receiver android:name="DroidUptimeServiceManager"> |
||||
<intent-filter> |
||||
<action android:name="android.intent.action.BOOT_COMPLETED"></action> |
||||
</intent-filter> |
||||
</receiver> |
||||
<activity android:name="Main" android:label="@string/app_name"><intent-filter><action android:name="android.intent.action.MAIN"></action> |
||||
<category android:name="android.intent.category.LAUNCHER"></category> |
||||
</intent-filter> |
||||
</activity> |
||||
<meta-data android:value="a14bad01161834d" android:name="ADMOB_PUBLISHER_ID" /> |
||||
<activity android:name="MyPreferences"></activity> |
||||
</application> |
||||
<uses-sdk android:minSdkVersion="3"/> |
||||
<service android:name="DroidUptimeService"></service> |
||||
<receiver android:name="DroidUptimeServiceManager"> |
||||
<intent-filter> |
||||
<action android:name="android.intent.action.BOOT_COMPLETED"></action> |
||||
</intent-filter> |
||||
</receiver> |
||||
<activity android:name="Main" android:label="@string/app_name"> |
||||
<intent-filter> |
||||
<action android:name="android.intent.action.MAIN"></action> |
||||
<category android:name="android.intent.category.LAUNCHER"></category> |
||||
</intent-filter> |
||||
</activity> |
||||
<meta-data android:value="a14bad01161834d" android:name="ADMOB_PUBLISHER_ID" /> |
||||
<activity android:name="MyPreferences"></activity> |
||||
</application> |
||||
<uses-sdk android:minSdkVersion="3" /> |
||||
|
||||
<supports-screens android:resizeable="true" android:largeScreens="true" android:anyDensity="false" android:normalScreens="true" android:smallScreens="true"></supports-screens> |
||||
<supports-screens android:resizeable="true" |
||||
android:largeScreens="true" android:anyDensity="false" |
||||
android:normalScreens="true" android:smallScreens="true"></supports-screens> |
||||
|
||||
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"></uses-permission><uses-permission android:name="android.permission.ACCESS_WIFI_STATE"></uses-permission> |
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"></uses-permission> |
||||
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"></uses-permission> |
||||
|
||||
<uses-permission android:name="android.permission.INTERNET"></uses-permission> |
||||
<uses-permission android:name="android.permission.INTERNET"></uses-permission> |
||||
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission> |
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission> |
||||
<permission android:name="org.r3pek.droiduptime.permission.FORCE_UPDATE" |
||||
android:protectionLevel="normal" android:label="@string/perm_allow_update_label" |
||||
android:description="@string/perm_allow_update_desc"></permission> |
||||
<uses-permission android:name="org.r3pek.droiduptime.permission.FORCE_UPDATE"></uses-permission> |
||||
</manifest> |
@ -1,38 +1,83 @@ |
||||
<?xml version="1.0" encoding="utf-8"?> |
||||
<ScrollView |
||||
xmlns:android="http://schemas.android.com/apk/res/android" |
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" |
||||
xmlns:myapp="http://schemas.android.com/apk/res/org.r3pek.droiduptime" |
||||
android:id="@+id/ScrollView01" |
||||
android:layout_width="fill_parent" |
||||
android:layout_height="fill_parent"> |
||||
<LinearLayout |
||||
android:orientation="vertical" |
||||
android:layout_width="fill_parent" |
||||
android:layout_height="fill_parent"> |
||||
android:layout_width="fill_parent" android:layout_height="fill_parent"> |
||||
<ScrollView android:id="@+id/ScrollView01" |
||||
android:layout_width="fill_parent" android:layout_height="fill_parent"> |
||||
<LinearLayout android:orientation="vertical" |
||||
android:layout_width="fill_parent" android:layout_height="fill_parent"> |
||||
|
||||
|
||||
|
||||
<com.admob.android.ads.AdView android:layout_gravity="bottom" android:id="@+id/ad" android:layout_width="fill_parent" android:layout_alignParentBottom="true" myapp:backgroundColor="#000000" myapp:primaryTextColor="#FFFFFF" myapp:secondaryTextColor="#CCCCCC" android:layout_height="wrap_content" /> |
||||
<ImageView android:id="@+id/ImageView01" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/droiduptime" android:layout_gravity="center_horizontal" android:layout_marginTop="20dip"></ImageView> |
||||
<ImageView android:id="@+id/ImageView01" |
||||
android:layout_width="wrap_content" android:layout_height="wrap_content" |
||||
android:src="@drawable/droiduptime" android:layout_gravity="center_horizontal" |
||||
android:layout_marginTop="20dip"></ImageView> |
||||
|
||||
<TableLayout android:id="@+id/TableLayout01" |
||||
android:layout_height="wrap_content" android:layout_width="fill_parent" |
||||
android:stretchColumns="1" android:paddingTop="20dip"> |
||||
<TableRow android:id="@+id/TableRow01" |
||||
android:layout_width="wrap_content" android:layout_height="wrap_content"> |
||||
<LinearLayout android:id="@+id/LinearLayout01" |
||||
android:layout_height="wrap_content" android:orientation="horizontal" |
||||
android:layout_width="fill_parent"> |
||||
<TextView android:id="@+id/TextView01" |
||||
android:layout_width="wrap_content" android:layout_height="wrap_content" |
||||
android:textStyle="bold" android:layout_marginTop="15dip" |
||||
android:text="@string/servicestatus"></TextView> |
||||
<TextView android:layout_width="wrap_content" |
||||
android:layout_height="wrap_content" android:layout_marginLeft="20dip" |
||||
android:id="@+id/tvStatus" android:layout_marginTop="15dip"></TextView> |
||||
</LinearLayout> |
||||
<Button android:layout_width="wrap_content" |
||||
android:layout_height="wrap_content" android:id="@+id/btnStartStopService" |
||||
android:layout_gravity="right"></Button> |
||||
</TableRow> |
||||
</TableLayout> |
||||
|
||||
<TableLayout android:id="@+id/TableLayout01" android:layout_height="wrap_content" android:layout_width="fill_parent" android:stretchColumns="1" android:paddingTop="20dip"> |
||||
<TableRow android:id="@+id/TableRow01" android:layout_width="wrap_content" android:layout_height="wrap_content"> |
||||
<LinearLayout android:id="@+id/LinearLayout01" android:layout_height="wrap_content" android:orientation="horizontal" android:layout_width="fill_parent"> |
||||
<TextView android:id="@+id/TextView01" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textStyle="bold" android:layout_marginTop="15dip" android:text="@string/servicestatus"></TextView> |
||||
<TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="20dip" android:id="@+id/tvStatus" android:layout_marginTop="15dip"></TextView> |
||||
</LinearLayout> |
||||
<Button android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/btnStartStopService" android:layout_gravity="right"></Button> |
||||
</TableRow> |
||||
</TableLayout> |
||||
|
||||
<LinearLayout android:id="@+id/LinearLayout02" |
||||
android:layout_width="wrap_content" android:layout_height="wrap_content" |
||||
android:orientation="horizontal" android:paddingTop="10dip"> |
||||
<TextView android:id="@+id/TextView02" |
||||
android:layout_width="wrap_content" android:layout_height="wrap_content" |
||||
android:textStyle="bold" android:text="@string/uptime"></TextView> |
||||
<TextView android:layout_width="wrap_content" |
||||
android:layout_height="wrap_content" android:layout_marginLeft="20dip" |
||||
android:id="@+id/tvUptime"></TextView> |
||||
</LinearLayout> |
||||
|
||||
<LinearLayout android:id="@+id/LinearLayout02" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" android:paddingTop="10dip"><TextView android:id="@+id/TextView02" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textStyle="bold" android:text="@string/uptime"></TextView> |
||||
<TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="20dip" android:id="@+id/tvUptime"></TextView> |
||||
</LinearLayout> |
||||
<LinearLayout android:id="@+id/LinearLayout05" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" android:layout_marginTop="15dip"><TextView android:id="@+id/TextView06" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textStyle="bold" android:text="@string/lastupdate"></TextView> |
||||
<TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="20dip" android:id="@+id/tvLastUpdate"></TextView> |
||||
</LinearLayout><TextView android:id="@+id/TextView03" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="15dip" android:linksClickable="true" android:autoLink="web" android:text="@string/message"></TextView> |
||||
<TableLayout android:id="@+id/TableLayout02" |
||||
android:layout_height="wrap_content" android:layout_width="fill_parent" |
||||
android:stretchColumns="1" android:paddingTop="20dip"> |
||||
<TableRow android:id="@+id/TableRow02" |
||||
android:layout_width="wrap_content" android:layout_height="wrap_content"> |
||||
<LinearLayout android:id="@+id/LinearLayout05" |
||||
android:layout_width="wrap_content" android:layout_height="wrap_content" |
||||
android:orientation="horizontal" android:layout_marginTop="15dip"> |
||||
<TextView android:id="@+id/TextView06" |
||||
android:layout_width="wrap_content" android:layout_height="wrap_content" |
||||
android:textStyle="bold" android:text="@string/lastupdate"></TextView> |
||||
<TextView android:layout_width="wrap_content" |
||||
android:layout_height="wrap_content" android:layout_marginLeft="20dip" |
||||
android:id="@+id/tvLastUpdate"></TextView> |
||||
</LinearLayout> |
||||
<Button android:layout_width="wrap_content" |
||||
android:layout_height="wrap_content" android:id="@+id/btnUpdate" |
||||
android:text="@string/update" android:layout_gravity="right"></Button> |
||||
</TableRow> |
||||
</TableLayout> |
||||
<TextView android:id="@+id/TextView03" android:layout_width="wrap_content" |
||||
android:layout_height="wrap_content" android:layout_marginTop="15dip" |
||||
android:linksClickable="true" android:autoLink="web" android:text="@string/message"></TextView> |
||||
|
||||
|
||||
</LinearLayout> |
||||
</ScrollView> |
||||
</LinearLayout> |
||||
</ScrollView> |
||||
<com.admob.android.ads.AdView |
||||
android:layout_gravity="bottom" android:id="@+id/ad" |
||||
android:layout_width="fill_parent" android:layout_alignParentBottom="true" |
||||
myapp:backgroundColor="#000000" myapp:primaryTextColor="#FFFFFF" |
||||
myapp:secondaryTextColor="#CCCCCC" android:layout_height="wrap_content" /> |
||||
</RelativeLayout> |
Laden…
Reference in new issue