Fix for TREL-220:No way to confirm pin code input in SIM PIN Lock screensubmit/tizen_2.1/20130424.223536accepted/tizen_2.1/20130425.022730

2 files changed, 119 insertions, 24 deletions

diff --git a/res/edje/pwlock-lock-ui.edc b/res/edje/pwlock-lock-ui.edc
index df7b641..03457ca 100644
--- a/res/edje/pwlock-lock-ui.edc
+++ b/res/edje/pwlock-lock-ui.edc
@@ -5,7 +5,7 @@ group {
 	    name: "background";
 	    type: RECT;
 	    mouse_events: 1;
-	    scale: 0;
+	    scale: 1;
 	    description {
 		state: "default" 0.0;
 		rel1 { relative: 0.0 0.0; }
@@ -16,7 +16,7 @@ group {
 
 	part { name: "toolbar_bg";
 		type: RECT;
-	        scale: 0;
+	        scale: 1;
 	        description { state: "default" 0.0;
 			min: 0 92;
 			max: 999999 92;
@@ -41,7 +41,7 @@ group {
 
 	part { name: "toolbar_button_padding";
 		type: RECT;
-		scale : 0;
+		scale : 1;
 		description { state: "default" 0.0;
 			min: 15 0;
 			max: 15 9999;
@@ -53,6 +53,34 @@ group {
 		}
 	}
 
+	part { name: "toolbar_button_padding2";
+		type: RECT;
+		scale : 1;
+		description { state: "default" 0.0;
+			min: 15 0;
+			max: 15 9999;
+			fixed : 1 0;
+			visible: 0;
+			align: 0.32 0.5;
+			rel1.to: "toolbar_btns_area";
+			rel2.to: "toolbar_btns_area";
+		}
+	}
+
+	part { name: "toolbar_button_padding3";
+		type: RECT;
+		scale : 1;
+		description { state: "default" 0.0;
+			min: 15 0;
+			max: 15 9999;
+			fixed : 1 0;
+			visible: 0;
+			align: 0.67 0.5;
+			rel1.to: "toolbar_btns_area";
+			rel2.to: "toolbar_btns_area";
+		}
+	}
+
 	part { name: "toolbar_clip";
 		type: RECT;
 		mouse_events: 0;
@@ -65,7 +93,7 @@ group {
 	part {
 		name: "button.select.emergency";
 		type: SWALLOW;
-		scale: 0;
+		scale: 1;
 		clip_to: "toolbar_clip";
 
 		description {
@@ -84,7 +112,7 @@ group {
 	part {
 		name: "button.select.done";
 		type: SWALLOW;
-		scale: 0;
+		scale: 1;
 		clip_to: "toolbar_clip";
 
 		description {
@@ -96,7 +124,67 @@ group {
 				relative: 1.0 0.0;
 				to: "toolbar_button_padding";
 			}
-			rel2.to: "toolbar_btns_area"; 
+			rel2.to: "toolbar_btns_area";
+		}
+	}
+
+	part {
+		name: "button.select.emergency2";
+		type: SWALLOW;
+		scale: 1;
+		clip_to: "toolbar_clip";
+
+		description {
+			state: "default" 0.0;
+			align: 1.0 0.5;
+			fixed: 1 1;
+
+			rel1.to: "toolbar_btns_area";
+			rel2 {
+				relative: 0.0 1.0;
+				to: "toolbar_button_padding2";
+			}
+		}
+	}
+
+	part {
+		name: "button.select.done2";
+		type: SWALLOW;
+		scale: 1;
+		clip_to: "toolbar_clip";
+
+		description {
+			state: "default" 0.0;
+			align: 0.0 0.5;
+			fixed: 1 1;
+
+			rel1 {
+				relative: 1.0 0.0;
+				to: "toolbar_button_padding2";
+			}
+			rel2 {
+				relative : 0.0 1.0;
+				to: "toolbar_button_padding3";
+			}
+		}
+	}
+
+	part {
+		name: "button.select.skip";
+		type: SWALLOW;
+		scale: 1;
+		clip_to: "toolbar_clip";
+
+		description {
+			state: "default" 0.0;
+			align: 0.0 0.5;
+			fixed: 1 1;
+
+			rel1 {
+				relative: 1.0 0.0;
+				to: "toolbar_button_padding3";
+			}
+			rel2.to: "toolbar_btns_area";
 		}
 	}
 
@@ -104,10 +192,10 @@ group {
 	    name: "swl/genlist";
 	    type: SWALLOW;
 	    mouse_events: 1;
-	    scale: 0;
+	    scale: 1;
 	    description {
 		state: "default" 0.0;
-		rel1 { relative: 0.0 0.0;  to: "background"; }
+		rel1 { relative: 0.0 1.0;  to: "toolbar_bg"; }
 		rel2 { relative: 1.0 1.0;  to: "background"; }
 		color: 0 0 0 0;
 	    }
diff --git a/src/ui.c b/src/ui.c
index f58e58a..60f7507 100755
--- a/src/ui.c
+++ b/src/ui.c
@@ -525,27 +525,27 @@ static void _dial_cb(void *data, Evas_Object * obj, void *e)
 	_DBG("%s,%d", __func__, __LINE__);
 	struct appdata *ad = data;
 
-	/* apply button insensitive  */
-	elm_object_disabled_set(ad->elm_button_dial, EINA_TRUE);
-	_imf_context_input_panel_hide(ad);
-
-	ad->previous_ui_type = ad->ui_type;
-
-	if(ad->layout_entry) {
-	    elm_entry_input_panel_enabled_set(_editfield_entry_get(ad->layout_entry),
-				     EINA_FALSE);
+	if (!ad) {
+		return;
 	}
 
-	if(ad->layout_second_entry) {
-	    elm_entry_input_panel_enabled_set(_editfield_entry_get(ad->layout_second_entry),
-				     EINA_FALSE);
-	}
+	service_h service;
+	service_create(&service);
 
-	if (show_dialer(ad) == 0) {
-		elm_object_disabled_set(ad->elm_button_dial, EINA_FALSE);
-		ad->ui_type = ad->previous_ui_type;
+	if (!service) {
 		return;
 	}
+
+	set_win_prop(ad, ECORE_X_WINDOW_TYPE_NORMAL);
+
+// To-Do : In here, we have to set an appropriate parameter for emergency call mode. 
+//         However, current ref. dialer app control does not support emergency mode,
+//         so, we have to wait till dialer app control support emergency call mode.
+
+	service_set_operation(service,SERVICE_OPERATION_DIAL);
+	service_send_launch_request(service, NULL, NULL);
+
+	service_destroy(service);
 }
 
 static void _pp_rsp_ok_cb(void *data, Evas_Object * e, void *ei)
@@ -909,6 +909,7 @@ void load_main(struct appdata *ad, int ui_type)
 
 	_DBG("load_main ad->ui_type = %d", ad->ui_type);
 
+#if 0	// This code is temporarily disabled since  dialer app control does not provide emergency call mode
 	bt_dial = elm_button_add(ad->elm_navigation_frame);
 	//elm_object_style_set(bt_dial, "naviframe/title/default");
 	evas_object_size_hint_weight_set(bt_dial, EVAS_HINT_EXPAND,
@@ -919,6 +920,7 @@ void load_main(struct appdata *ad, int ui_type)
 	evas_object_smart_callback_add(bt_dial, "clicked", _dial_cb, ad);
 	ad->elm_button_dial = bt_dial;
 	evas_object_show(bt_dial);
+#endif
 
 	bt_done = elm_button_add(ad->elm_navigation_frame);
 	//elm_object_style_set(bt_done, "naviframe/title/default");
@@ -933,10 +935,13 @@ void load_main(struct appdata *ad, int ui_type)
 
 	elm_object_disabled_set(bt_done, EINA_TRUE);
 
+	elm_naviframe_item_pop(ad->elm_navigation_frame);
 	elm_naviframe_item_push(ad->elm_navigation_frame, _get_header(ui_type), NULL,
 			NULL, ad->layout_contents, NULL);
 
+#if 0	// This code is temporarily disabled since  dialer app control does not provide emergency call mode
 	elm_object_part_content_set(ad->layout_contents, "button.select.emergency", bt_dial);
+#endif
 	elm_object_part_content_set(ad->layout_contents, "button.select.done", bt_done);
 
 	ad->ui_type = ui_type;
@@ -1689,6 +1694,7 @@ int show_finish(struct appdata *ad) {
 	return 1;
 }
 
+#if 0
 int show_dialer(struct appdata *ad)
 {
 	_DBG("%s,%d", __func__, __LINE__);
@@ -1727,6 +1733,7 @@ int show_dialer(struct appdata *ad)
 	evas_object_show(ad->win);
 	return 1;
 }
+#endif
 
 void show_popup(struct appdata *ad, const char *mesg, Eina_Bool mode)
 {