Skip to content

Commit 5b951a0

Browse files
worker8worker8
committed
Merge branch 'release/general-code-improvements-fix-2'
2 parents 960c485 + ff2e6f1 commit 5b951a0

File tree

4 files changed

+20
-26
lines changed

4 files changed

+20
-26
lines changed

‎app/src/androidTest/java/tourguide/tourguidedemo/SequenceOverlayCMTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Created by tanjunrong on 8/6/15.
1111
*/
1212
public class SequenceOverlayCMTest extends ActivityInstrumentationTestCase2<SequenceOverlayCMTestActivity> {
13-
final String CLASS_NAME = SequenceOverlayCMTest.this.getClass().getSimpleName();
13+
final String TAG = SequenceOverlayCMTest.this.getClass().getSimpleName();
1414
SequenceOverlayCMTestActivity mActivity;
1515

1616
public SequenceOverlayCMTest() {
@@ -19,7 +19,7 @@ public SequenceOverlayCMTest() {
1919
@Override @UiThreadTest
2020
protected void setUp() throws Exception {
2121
super.setUp();
22-
Log.d(CLASS_NAME, CLASS_NAME + " started");
22+
Log.d(TAG, TAG + " started");
2323
mActivity = getActivity();
2424
}
2525

‎app/src/androidTest/java/tourguide/tourguidedemo/SequenceTest.java

+16-16
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class SequenceTest extends ActivityInstrumentationTestCase2<SequenceTestA
1717
SequenceTestActivity mActivity;
1818
FrameLayoutWithHole mOverlay;
1919
Button button,button2, button3;
20-
final String CLASS_NAME = SequenceTest.this.getClass().getSimpleName();
20+
final String TAG = SequenceTest.this.getClass().getSimpleName();
2121

2222
public SequenceTest() {
2323
super(SequenceTestActivity.class);
@@ -26,7 +26,7 @@ public SequenceTest() {
2626
@Override
2727
protected void setUp() throws Exception {
2828
super.setUp();
29-
Log.d(CLASS_NAME, CLASS_NAME + " started");
29+
Log.d(TAG, TAG + " started");
3030

3131
// Starts the activity under test using the default Intent with:
3232
// action = {@link Intent#ACTION_MAIN}
@@ -63,7 +63,7 @@ public void testTheSequence(){
6363
assertEquals(mActivity.mSequence.mCurrentSequence, size); //to check if it reaches to the end of tourguide
6464
}
6565
catch (InterruptedException e){
66-
66+
Log.d(TAG, "InterruptedException occur in testTheSequence");
6767
}
6868
}
6969

@@ -80,7 +80,7 @@ public void testTourGuideSettings(){
8080

8181
//overlay continue method
8282
if (SequenceTestActivity.CHOSEN_CONTINUE_METHOD == SequenceTestActivity.OVERLAY_METHOD) {
83-
Log.d(CLASS_NAME, "Method: Overlay");
83+
Log.d(TAG, "Method: Overlay");
8484
assertEquals(mActivity.mSequence.getContinueMethod(), Sequence.ContinueMethod.Overlay);
8585

8686
TourGuide[] tourGuides = mActivity.mSequence.getTourGuideArray();
@@ -96,7 +96,7 @@ public void testTourGuideSettings(){
9696
}
9797
//overlay listener continue method
9898
else if (SequenceTestActivity.CHOSEN_CONTINUE_METHOD == SequenceTestActivity.OVERLAY_LISTENER_METHOD) {
99-
Log.d(CLASS_NAME, "Method: Overlay Listener");
99+
Log.d(TAG, "Method: Overlay Listener");
100100
assertEquals(mActivity.mSequence.getContinueMethod(), Sequence.ContinueMethod.OverlayListener);
101101

102102
TourGuide[] tourGuides = mActivity.mSequence.getTourGuideArray();
@@ -120,29 +120,29 @@ else if (SequenceTestActivity.CHOSEN_CONTINUE_METHOD == SequenceTestActivity.OVE
120120
private void runOverlayTest(TourGuide[] tourGuides, int ActualSequence){
121121
//check the priority of the overlay
122122
if (mActivity.mTutorialHandler.mOverlay!=null && tourGuides[ActualSequence].mOverlay!=null){
123-
Log.d(CLASS_NAME, "Overlay, Sequence "+ActualSequence+ " Set Individual Overlay");
123+
Log.d(TAG, "Overlay, Sequence "+ActualSequence+ " Set Individual Overlay");
124124
assertEquals(mActivity.mTutorialHandler.mOverlay, tourGuides[ActualSequence].mOverlay);
125125
}
126126
else if (mActivity.mTutorialHandler.mOverlay!=null && tourGuides[ActualSequence].mOverlay==null){
127-
Log.d(CLASS_NAME, "Overlay, Sequence "+ActualSequence+ " Set default Overlay");
127+
Log.d(TAG, "Overlay, Sequence "+ActualSequence+ " Set default Overlay");
128128
assertEquals(mActivity.mTutorialHandler.mOverlay, mActivity.mSequence.getDefaultOverlay());
129129
}
130130

131131
// //check priority of overlay's listener
132132
// if (mActivity.mTourGuideHandler.mOverlay!=null && mActivity.mTourGuideHandler.mOverlay.mOnClickListener!=null
133133
// && tourGuides[ActualSequence].mOverlay!=null && tourGuides[ActualSequence].mOverlay.mOnClickListener!=null){
134-
// Log.d(CLASS_NAME, "Overlay, Sequence "+ActualSequence+" Set Individual Listener");
134+
// Log.d(TAG, "Overlay, Sequence "+ActualSequence+" Set Individual Listener");
135135
// assertEquals(mActivity.mSequence.getOverlayListener(), tourGuides[ActualSequence].mOverlay.mOnClickListener);
136136
// }
137137
// else if (mActivity.mTourGuideHandler.mOverlay!=null && mActivity.mTourGuideHandler.mOverlay.mOnClickListener!=null
138138
// && tourGuides[ActualSequence].mOverlay!=null && tourGuides[ActualSequence].mOverlay.mOnClickListener==null){
139-
// Log.d(CLASS_NAME, "Overlay, Sequence "+ActualSequence+" Set default Listener");
139+
// Log.d(TAG, "Overlay, Sequence "+ActualSequence+" Set default Listener");
140140
// assertEquals(mActivity.mSequence.getOverlayListener(), mActivity.mSequence.getDefaultOverlay().mOnClickListener);
141141
// }
142142
//
143143
// else if (mActivity.mTourGuideHandler.mOverlay!=null && mActivity.mTourGuideHandler.mOverlay.mOnClickListener!=null
144144
// && tourGuides[ActualSequence].mOverlay==null){
145-
// Log.d(CLASS_NAME, "Overlay, Sequence "+ActualSequence+" Set default Listener");
145+
// Log.d(TAG, "Overlay, Sequence "+ActualSequence+" Set default Listener");
146146
// assertEquals(mActivity.mSequence.getOverlayListener(), mActivity.mSequence.getDefaultOverlay().mOnClickListener);
147147
// }
148148
}
@@ -158,22 +158,22 @@ private static void runOverlayListenerTest(TourGuide[] tourGuides, int ActualSeq
158158
//
159159
// //check the priority of the overlay
160160
// if (tourGuides[ActualSequence].mOverlay!=null){
161-
// Log.d(CLASS_NAME, "Overlay Listener, Sequence "+ActualSequence+" Set Individual Overlay");
162-
// assertEquals(mActivity.mTourGuideHandler.mOverlay, tourGuides[ActualSequence].mOverlay);
161+
// Log.d(TAG, "Overlay Listener, Sequence "+ActualSequence+" Set Individual Overlay");
162+
// assertEquals(mActivity.mTutorialHandler.mOverlay, tourGuides[ActualSequence].mOverlay);
163163
// }
164164
// else if (tourGuides[ActualSequence].mOverlay==null){
165-
// Log.d(CLASS_NAME, "Overlay Listener, Sequence "+ActualSequence+" Set default Overlay");
166-
// assertEquals(mActivity.mTourGuideHandler.mOverlay, mActivity.mSequence.getDefaultOverlay());
165+
// Log.d(TAG, "Overlay Listener, Sequence "+ActualSequence+" Set default Overlay");
166+
// assertEquals(mActivity.mTutorialHandler.mOverlay, mActivity.mSequence.getDefaultOverlay());
167167
// }
168168
//
169169
// //check overlay's listener: if default overlay listener is null, the overlay must not null.
170170
// if (mActivity.mSequence.getDefaultOverlay().mOnClickListener==null){
171-
// Log.d(CLASS_NAME, "Overlay Listener, Sequence "+ActualSequence+" Overlay's listener is not empty");
171+
// Log.d(TAG, "Overlay Listener, Sequence "+ActualSequence+" Overlay's listener is not empty");
172172
// assertNotNull(tourGuides[ActualSequence].mOverlay.mOnClickListener);
173173
// }
174174
//
175175
// else{
176-
// Log.d(CLASS_NAME, "Overlay Listener, Sequence "+ActualSequence+" Overlay's listener is set to default listener");
176+
// Log.d(TAG, "Overlay Listener, Sequence "+ActualSequence+" Overlay's listener is set to default listener");
177177
// assertEquals(mActivity.mSequence.getOverlayListener(), mActivity.mSequence.getDefaultOverlay().mOnClickListener);
178178
// }
179179

‎tourguide/src/main/java/tourguide/tourguide/FrameLayoutWithHole.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ protected void onDetachedFromWindow() {
171171
mEraserCanvas.setBitmap(null);
172172
mEraserBitmap = null;
173173

174-
if (mAnimatorSetArrayList != null && mAnimatorSetArrayList.size() > 0){
174+
if (mAnimatorSetArrayList != null && !mAnimatorSetArrayList.isEmpty()){
175175
for(int i=0;i<mAnimatorSetArrayList.size();i++){
176176
mAnimatorSetArrayList.get(i).end();
177177
mAnimatorSetArrayList.get(i).removeAllListeners();

‎tourguide/src/main/java/tourguide/tourguide/TourGuide.java

+1-7
Original file line numberDiff line numberDiff line change
@@ -508,13 +508,7 @@ public void onAnimationEnd(Animator animator) {
508508
/* these animatorSets are kept track in FrameLayout, so that they can be cleaned up when FrameLayout is detached from window */
509509
mFrameLayout.addAnimatorSet(animatorSet);
510510
mFrameLayout.addAnimatorSet(animatorSet2);
511-
} else if (mTechnique != null && mTechnique == Technique.HorizontalRight){
512-
513-
} else if (mTechnique != null && mTechnique == Technique.VerticalUpward){
514-
515-
} else if (mTechnique != null && mTechnique == Technique.VerticalDownward){
516-
517-
} else { // do click for default case
511+
} else { // do click for default case
518512
final AnimatorSet animatorSet = new AnimatorSet();
519513
final AnimatorSet animatorSet2 = new AnimatorSet();
520514
Animator.AnimatorListener lis1 = new Animator.AnimatorListener() {

0 commit comments

Comments
 (0)