source: issm/oecreview/Archive/13393-13976/ISSM-13959-13960.diff@ 21726

Last change on this file since 21726 was 13980, checked in by Mathieu Morlighem, 12 years ago

preparing oecreview for 13393-13976'
File size: 10.8 KB
RevLine 
[13980]1Index: ../trunk-jpl/src/android/ISSM_App/.classpath
2===================================================================
3--- ../trunk-jpl/src/android/ISSM_App/.classpath (revision 13959)
4+++ ../trunk-jpl/src/android/ISSM_App/.classpath (revision 13960)
5@@ -1,8 +0,0 @@
6-<?xml version="1.0" encoding="UTF-8"?>
7-<classpath>
8- <classpathentry kind="src" path="src"/>
9- <classpathentry kind="src" path="gen"/>
10- <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
11- <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
12- <classpathentry kind="output" path="bin/classes"/>
13-</classpath>
14Index: ../trunk-jpl/src/android/ISSM_App/project.properties
15===================================================================
16--- ../trunk-jpl/src/android/ISSM_App/project.properties (revision 13959)
17+++ ../trunk-jpl/src/android/ISSM_App/project.properties (revision 13960)
18@@ -1,14 +0,0 @@
19-# This file is automatically generated by Android Tools.
20-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
21-#
22-# This file must be checked in Version Control Systems.
23-#
24-# To customize properties used by the Ant build system edit
25-# "ant.properties", and override values to adapt the script to your
26-# project structure.
27-#
28-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
29-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
30-
31-# Project target.
32-target=android-14
33Index: ../trunk-jpl/src/android/ISSM_App/.project
34===================================================================
35--- ../trunk-jpl/src/android/ISSM_App/.project (revision 13959)
36+++ ../trunk-jpl/src/android/ISSM_App/.project (revision 13960)
37@@ -1,33 +0,0 @@
38-<?xml version="1.0" encoding="UTF-8"?>
39-<projectDescription>
40- <name>ISSM_App</name>
41- <comment></comment>
42- <projects>
43- </projects>
44- <buildSpec>
45- <buildCommand>
46- <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
47- <arguments>
48- </arguments>
49- </buildCommand>
50- <buildCommand>
51- <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
52- <arguments>
53- </arguments>
54- </buildCommand>
55- <buildCommand>
56- <name>org.eclipse.jdt.core.javabuilder</name>
57- <arguments>
58- </arguments>
59- </buildCommand>
60- <buildCommand>
61- <name>com.android.ide.eclipse.adt.ApkBuilder</name>
62- <arguments>
63- </arguments>
64- </buildCommand>
65- </buildSpec>
66- <natures>
67- <nature>com.android.ide.eclipse.adt.AndroidNature</nature>
68- <nature>org.eclipse.jdt.core.javanature</nature>
69- </natures>
70-</projectDescription>
71Index: ../trunk-jpl/src/android/ISSM_App/proguard-project.txt
72===================================================================
73--- ../trunk-jpl/src/android/ISSM_App/proguard-project.txt (revision 13959)
74+++ ../trunk-jpl/src/android/ISSM_App/proguard-project.txt (revision 13960)
75@@ -1,20 +0,0 @@
76-# To enable ProGuard in your project, edit project.properties
77-# to define the proguard.config property as described in that file.
78-#
79-# Add project specific ProGuard rules here.
80-# By default, the flags in this file are appended to flags specified
81-# in ${sdk.dir}/tools/proguard/proguard-android.txt
82-# You can edit the include path and order by changing the ProGuard
83-# include property in project.properties.
84-#
85-# For more details, see
86-# http://developer.android.com/guide/developing/tools/proguard.html
87-
88-# Add any project specific keep options here:
89-
90-# If your project uses WebView with JS, uncomment the following
91-# and specify the fully qualified class name to the JavaScript interface
92-# class:
93-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
94-# public *;
95-#}
96Index: ../trunk-jpl/src/android/ISSM_App/AndroidManifest.xml
97===================================================================
98--- ../trunk-jpl/src/android/ISSM_App/AndroidManifest.xml (revision 13959)
99+++ ../trunk-jpl/src/android/ISSM_App/AndroidManifest.xml (revision 13960)
100@@ -1,23 +0,0 @@
101-<?xml version="1.0" encoding="utf-8"?>
102-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
103- package="issm.app"
104- android:versionCode="1"
105- android:versionName="1.0" >
106-
107- <uses-sdk android:minSdkVersion="14" />
108-
109- <application
110- android:icon="@drawable/ic_launcher"
111- android:label="@string/app_name" >
112- <activity
113- android:name=".ISSM_AppActivity"
114- android:label="@string/app_name" >
115- <intent-filter>
116- <action android:name="android.intent.action.MAIN" />
117-
118- <category android:name="android.intent.category.LAUNCHER" />
119- </intent-filter>
120- </activity>
121- </application>
122-
123-</manifest>
124\ No newline at end of file
125Index: ../trunk-jpl/src/android/ISSM_App/src/issm/app/ISSM_AppActivity.java
126===================================================================
127--- ../trunk-jpl/src/android/ISSM_App/src/issm/app/ISSM_AppActivity.java (revision 13959)
128+++ ../trunk-jpl/src/android/ISSM_App/src/issm/app/ISSM_AppActivity.java (revision 13960)
129@@ -1,29 +0,0 @@
130-package issm.app;
131-
132-import android.app.Activity;
133-import android.os.Bundle;
134-import android.view.View;
135-import android.view.View.OnClickListener;
136-import android.widget.TextView;
137-import android.widget.SeekBar;
138-
139-public class ISSM_AppActivity extends Activity implements OnClickListener
140-{
141- private SeekBar sb;
142- private TextView tv;
143-
144- public void onCreate(Bundle savedInstanceState)
145- {
146- super.onCreate(savedInstanceState);
147- setContentView(R.layout.main);
148- sb = (SeekBar)findViewById(R.id.seekBar2);
149- tv = (TextView)findViewById(R.id.editText2);
150- tv.setText("Current Progress: " + sb.getProgress());
151- sb.setOnClickListener(this);
152- }
153-
154- public void onClick(View v)
155- {
156- tv.setText("Current Progress: " + sb.getProgress());
157- }
158-}
159\ No newline at end of file
160Index: ../trunk-jpl/src/android/ISSM_App/bin/res/drawable-hdpi/ic_launcher.png
161===================================================================
162Cannot display: file marked as a binary type.
163svn:mime-type = application/octet-stream
164Index: ../trunk-jpl/src/android/ISSM_App/bin/res/drawable-ldpi/ic_launcher.png
165===================================================================
166Cannot display: file marked as a binary type.
167svn:mime-type = application/octet-stream
168Index: ../trunk-jpl/src/android/ISSM_App/bin/res/drawable-mdpi/ic_launcher.png
169===================================================================
170Cannot display: file marked as a binary type.
171svn:mime-type = application/octet-stream
172Index: ../trunk-jpl/src/android/ISSM_App/bin/res/drawable-xhdpi/ic_launcher.png
173===================================================================
174Cannot display: file marked as a binary type.
175svn:mime-type = application/octet-stream
176Index: ../trunk-jpl/src/android/ISSM_App/gen/issm/app/R.java
177===================================================================
178--- ../trunk-jpl/src/android/ISSM_App/gen/issm/app/R.java (revision 13959)
179+++ ../trunk-jpl/src/android/ISSM_App/gen/issm/app/R.java (revision 13960)
180@@ -1,27 +0,0 @@
181-/* AUTO-GENERATED FILE. DO NOT MODIFY.
182- *
183- * This class was automatically generated by the
184- * aapt tool from the resource data it found. It
185- * should not be modified by hand.
186- */
187-
188-package issm.app;
189-
190-public final class R {
191- public static final class attr {
192- }
193- public static final class drawable {
194- public static final int ic_launcher=0x7f020000;
195- }
196- public static final class id {
197- public static final int editText2=0x7f050000;
198- public static final int seekBar2=0x7f050001;
199- }
200- public static final class layout {
201- public static final int main=0x7f030000;
202- }
203- public static final class string {
204- public static final int app_name=0x7f040001;
205- public static final int hello=0x7f040000;
206- }
207-}
208Index: ../trunk-jpl/src/android/ISSM_App/gen/issm/app/BuildConfig.java
209===================================================================
210--- ../trunk-jpl/src/android/ISSM_App/gen/issm/app/BuildConfig.java (revision 13959)
211+++ ../trunk-jpl/src/android/ISSM_App/gen/issm/app/BuildConfig.java (revision 13960)
212@@ -1,6 +0,0 @@
213-/** Automatically generated file. DO NOT MODIFY */
214-package issm.app;
215-
216-public final class BuildConfig {
217- public final static boolean DEBUG = true;
218-}
219\ No newline at end of file
220Index: ../trunk-jpl/src/android/ISSM_App/res/values/strings.xml
221===================================================================
222--- ../trunk-jpl/src/android/ISSM_App/res/values/strings.xml (revision 13959)
223+++ ../trunk-jpl/src/android/ISSM_App/res/values/strings.xml (revision 13960)
224@@ -1,7 +0,0 @@
225-<?xml version="1.0" encoding="utf-8"?>
226-<resources>
227-
228- <string name="hello">Hello World, ISSM_AppActivity!</string>
229- <string name="app_name">ISSM_App</string>
230-
231-</resources>
232\ No newline at end of file
233Index: ../trunk-jpl/src/android/ISSM_App/res/drawable-hdpi/ic_launcher.png
234===================================================================
235Cannot display: file marked as a binary type.
236svn:mime-type = application/octet-stream
237Index: ../trunk-jpl/src/android/ISSM_App/res/drawable-ldpi/ic_launcher.png
238===================================================================
239Cannot display: file marked as a binary type.
240svn:mime-type = application/octet-stream
241Index: ../trunk-jpl/src/android/ISSM_App/res/drawable-mdpi/ic_launcher.png
242===================================================================
243Cannot display: file marked as a binary type.
244svn:mime-type = application/octet-stream
245Index: ../trunk-jpl/src/android/ISSM_App/res/drawable-xhdpi/ic_launcher.png
246===================================================================
247Cannot display: file marked as a binary type.
248svn:mime-type = application/octet-stream
249Index: ../trunk-jpl/src/android/ISSM_App/res/layout/main.xml
250===================================================================
251--- ../trunk-jpl/src/android/ISSM_App/res/layout/main.xml (revision 13959)
252+++ ../trunk-jpl/src/android/ISSM_App/res/layout/main.xml (revision 13960)
253@@ -1,22 +0,0 @@
254-<?xml version="1.0" encoding="utf-8"?>
255-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
256- android:layout_width="match_parent"
257- android:layout_height="match_parent"
258- android:orientation="horizontal" >
259-
260- <TextView
261- android:id="@+id/editText2"
262- android:layout_width="match_parent"
263- android:layout_height="wrap_content"
264- android:layout_weight="1"
265- android:ems="10" android:translationX="0.5in" android:translationY="1in"/>
266-
267- <SeekBar
268- android:id="@+id/seekBar2"
269- android:layout_width="match_parent"
270- android:layout_height="wrap_content"
271- android:layout_weight="1"
272- android:clickable="true"
273- android:max="100" android:translationY="2in" android:translationX="-0.5in"/>
274-
275-</LinearLayout>
276\ No newline at end of file
Note: See TracBrowser for help on using the repository browser.