X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=service%2Fnotification%2Fexamples%2Fandroid%2FNotiProviderExample%2Fapp%2Fsrc%2Fmain%2Fres%2Flayout%2Factivity_main.xml;h=036ab7f2574db864bc2f6d9befbef9ca725d3cef;hb=3c093548382bb2542c87a67e6e5fa32552c29cb3;hp=0d90f05039bf71242acbf1c947055dcf066693d9;hpb=ad968557d4c1f2f9fed3ec1c18abe9a5a664bd16;p=platform%2Fupstream%2Fiotivity.git

diff --git a/service/notification/examples/android/NotiProviderExample/app/src/main/res/layout/activity_main.xml b/service/notification/examples/android/NotiProviderExample/app/src/main/res/layout/activity_main.xml
old mode 100644
new mode 100755
index 0d90f05..036ab7f
--- a/service/notification/examples/android/NotiProviderExample/app/src/main/res/layout/activity_main.xml
+++ b/service/notification/examples/android/NotiProviderExample/app/src/main/res/layout/activity_main.xml
@@ -7,24 +7,39 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="com.sec.notificationexample.MainActivity">
+    tools:context=".MainActivity">
 
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fillViewport="true">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
+        android:paddingLeft="1dp"
+        android:paddingRight="1dp"
         android:orientation="vertical" >
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_alignParentBottom="true"
-            android:background="@android:color/darker_gray"/>
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="10dp">
+            android:layout_height="wrap_content"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            android:orientation="horizontal"
+            android:weightSum="1">
+
+            <Button
+                android:layout_height="wrap_content"
+                android:layout_width="150dp"
+                android:id="@+id/BtnStart"
+                android:text="START"/>
+
+            <Button
+                android:layout_height="wrap_content"
+                android:layout_width="150dp"
+                android:id="@+id/BtnStop"
+                android:text="STOP" />
         </LinearLayout>
 
         <LinearLayout
@@ -32,36 +47,101 @@
             android:layout_height="wrap_content"
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
-            android:orientation="horizontal" >
+            android:orientation="horizontal"
+            android:weightSum="1">
 
-            <Button
-                android:layout_gravity="center_vertical|center_horizontal"
-                android:layout_height="60dp"
+            <RadioGroup
+                android:id="@+id/RadioGroup"
                 android:layout_width="match_parent"
-                android:id="@+id/BtnStart"
-                android:text="START"/>
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:orientation='horizontal'>
+                    <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="ACCEPTOR: "
+                    android:id="@+id/textview"
+                    android:checked="false" />
+                    <RadioButton
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Provider"
+                        android:id="@+id/RadioProvider"
+                        android:checked="true" />
+
+                    <RadioButton
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Consumer"
+                        android:id="@+id/RadioConsumer"
+                        android:checked="false" />
+
+            </RadioGroup>
         </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            android:orientation="horizontal"
+            android:weightSum="1">
 
+            <Button
+                android:layout_height="wrap_content"
+                android:layout_width="100dp"
+                android:id="@+id/signup"
+                android:text="Sign Up"/>
+
+            <Button
+                android:layout_height="wrap_content"
+                android:layout_width="100dp"
+                android:id="@+id/signin"
+                android:text="Sign In" />
+            <Button
+                android:layout_height="wrap_content"
+                android:layout_width="100dp"
+                android:id="@+id/signout"
+                android:text="Sign Out" />
+        </LinearLayout>
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
-            android:orientation="horizontal" >
+            android:orientation="horizontal"
+            android:weightSum="1">
 
             <Button
+                android:layout_height="wrap_content"
+                android:layout_width="150dp"
+                android:id="@+id/remoteService"
+                android:text="Enable Remote Service"/>
 
+            <Button
                 android:layout_height="wrap_content"
                 android:layout_width="150dp"
-                android:id="@+id/BtnAccept"
-                android:text="ACCEPT"/>
+                android:id="@+id/subscribeMQService"
+                android:text="Subscribe MQ Service" />
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            android:orientation="horizontal"
+            android:weightSum="1">
 
             <Button
+                android:layout_height="wrap_content"
+                android:layout_width="150dp"
+                android:id="@+id/BtnRegister"
+                android:text="@string/btn_reg"/>
 
+            <Button
                 android:layout_height="wrap_content"
                 android:layout_width="150dp"
-                android:id="@+id/BtnSync"
-                android:text="SYNC"/>
+                android:id="@+id/BtnSet"
+                android:text="@string/btn_set" />
         </LinearLayout>
 
         <LinearLayout
@@ -83,7 +163,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:windowSoftInputMode="stateHidden"
-                android:hint="글자를 입력하세요" />
+                android:hint="Add Message Title" />
         </LinearLayout>
 
         <LinearLayout
@@ -106,65 +186,75 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:windowSoftInputMode="stateHidden"
-                android:hint="글자를 입력하세요" />
-        </LinearLayout>
-
-        <Button
-            android:layout_gravity="center_vertical|center_horizontal"
-            android:layout_height="60dp"
-            android:layout_width="match_parent"
-            android:id="@+id/BtnCreateNoti"
-            android:text="@string/btn_create_noti"
-            />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="10dp">
+                android:hint="Add Message Body" />
         </LinearLayout>
 
         <LinearLayout
+            android:id="@+id/Topic"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
             android:orientation="horizontal" >
 
-            <TextView
-                android:layout_gravity="center_vertical|center_horizontal"
-                android:layout_height="200dp"
+            <Button
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:id="@+id/BtnTopic"
+                android:text="@string/btn_topic"
+                android:onClick="selfDestruct" />
+
+            <EditText
+                android:id="@+id/EditTextTopic"
                 android:layout_width="match_parent"
-                android:scrollbars="vertical"
-                android:id="@+id/TvLog"
-                android:text="Log.."/>
+                android:layout_height="wrap_content"
+                android:windowSoftInputMode="stateHidden"
+                android:hint="OCF_TOPIC1 (1-4)" />
         </LinearLayout>
 
-        <LinearLayout
+        <Button
+            android:layout_gravity="center_vertical|center_horizontal"
+            android:layout_height="wrap_content"
             android:layout_width="match_parent"
+            android:id="@+id/BtnCreateNoti"
+            android:text="@string/btn_create_noti"
+            />
+        <Button
+            android:layout_gravity="center_vertical|center_horizontal"
             android:layout_height="wrap_content"
-            android:paddingLeft="5dp"
-            android:paddingRight="5dp"
-            android:orientation="horizontal" >
-
-            <Button
-                android:layout_gravity="center_vertical|center_horizontal"
-                android:layout_height="60dp"
-                android:layout_width="match_parent"
-                android:id="@+id/BtnStop"
-                android:text="STOP"/>
-        </LinearLayout>
-
-        <View
             android:layout_width="match_parent"
-            android:layout_height="1dp"
+            android:id="@+id/BtnLog"
+            android:text="@string/btn_log"
             android:layout_alignParentBottom="true"
-            android:background="@android:color/darker_gray"/>
-
+            android:layout_centerHorizontal="true" />
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="20dp">
+            android:layout_height="10dp">
         </LinearLayout>
 
-    </LinearLayout>
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fillViewport="true">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="250dp"
+                android:paddingLeft="5dp"
+                android:paddingRight="5dp"
+                android:orientation="horizontal" >
+
+                <TextView
+                    android:layout_gravity="center_vertical|center_horizontal"
+                    android:layout_height="1000dp"
+                    android:layout_width="match_parent"
+                    android:scrollbars="vertical"
+                    android:id="@+id/TvLog"
+                    android:text="Log.."/>
+            </LinearLayout>
 
+        </ScrollView>
 
+    </LinearLayout>
+    </ScrollView>
 </RelativeLayout>