summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYunjin Lee <yunjin-.lee@samsung.com>2018-06-19 18:05:27 +0900
committerYunjin Lee <yunjin-.lee@samsung.com>2018-06-19 18:05:27 +0900
commit10d1f284b8d304a9d0c0ff0f32ede88bbf0a071a (patch)
treeda494b116db82542de4658dea210b9b3a82b258f
parent984113f5db4b86c23c9ad88e8c18fb11072f1dc2 (diff)
downloadprivacy-setting-10d1f284b8d304a9d0c0ff0f32ede88bbf0a071a.tar.gz
privacy-setting-10d1f284b8d304a9d0c0ff0f32ede88bbf0a071a.tar.bz2
privacy-setting-10d1f284b8d304a9d0c0ff0f32ede88bbf0a071a.zip
Remove unused extra data and update button image file
Change-Id: I2281c989ac8a893a50e7d2783a0c2bf1f2452452 Signed-off-by: Yunjin Lee <yunjin-.lee@samsung.com>
-rw-r--r--res/button/tw_ic_popup_btn_check.pngbin1392 -> 1450 bytes
-rw-r--r--res/button/tw_ic_popup_btn_delete.pngbin1184 -> 1362 bytes
-rwxr-xr-xui-popup/popup_guide.md8
-rw-r--r--ui-popup/src/app_main.c10
4 files changed, 3 insertions, 15 deletions
diff --git a/res/button/tw_ic_popup_btn_check.png b/res/button/tw_ic_popup_btn_check.png
index f20f62e..085687e 100644
--- a/res/button/tw_ic_popup_btn_check.png
+++ b/res/button/tw_ic_popup_btn_check.png
Binary files differ
diff --git a/res/button/tw_ic_popup_btn_delete.png b/res/button/tw_ic_popup_btn_delete.png
index 5f346cb..a978d8f 100644
--- a/res/button/tw_ic_popup_btn_delete.png
+++ b/res/button/tw_ic_popup_btn_delete.png
Binary files differ
diff --git a/ui-popup/popup_guide.md b/ui-popup/popup_guide.md
index 43ce4be..efc324f 100755
--- a/ui-popup/popup_guide.md
+++ b/ui-popup/popup_guide.md
@@ -4,7 +4,7 @@ Added common popup as app-control operation hence it can be used at Native/Web/C
### Popup UX
-<img src="guide-popup.png">
+<img src="guide-popup.jpg" width="703">
### App-Control Operation
@@ -16,7 +16,7 @@ Operation | APP_CONTROL_OPERATION_PRIVACY_SETTING_GUIDE
Since | tizen 5.0
Definition | Shows guide popup to privacy settings.
Value | "http://tizen.org/appcontrol/operation/guide_privacy_setting"
-Input | APP_CONTROL_DATA_TYPE<br> APP_CONTROL_DATA_NAME<br> APP_CONTROL_DATA_FEATURE<br> APP_CONTROL_DATA_PRIVILEGES
+Input | APP_CONTROL_DATA_TYPE<br> APP_CONTROL_DATA_FEATURE<br> APP_CONTROL_DATA_PRIVILEGES
Output | APP_CONTROL_DATA_SELECTED
<br><br>
@@ -28,7 +28,6 @@ Output | APP_CONTROL_DATA_SELECTED
Key | Value | Description | Mandatory
----|-------|-------------|----------|
APP_CONTROL_DATA_TYPE | "open" or "use" | Guide popup type | Yes
-APP_CONTROL_DATA_NAME | text string | Application name to show | Yes
APP_CONTROL_DATA_FEATURE | text string | Feature or function name to show | No
APP_CONTROL_DATA_PRIVILEGES | array of text string | Required privacy privileges to show | Yes
@@ -69,7 +68,7 @@ static void launch_privacy_guide_popup(app_data_s *ad) {
int priv_num = 2;
char* privileges[priv_num] = {
"http://tizen.org/privilege/location",
- "http://tizen.org/privilege/location.coarse" }
+ "http://tizen.org/privilege/location.coarse" };
app_control_h app_control;
app_control_create(&app_control);
@@ -79,7 +78,6 @@ static void launch_privacy_guide_popup(app_data_s *ad) {
/* Set extra data to display */
app_control_add_extra_data(app_control, APP_CONTROL_DATA_TYPE, "use");
- app_control_add_extra_data(app_control, APP_CONTROL_DATA_NAME, "Maps");
app_control_add_extra_data(app_control, APP_CONTROL_DATA_FEATURE, "time line");
app_control_add_extra_data_array(app_control, APP_CONTROL_DATA_PRIVILEGES, privileges, priv_num);
diff --git a/ui-popup/src/app_main.c b/ui-popup/src/app_main.c
index 9175ce1..39c19e9 100644
--- a/ui-popup/src/app_main.c
+++ b/ui-popup/src/app_main.c
@@ -139,16 +139,6 @@ static void app_control(app_control_h app_control, void *data)
ui_app_exit();
}
- ret = app_control_get_extra_data(app_control, APP_CONTROL_DATA_NAME, &(ad->app_name));
- if (ret != APP_CONTROL_ERROR_NONE) {
- if (ret == APP_CONTROL_ERROR_KEY_NOT_FOUND)
- LOGE("App name to display should be given by using key type APP_CONTROL_DATA_NAME");
- else
- LOGE("app_control_get_extra_data() for APP_CONTROL_DATA_NAME failed. ret = %d", ret);
- __send_error_reply(ad->caller);
- ui_app_exit();
- }
-
ret = app_control_get_extra_data(app_control, APP_CONTROL_DATA_FEATURE, &(ad->feature));
if (ret != APP_CONTROL_ERROR_KEY_NOT_FOUND && ret != APP_CONTROL_ERROR_NONE) {
LOGE("app_control_get_extra_data() for APP_CONTROL_DATA_FEATURE failed. ret = %d", ret);