DateTimePickerScreen.java in rhodes-5.5.0

- old
+ new

@@ -29,11 +29,11 @@
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 
-import com.rhomobile.rhodes.AndroidR;
+import com.rhomobile.rhodes.R;
 import com.rhomobile.rhodes.Logger;
 import com.rhomobile.rhodes.BaseActivity;
 import com.rhomobile.rhodes.RhodesService;
 
 import android.content.res.Configuration;
@@ -234,14 +234,14 @@
 			_max_Date.set(Calendar.MILLISECOND, 0);
 		}
 		
 		this.setTitle(_title);
 		
-		_datePicker = (DatePicker)findViewById(AndroidR.id.datePicker);
-		_timePicker = (TimePicker)findViewById(AndroidR.id.timePicker);
-		_okButton = (Button)findViewById(AndroidR.id.okButton);
-		_cancelButton = (Button)findViewById(AndroidR.id.cancelButton);
+		_datePicker = (DatePicker)findViewById(R.id.datePicker);
+		_timePicker = (TimePicker)findViewById(R.id.timePicker);
+		_okButton = (Button)findViewById(R.id.okButton);
+		_cancelButton = (Button)findViewById(R.id.cancelButton);
 		
 		_okButton.setOnClickListener(mOkListener);
 		_cancelButton.setOnClickListener(mCancelListener);
 		
 		_datePicker.init(_init.get(Calendar.YEAR), _init.get(Calendar.MONTH), _init.get(Calendar.DAY_OF_MONTH), new DatePicker.OnDateChangedListener() {
@@ -328,11 +328,10 @@
 	@Override
 	public void onCreate(Bundle icicle) {
 		super.onCreate(icicle);
 		Logger.D(TAG, "onCreate");
 		
-		getWindow().setFlags(RhodesService.WINDOW_FLAGS, RhodesService.WINDOW_MASK);
-		setContentView(AndroidR.layout.datetime);
+		setContentView(R.layout.datetime);
 		
 		Bundle extras = this.getIntent().getExtras();
 		
 		if (extras.containsKey(INTENT_EXTRA_PREFIX + "callback")) 
 			_callback = extras.getString(INTENT_EXTRA_PREFIX + "callback");