Skip to content

Commit 473fc5c

Browse files
author
yltwust
committed
Merge pull request #84 from AppCanOpenSource/develop
3.2.2
2 parents 8ff3992 + afd0a3d commit 473fc5c

File tree

163 files changed

+25889
-25109
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

163 files changed

+25889
-25109
lines changed

‎Engine/assets/widget/uexWidget.html‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@
3838
function cbStartApp(info){
3939
alert("cbStartApp:" + info);
4040
}
41+
function moveToBack(){
42+
uexWidget.moveToBack();
43+
}
4144
</script>
4245
</head>
4346

@@ -51,7 +54,7 @@
5154

5255
<input class='btn' type='button' value='startApp' onclick='startApp()'>
5356

54-
57+
<input class='btn' type='button' value='moveToBack' onclick='moveToBack()'>
5558
</div>
5659
</div>
5760
</body>

‎Engine/res/values-en/strings.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
<string name="error_no_permisson_RW">no permission read</string>
3939
<string name="error_no_permisson_INTERNET">no permission write</string>
4040
<string name="cancel_select_all">Cancel select all</string>
41-
<string name="mam_host"></string>
4241
<string name="platform_myspace_loading">Loading...</string>
4342
<string name="platform_myspace_my_apps">My apps</string>
4443
<string name="platform_myspace_pull_to_refresh">Pull to refresh</string>
@@ -69,7 +68,6 @@
6968
<string name="load_uex_object_error">load uex object failed,please check your xml file</string>
7069
<string name="login_failed">login failed</string>
7170
<string name="more">more</string>
72-
<string name="mam_push_host_and_port" translatable="false"></string>
7371
<string name="no_permission_to_open_window">no permission to open window named %1$1</string>
7472
<string name="not_any_widget">the app has no widget</string>
7573
<string name="operation_cancel">operation has canceled</string>

‎Engine/src/com/slidingmenu/lib/CanvasTransformerBuilder.java‎

Lines changed: 76 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -7,89 +7,90 @@
77

88
public class CanvasTransformerBuilder {
99

10-
private CanvasTransformer mTrans;
10+
private CanvasTransformer mTrans;
1111

12-
private static Interpolator lin = new Interpolator() {
13-
public float getInterpolation(float t) {
14-
return t;
15-
}
16-
};
12+
private static Interpolator lin = new Interpolator() {
13+
public float getInterpolation(float t) {
14+
return t;
15+
}
16+
};
1717

18-
private void initTransformer() {
19-
if (mTrans == null)
20-
mTrans = new CanvasTransformer() {
21-
public void transformCanvas(Canvas canvas, float percentOpen) { }
22-
};
23-
}
18+
private void initTransformer() {
19+
if (mTrans == null)
20+
mTrans = new CanvasTransformer() {
21+
public void transformCanvas(Canvas canvas, float percentOpen) {
22+
}
23+
};
24+
}
2425

25-
public CanvasTransformer zoom(final int openedX, final int closedX,
26-
final int openedY, final int closedY,
27-
final int px, final int py) {
28-
return zoom(openedX, closedX, openedY, closedY, px, py, lin);
29-
}
26+
public CanvasTransformer zoom(final int openedX, final int closedX,
27+
final int openedY, final int closedY,
28+
final int px, final int py) {
29+
return zoom(openedX, closedX, openedY, closedY, px, py, lin);
30+
}
3031

31-
public CanvasTransformer zoom(final int openedX, final int closedX,
32-
final int openedY, final int closedY,
33-
final int px, final int py, final Interpolator interp) {
34-
initTransformer();
35-
mTrans = new CanvasTransformer() {
36-
public void transformCanvas(Canvas canvas, float percentOpen) {
37-
mTrans.transformCanvas(canvas, percentOpen);
38-
float f = interp.getInterpolation(percentOpen);
39-
canvas.scale((openedX - closedX) * f + closedX,
40-
(openedY - closedY) * f + closedY, px, py);
41-
}
42-
};
43-
return mTrans;
44-
}
32+
public CanvasTransformer zoom(final int openedX, final int closedX,
33+
final int openedY, final int closedY,
34+
final int px, final int py, final Interpolator interp) {
35+
initTransformer();
36+
mTrans = new CanvasTransformer() {
37+
public void transformCanvas(Canvas canvas, float percentOpen) {
38+
mTrans.transformCanvas(canvas, percentOpen);
39+
float f = interp.getInterpolation(percentOpen);
40+
canvas.scale((openedX - closedX) * f + closedX,
41+
(openedY - closedY) * f + closedY, px, py);
42+
}
43+
};
44+
return mTrans;
45+
}
4546

46-
public CanvasTransformer rotate(final int openedDeg, final int closedDeg,
47-
final int px, final int py) {
48-
return rotate(openedDeg, closedDeg, px, py, lin);
49-
}
47+
public CanvasTransformer rotate(final int openedDeg, final int closedDeg,
48+
final int px, final int py) {
49+
return rotate(openedDeg, closedDeg, px, py, lin);
50+
}
5051

51-
public CanvasTransformer rotate(final int openedDeg, final int closedDeg,
52-
final int px, final int py, final Interpolator interp) {
53-
initTransformer();
54-
mTrans = new CanvasTransformer() {
55-
public void transformCanvas(Canvas canvas, float percentOpen) {
56-
mTrans.transformCanvas(canvas, percentOpen);
57-
float f = interp.getInterpolation(percentOpen);
58-
canvas.rotate((openedDeg - closedDeg) * f + closedDeg,
59-
px, py);
60-
}
61-
};
62-
return mTrans;
63-
}
52+
public CanvasTransformer rotate(final int openedDeg, final int closedDeg,
53+
final int px, final int py, final Interpolator interp) {
54+
initTransformer();
55+
mTrans = new CanvasTransformer() {
56+
public void transformCanvas(Canvas canvas, float percentOpen) {
57+
mTrans.transformCanvas(canvas, percentOpen);
58+
float f = interp.getInterpolation(percentOpen);
59+
canvas.rotate((openedDeg - closedDeg) * f + closedDeg,
60+
px, py);
61+
}
62+
};
63+
return mTrans;
64+
}
6465

65-
public CanvasTransformer translate(final int openedX, final int closedX,
66-
final int openedY, final int closedY) {
67-
return translate(openedX, closedX, openedY, closedY, lin);
68-
}
66+
public CanvasTransformer translate(final int openedX, final int closedX,
67+
final int openedY, final int closedY) {
68+
return translate(openedX, closedX, openedY, closedY, lin);
69+
}
6970

70-
public CanvasTransformer translate(final int openedX, final int closedX,
71-
final int openedY, final int closedY, final Interpolator interp) {
72-
initTransformer();
73-
mTrans = new CanvasTransformer() {
74-
public void transformCanvas(Canvas canvas, float percentOpen) {
75-
mTrans.transformCanvas(canvas, percentOpen);
76-
float f = interp.getInterpolation(percentOpen);
77-
canvas.translate((openedX - closedX) * f + closedX,
78-
(openedY - closedY) * f + closedY);
79-
}
80-
};
81-
return mTrans;
82-
}
71+
public CanvasTransformer translate(final int openedX, final int closedX,
72+
final int openedY, final int closedY, final Interpolator interp) {
73+
initTransformer();
74+
mTrans = new CanvasTransformer() {
75+
public void transformCanvas(Canvas canvas, float percentOpen) {
76+
mTrans.transformCanvas(canvas, percentOpen);
77+
float f = interp.getInterpolation(percentOpen);
78+
canvas.translate((openedX - closedX) * f + closedX,
79+
(openedY - closedY) * f + closedY);
80+
}
81+
};
82+
return mTrans;
83+
}
8384

84-
public CanvasTransformer concatTransformer(final CanvasTransformer t) {
85-
initTransformer();
86-
mTrans = new CanvasTransformer() {
87-
public void transformCanvas(Canvas canvas, float percentOpen) {
88-
mTrans.transformCanvas(canvas, percentOpen);
89-
t.transformCanvas(canvas, percentOpen);
90-
}
91-
};
92-
return mTrans;
93-
}
85+
public CanvasTransformer concatTransformer(final CanvasTransformer t) {
86+
initTransformer();
87+
mTrans = new CanvasTransformer() {
88+
public void transformCanvas(Canvas canvas, float percentOpen) {
89+
mTrans.transformCanvas(canvas, percentOpen);
90+
t.transformCanvas(canvas, percentOpen);
91+
}
92+
};
93+
return mTrans;
94+
}
9495

9596
}

0 commit comments

Comments
 (0)