diff options
5 files changed, 62 insertions, 42 deletions
diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/AndroidManifest.xml b/tensorflow/contrib/lite/java/demo/app/src/main/AndroidManifest.xml index ba63dce5d9..95b6b7016f 100644 --- a/tensorflow/contrib/lite/java/demo/app/src/main/AndroidManifest.xml +++ b/tensorflow/contrib/lite/java/demo/app/src/main/AndroidManifest.xml @@ -31,6 +31,7 @@ android:theme="@style/MaterialTheme"> <activity android:name="com.example.android.tflitecamerademo.CameraActivity" + android:screenOrientation="portrait" android:label="@string/app_name"> <intent-filter> <action android:name="android.intent.action.MAIN" /> diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/res/layout-v26/fragment_camera2_basic.xml b/tensorflow/contrib/lite/java/demo/app/src/main/res/layout-v26/fragment_camera2_basic.xml index 72a229ecdb..ddb099a950 100644 --- a/tensorflow/contrib/lite/java/demo/app/src/main/res/layout-v26/fragment_camera2_basic.xml +++ b/tensorflow/contrib/lite/java/demo/app/src/main/res/layout-v26/fragment_camera2_basic.xml @@ -28,7 +28,7 @@ <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentBottom="true" + android:layout_above="@+id/bottom_info_view" android:layout_alignParentEnd="false" android:layout_alignParentStart="true" android:layout_alignParentTop="false" @@ -57,32 +57,39 @@ android:textStyle="bold" /> </LinearLayout> + <LinearLayout + android:orientation="horizontal" + android:background="#513400" + android:layout_alignParentBottom="true" - <RelativeLayout - android:id="@+id/control2" android:layout_width="match_parent" - android:layout_height="135dp" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:layout_alignTop="@+id/control" - android:layout_marginLeft="300dp" - android:layout_marginStart="300dp" - android:background="#bb7700"> - + android:id="@+id/bottom_info_view" + android:layout_marginBottom="10dp" + android:layout_height="50dp"> + <TextView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:textColor="@android:color/white" + android:textAlignment="center" + android:gravity="center" + android:text="Threads:"/> + <NumberPicker + android:id="@+id/np" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="10dp" + android:theme="@style/AppTheme.Picker" + android:visibility="visible" /> <ToggleButton android:id="@+id/button" android:textOff="@string/tflite" android:textOn="@string/nnapi" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" /> + android:layout_marginLeft="10dp" + android:background="#0000000f" + android:textColor="@android:color/white" /> + </LinearLayout> + - <NumberPicker - android:id="@+id/np" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@+id/button" - android:visibility="visible" /> - </RelativeLayout> </RelativeLayout> diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/res/layout/fragment_camera2_basic.xml b/tensorflow/contrib/lite/java/demo/app/src/main/res/layout/fragment_camera2_basic.xml index 72a229ecdb..e567009a42 100644 --- a/tensorflow/contrib/lite/java/demo/app/src/main/res/layout/fragment_camera2_basic.xml +++ b/tensorflow/contrib/lite/java/demo/app/src/main/res/layout/fragment_camera2_basic.xml @@ -28,7 +28,7 @@ <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentBottom="true" + android:layout_above="@+id/bottom_info_view" android:layout_alignParentEnd="false" android:layout_alignParentStart="true" android:layout_alignParentTop="false" @@ -57,32 +57,38 @@ android:textStyle="bold" /> </LinearLayout> + <LinearLayout + android:orientation="horizontal" + android:background="#aa7700" + android:layout_alignParentBottom="true" - <RelativeLayout - android:id="@+id/control2" android:layout_width="match_parent" - android:layout_height="135dp" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:layout_alignTop="@+id/control" - android:layout_marginLeft="300dp" - android:layout_marginStart="300dp" - android:background="#bb7700"> - + android:id="@+id/bottom_info_view" + android:layout_marginBottom="10dp" + android:layout_height="50dp"> + <TextView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:textColor="@android:color/white" + android:textAlignment="center" + android:gravity="center" + android:text="@string/threads" /> + <NumberPicker + android:id="@+id/np" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="10dp" + android:theme="@style/AppTheme.Picker" + android:visibility="visible" /> <ToggleButton android:id="@+id/button" android:textOff="@string/tflite" android:textOn="@string/nnapi" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" /> + android:layout_marginLeft="10dp" + android:background="#0000000f" + android:textColor="@android:color/white" /> - <NumberPicker - android:id="@+id/np" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@+id/button" - android:visibility="visible" /> - </RelativeLayout> + </LinearLayout> </RelativeLayout> diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/res/values/base-strings.xml b/tensorflow/contrib/lite/java/demo/app/src/main/res/values/base-strings.xml index 0a71dbd0e8..7af8f3a98c 100644 --- a/tensorflow/contrib/lite/java/demo/app/src/main/res/values/base-strings.xml +++ b/tensorflow/contrib/lite/java/demo/app/src/main/res/values/base-strings.xml @@ -16,7 +16,7 @@ --> <resources> - <string name="app_name">TfLiteCameraDemo</string> + <string name="app_name">TfLite Camera Demo</string> <string name="intro_message"> <![CDATA[ @@ -27,4 +27,5 @@ ]]> </string> + <string name="threads">Threads:</string> </resources> diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/res/values/styles.xml b/tensorflow/contrib/lite/java/demo/app/src/main/res/values/styles.xml index 3f3bdfb494..1752b3b5f9 100644 --- a/tensorflow/contrib/lite/java/demo/app/src/main/res/values/styles.xml +++ b/tensorflow/contrib/lite/java/demo/app/src/main/res/values/styles.xml @@ -14,5 +14,10 @@ limitations under the License. --> <resources> - <style name="MaterialTheme" parent="android:Theme.Material.Light.NoActionBar.Fullscreen" /> + <style name="MaterialTheme" parent="android:Theme.Material.Light.NoActionBar.Fullscreen" /> + <style name="AppTheme.Picker" parent="android:Theme.Material.Light.NoActionBar.Fullscreen" > + <item name="android:textColorPrimary">@android:color/white</item> + +</style> + </resources> |