Commit 090c77e6 authored by mmk's avatar mmk
Browse files

version 1.7.1:

	1.解决升级包描述页字符串不能换行问题
parent ee74740e
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="android.rockchip.update.service"
android:versionCode="27"
android:versionName="1.7.0">
android:versionCode="28"
android:versionName="1.7.1">
<!-- Permission to show the UI for firmware update -->
<permission android:name="android.rockchip.update.permission.SHOW_UI"
......
......@@ -25,7 +25,7 @@
android:id="@+id/description"
android:textIsSelectable="true"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical|center_horizontal"
android:gravity="left"
android:textAppearance="?android:attr/textAppearanceMedium">
</TextView>
</LinearLayout>
......
......@@ -9,6 +9,7 @@ import android.content.Intent;
import android.content.ServiceConnection;
import android.os.Bundle;
import android.os.IBinder;
import android.util.Log;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
......@@ -74,8 +75,11 @@ public class OtaUpdateNotifyActivity extends Activity {
}
TextView descriptView = (TextView)this.findViewById(R.id.description);
descriptView.setMinLines(5);
descriptView.setMaxLines(20);
if(mDescription != null) {
descriptView.setText(mDescription);
descriptView.setText(mDescription.replace("@#", "\n"));
Log.d(TAG, "description: " + mDescription);
}
Button btn_ok = (Button)this.findViewById(R.id.button_ok);
......
......@@ -35,7 +35,7 @@ import android.widget.Toast;
import android.os.SystemProperties;
public class RKUpdateService extends Service {
public static final String VERSION = "1.7.0";
public static final String VERSION = "1.7.1";
private static final String TAG = "RKUpdateService";
private static final boolean DEBUG = true;
private static final boolean mIsNotifyDialog = true;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment