From 2663ee014cf347cb2722c7d5de9f350c73d68db8 Mon Sep 17 00:00:00 2001 From: inosh-perera Date: Tue, 20 Jan 2015 13:49:33 +0530 Subject: [PATCH] xml element name changes of UI --- .../modules/agents/android/client/bin/R.txt | 43 ++++++++++--------- .../res/layout/activity_authentication.xml | 6 +-- .../client/res/layout/activity_settings.xml | 10 ++--- 3 files changed, 30 insertions(+), 29 deletions(-) diff --git a/product/modules/agents/android/client/bin/R.txt b/product/modules/agents/android/client/bin/R.txt index 6e3120ce0f2..9ba843835b9 100644 --- a/product/modules/agents/android/client/bin/R.txt +++ b/product/modules/agents/android/client/bin/R.txt @@ -276,7 +276,7 @@ int drawable repeat_bg 0x7f020087 int drawable top_bar 0x7f020088 int drawable wifi 0x7f020089 int drawable wipe 0x7f02008a -int id TextView01 0x7f060090 +int id TextView01 0x7f060091 int id abs__action_bar 0x7f06004e int id abs__action_bar_container 0x7f06004d int id abs__action_bar_subtitle 0x7f06003d @@ -317,42 +317,45 @@ int id abs__textButton 0x7f06003f int id abs__title 0x7f060047 int id abs__titleDivider 0x7f060048 int id abs__up 0x7f06000b -int id action_settings 0x7f060094 +int id action_settings 0x7f060095 int id background_container 0x7f06001f int id blocks_now 0x7f06001e int id blocks_ruler 0x7f06001d int id btnEnroll 0x7f060082 -int id btnLogin 0x7f06008f +int id btnLogin 0x7f060090 int id btnOK 0x7f060064 int id btnRefresh 0x7f06007d int id btnRegister 0x7f060070 int id btnReset 0x7f06007e int id btnSetPin 0x7f060087 +int id btnStartRegistration 0x7f06008b int id btnTryAgain 0x7f060073 int id btnUnreg 0x7f060065 int id btnUnregister 0x7f060088 -int id button_layout 0x7f06008c -int id debug_log 0x7f06009a -int id dialogButtonCancel 0x7f06008e -int id dialogButtonOK 0x7f06008d +int id button_layout 0x7f06008d +int id debug_log 0x7f06009b +int id dialogButtonCancel 0x7f06008f +int id dialogButtonOK 0x7f06008e int id dialog_discard_confirm 0x7f06001a int id dialog_moderator 0x7f06001b int id dialog_wave 0x7f06001c int id disableHome 0x7f060009 -int id editText2 0x7f06006c int id edit_query 0x7f060053 int id enrollPanel 0x7f060081 int id error 0x7f060072 -int id etServerIP 0x7f06008a +int id etDomain 0x7f06006a +int id etPassword 0x7f06006c +int id etUsername 0x7f06006b +int id evServerIP 0x7f06008a int id footer 0x7f060071 int id footerlogo 0x7f060068 int id fragment_container 0x7f060034 int id gridview 0x7f060014 int id homeAsUp 0x7f060006 int id incompatibleError 0x7f060074 -int id info 0x7f060097 -int id info_setting 0x7f060098 -int id ip_setting 0x7f060096 +int id info 0x7f060098 +int id info_setting 0x7f060099 +int id ip_setting 0x7f060097 int id layout_topbar 0x7f060067 int id lblPin 0x7f060084 int id linInner 0x7f060062 @@ -361,25 +364,24 @@ int id linearLayoutText 0x7f060080 int id listMode 0x7f060002 int id listview 0x7f060060 int id logo 0x7f06005f -int id more 0x7f060095 +int id more 0x7f060096 int id normal 0x7f060001 -int id notify 0x7f060091 +int id notify 0x7f060092 int id option_button 0x7f06007c -int id pin_setting 0x7f060099 +int id pin_setting 0x7f06009a int id preference_brand_view 0x7f06002d int id preference_empty_view 0x7f06002c int id radioBYOD 0x7f06006e int id radioCOPE 0x7f06006f int id radioGroupType 0x7f06006d -int id rowImage 0x7f060092 -int id rowTextView 0x7f060093 +int id rowImage 0x7f060093 +int id rowTextView 0x7f060094 int id scroller 0x7f060061 int id setting_invite_email_button 0x7f060030 int id setting_invite_email_edittext 0x7f06002f int id setting_invite_email_imageview 0x7f060031 int id setting_invite_email_layout 0x7f06002e int id setting_invite_email_textview 0x7f060032 -int id severAddressLabel 0x7f060089 int id sg_button1 0x7f060039 int id sg_button2 0x7f06003a int id sg_button3 0x7f06003b @@ -407,14 +409,14 @@ int id swipeable_bottom 0x7f060010 int id swipeable_container 0x7f060012 int id swipeable_top 0x7f060011 int id tabMode 0x7f060003 -int id text 0x7f06008b +int id text 0x7f06008c int id title_bar_layout 0x7f060020 int id title_container 0x7f060016 int id title_logo 0x7f060017 int id title_option 0x7f060019 int id title_text 0x7f060018 +int id tvSeverAddress 0x7f060089 int id txtDevice 0x7f060076 -int id txtDomain 0x7f06006a int id txtId 0x7f060075 int id txtLog 0x7f06007f int id txtMessage 0x7f060063 @@ -428,7 +430,6 @@ int id txtRoot 0x7f06007b int id txtSDK 0x7f060079 int id useLogo 0x7f060004 int id user_edit_location 0x7f060033 -int id username 0x7f06006b int id webview 0x7f060015 int id wrap_content 0x7f060000 int integer abs__max_action_buttons 0x7f0a0000 diff --git a/product/modules/agents/android/client/res/layout/activity_authentication.xml b/product/modules/agents/android/client/res/layout/activity_authentication.xml index f27509b5a7b..cd459ddba41 100644 --- a/product/modules/agents/android/client/res/layout/activity_authentication.xml +++ b/product/modules/agents/android/client/res/layout/activity_authentication.xml @@ -27,7 +27,7 @@ android:layout_height="wrap_content" android:layout_margin="5dp" android:singleLine="true" - android:id="@+id/txtDomain" + android:id="@+id/etDomain" android:hint="Domain" android:textColor="@android:color/black" android:inputType="text" /> @@ -37,7 +37,7 @@ android:layout_height="wrap_content" android:layout_margin="5dp" android:singleLine="true" - android:id="@+id/username" + android:id="@+id/etUsername" android:hint="Username" android:textColor="@android:color/black" android:inputType="textEmailAddress" /> @@ -47,7 +47,7 @@ -