|
@@ -60,16 +60,13 @@ public class PopupNewMemo extends WpadScreen {
|
|
|
|
|
|
Log.d(TAG, "월패드카메라 nWallPadCamUsage : " + nWallPadCamUsage);
|
|
Log.d(TAG, "월패드카메라 nWallPadCamUsage : " + nWallPadCamUsage);
|
|
|
|
|
|
- if (nWallPadCamUsage == WallpadDeviceSet.DEV_DATA_ENABLE) {
|
|
|
|
|
|
+ if (nWallPadCamUsage == WallpadDeviceSet.DEV_DATA_ENABLE && mModelType != Version.MODEL_TYPE.IHN_1010_I_2443) {
|
|
m_NewDrawing = new WpadImageView(context, TOUCH_KIND.BUTTON, 290, 80, R.drawable.btn_picture_normal3, R.drawable.btn_picture_pressed3, ID.NewMemoPopupID.button.NEW_DRAWING);
|
|
m_NewDrawing = new WpadImageView(context, TOUCH_KIND.BUTTON, 290, 80, R.drawable.btn_picture_normal3, R.drawable.btn_picture_pressed3, ID.NewMemoPopupID.button.NEW_DRAWING);
|
|
ViewRegistration(layout, m_NewDrawing, Common.PopupAlarmMarginLEFT(196), Common.PopupAlarmMarginTOP(585));
|
|
ViewRegistration(layout, m_NewDrawing, Common.PopupAlarmMarginLEFT(196), Common.PopupAlarmMarginTOP(585));
|
|
m_NewAudio = new WpadImageView(context, TOUCH_KIND.BUTTON, 290, 80, R.drawable.btn_voice_normal3, R.drawable.btn_voice_pressed3, ID.NewMemoPopupID.button.NEW_AUDIO);
|
|
m_NewAudio = new WpadImageView(context, TOUCH_KIND.BUTTON, 290, 80, R.drawable.btn_voice_normal3, R.drawable.btn_voice_pressed3, ID.NewMemoPopupID.button.NEW_AUDIO);
|
|
ViewRegistration(layout, m_NewAudio, Common.PopupAlarmMarginLEFT(495), Common.PopupAlarmMarginTOP(585));
|
|
ViewRegistration(layout, m_NewAudio, Common.PopupAlarmMarginLEFT(495), Common.PopupAlarmMarginTOP(585));
|
|
- if(mModelType != Version.MODEL_TYPE.IHN_1010_I_2443)
|
|
|
|
- {
|
|
|
|
- m_NewVideo = new WpadImageView(context, TOUCH_KIND.BUTTON, 290, 80, R.drawable.btn_video_normal3, R.drawable.btn_video_pressed3, ID.NewMemoPopupID.button.NEW_VIDEO);
|
|
|
|
- ViewRegistration(layout, m_NewVideo, Common.PopupAlarmMarginLEFT(794), Common.PopupAlarmMarginTOP(585));
|
|
|
|
- }
|
|
|
|
|
|
+ m_NewVideo = new WpadImageView(context, TOUCH_KIND.BUTTON, 290, 80, R.drawable.btn_video_normal3, R.drawable.btn_video_pressed3, ID.NewMemoPopupID.button.NEW_VIDEO);
|
|
|
|
+ ViewRegistration(layout, m_NewVideo, Common.PopupAlarmMarginLEFT(794), Common.PopupAlarmMarginTOP(585));
|
|
}
|
|
}
|
|
else {
|
|
else {
|
|
m_NewDrawing = new WpadImageView(context, TOUCH_KIND.BUTTON, 360, 80, R.drawable.btn_picture_normal2, R.drawable.btn_picture_pressed2, ID.NewMemoPopupID.button.NEW_DRAWING);
|
|
m_NewDrawing = new WpadImageView(context, TOUCH_KIND.BUTTON, 360, 80, R.drawable.btn_picture_normal2, R.drawable.btn_picture_pressed2, ID.NewMemoPopupID.button.NEW_DRAWING);
|