remove account in user_edit layout

Change-Id: Ia0dd75a1e5dd2dbb8f1aa3078d5ac2763cb0751d
Signed-off-by: Soohye Shin <soohye.shin@samsung.com>

diff --git a/edje/view/useredit.edc b/edje/view/useredit.edc
index 6732ece..20029f6 100644 (file)
--- a/edje/view/useredit.edc
+++ b/edje/view/useredit.edc
@@ -190,7 +190,7 @@ group {
                                        to, "contents";
                                        relative, 0.5 0.5;
                                }
-                               min, 1036 552;
+                               min, 1036 452;
                                fixed, 1 1;
                        }
                }
@@ -211,7 +211,7 @@ group {
                        scale, 1;
                        description {
                                state, "default" 0.0;
-                               min, 1036 552;
+                               min, 1036 452;
                                visible, 0;
                        }
                }
@@ -473,7 +473,7 @@ group {
                        }
                }
                part {
-                       name, "pad.account";
+                       name, "pad.lock";
                        type, RECT;
                        scale, 1;
                        description {
@@ -493,85 +493,6 @@ group {
                        }
                }
                part {
-                       name, "account";
-                       type, TEXT;
-                       scale, 1;
-                       description {
-                               state, "default" 0.0;
-                               rel1 {
-                                       to, "pad.account";
-                                       relative, 1.0 1.0;
-                               }
-                               rel2.to, "pad.account";
-                               min, 436 32;
-                               fixed, 1 1;
-                               align, 0.0 0.0;
-                               text {
-                                       font, "TizenSans";
-                                       size, 32;
-                                       text, "Account";
-                                       align, 0.0 0.5;
-                               }
-                               color, 77 77 77 255;
-                       }
-               }
-               part {
-                       name, "pad.account.down";
-                       type, RECT;
-                       scale, 1;
-                       description {
-                               state, "default" 0.0;
-                               rel1 {
-                                       to, "account";
-                                       relative, 0.0 1.0;
-                               }
-                               rel2 {
-                                       to, "account";
-                                       relative, 0.0 1.0;
-                               }
-                               min, 0 22;
-                               fixed, 1 1;
-                               align, 0.0 0.0;
-                               visible, 0;
-                       }
-               }
-               part {
-                       name, PART_USER_EDIT_CONTENTS_ACCOUNT;
-                       type, SWALLOW;
-                       scale, 1;
-                       description {
-                               state, "default" 0.0;
-                               rel1 {
-                                       to, "pad.account.down";
-                                       relative, 1.0 1.0;
-                               }
-                               rel2.to, "pad.account.down";
-                               min, 436 64;
-                               fixed, 1 1;
-                               align, 0.0 0.0;
-                       }
-               }
-               part {
-                       name, "pad.lock";
-                       type, RECT;
-                       scale, 1;
-                       description {
-                               state, "default" 0.0;
-                               rel1 {
-                                       to, PART_USER_EDIT_CONTENTS_ACCOUNT;
-                                       relative, 0.0 1.0;
-                               }
-                               rel2 {
-                                       to, PART_USER_EDIT_CONTENTS_ACCOUNT;
-                                       relative, 0.0 1.0;
-                               }
-                               min, 0 32;
-                               fixed, 1 1;
-                               align, 0.0 0.0;
-                               visible, 0;
-                       }
-               }
-               part {
                        name, "lock";
                        type, TEXT;
                        scale, 1;

diff --git a/include/defs.h b/include/defs.h
index f423324..e4f9f8a 100644 (file)
--- a/include/defs.h
+++ b/include/defs.h
@@ -70,7 +70,6 @@
 #define PART_USER_EDIT_CONTENTS_PHOTO "part.user.edit.contents.photo"
 #define PART_USER_EDIT_CONTENTS_NAME "part.user.edit.contents.name"
 #define PART_USER_EDIT_CONTENTS_PIN "part.user.edit.contents.pin"
-#define PART_USER_EDIT_CONTENTS_ACCOUNT "part.user.edit.contents.account"
 #define PART_USER_EDIT_CONTENTS_LOCK "part.user.edit.contents.lock"
 #define PART_USER_EDIT_CONTENTS_DELETE "part.user.edit.contents.delete"
 #define PART_USER_EDIT_PHOTO "part.user.edit.photo"

diff --git a/src/view/view_user_edit.c b/src/view/view_user_edit.c
index 28ae20d..fc80dfc 100644 (file)
--- a/src/view/view_user_edit.c
+++ b/src/view/view_user_edit.c
@@ -29,7 +29,6 @@
 #define MESSAGE_DELETE_CONTENTS "If you delete this user, their data will also be deleted."
 
 #define MESSAGE_ENTRY_NAME "User Name"
-#define MESSAGE_ENTRY_ACCOUNT "sample@tizen.com"
 #define MESSAGE_ENTRY_PIN "Pin code"
 #define KEY_ICON "icon"
 #define KEY_FOCUS_ICON "focusicon"
@@ -51,7 +50,6 @@ struct _priv {
        Evas_Object *ly;
        Evas_Object *photo;
        Evas_Object *name;
-       Evas_Object *account;
        Evas_Object *pin;
        Evas_Object *lock;
        Evas_Object *icon;
@@ -352,7 +350,7 @@ static input_handler lock_handler = {
 
 static Evas_Object *_add_layout(struct _priv *priv)
 {
-       Evas_Object *ly, *photo, *name, *pin, *account, *lock;
+       Evas_Object *ly, *photo, *name, *pin, *lock;
 
        ly = utils_add_layout(priv->base, GRP_USER_EDIT_CONTENTS, false,
                        PART_USER_EDIT_CONTENTS);
@@ -376,11 +374,6 @@ static Evas_Object *_add_layout(struct _priv *priv)
        if (!pin)
                goto err;
 
-       account = utils_add_entry(ly, MESSAGE_ENTRY_ACCOUNT, false,
-                       PART_USER_EDIT_CONTENTS_ACCOUNT);
-       if (!account)
-               goto err;
-
        lock = utils_add_layout(ly, GRP_USER_EDIT_SWITCH, true,
                        PART_USER_EDIT_CONTENTS_LOCK);
        if (!lock)
@@ -393,7 +386,6 @@ static Evas_Object *_add_layout(struct _priv *priv)
 
        priv->photo = photo;
        priv->name = name;
-       priv->account = account;
        priv->pin = pin;
 
        return ly;