source: issm/oecreview/Archive/13393-13976/ISSM-13837-13838.diff@ 13980

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

preparing oecreview for 13393-13976'
File size: 30.7 KB
RevLine 
[13980]1Index: ../trunk-jpl/src/android/helloworld/ISSM/.classpath
2===================================================================
3--- ../trunk-jpl/src/android/helloworld/ISSM/.classpath (revision 13837)
4+++ ../trunk-jpl/src/android/helloworld/ISSM/.classpath (revision 13838)
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/helloworld/ISSM/project.properties
15===================================================================
16--- ../trunk-jpl/src/android/helloworld/ISSM/project.properties (revision 13837)
17+++ ../trunk-jpl/src/android/helloworld/ISSM/project.properties (revision 13838)
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-16
33Index: ../trunk-jpl/src/android/helloworld/ISSM/.project
34===================================================================
35--- ../trunk-jpl/src/android/helloworld/ISSM/.project (revision 13837)
36+++ ../trunk-jpl/src/android/helloworld/ISSM/.project (revision 13838)
37@@ -1,33 +0,0 @@
38-<?xml version="1.0" encoding="UTF-8"?>
39-<projectDescription>
40- <name>ISSM</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/helloworld/ISSM/proguard-project.txt
72===================================================================
73--- ../trunk-jpl/src/android/helloworld/ISSM/proguard-project.txt (revision 13837)
74+++ ../trunk-jpl/src/android/helloworld/ISSM/proguard-project.txt (revision 13838)
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/helloworld/ISSM/AndroidManifest.xml
97===================================================================
98--- ../trunk-jpl/src/android/helloworld/ISSM/AndroidManifest.xml (revision 13837)
99+++ ../trunk-jpl/src/android/helloworld/ISSM/AndroidManifest.xml (revision 13838)
100@@ -1,25 +0,0 @@
101-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
102- package="com.example.issm"
103- android:versionCode="1"
104- android:versionName="1.0" >
105-
106- <uses-sdk
107- android:minSdkVersion="5"
108- android:targetSdkVersion="15" />
109-
110- <application
111- android:icon="@drawable/ic_launcher"
112- android:label="@string/app_name"
113- android:theme="@style/AppTheme" >
114- <activity
115- android:name=".ISSM"
116- android:label="@string/title_activity_issm" >
117- <intent-filter>
118- <action android:name="android.intent.action.MAIN" />
119-
120- <category android:name="android.intent.category.LAUNCHER" />
121- </intent-filter>
122- </activity>
123- </application>
124-
125-</manifest>
126\ No newline at end of file
127Index: ../trunk-jpl/src/android/helloworld/ISSM/src/com/example/issm/MyGLRenderer.java
128===================================================================
129--- ../trunk-jpl/src/android/helloworld/ISSM/src/com/example/issm/MyGLRenderer.java (revision 13837)
130+++ ../trunk-jpl/src/android/helloworld/ISSM/src/com/example/issm/MyGLRenderer.java (revision 13838)
131@@ -1,162 +0,0 @@
132-/*
133- * Copyright (C) 2012 The Android Open Source Project
134- *
135- * Licensed under the Apache License, Version 2.0 (the "License");
136- * you may not use this file except in compliance with the License.
137- * You may obtain a copy of the License at
138- *
139- * http://www.apache.org/licenses/LICENSE-2.0
140- *
141- * Unless required by applicable law or agreed to in writing, software
142- * distributed under the License is distributed on an "AS IS" BASIS,
143- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
144- * See the License for the specific language governing permissions and
145- * limitations under the License.
146- */
147-
148-package com.example.issm;
149-import java.nio.ByteBuffer;
150-import java.nio.ByteOrder;
151-import java.nio.FloatBuffer;
152-
153-import javax.microedition.khronos.egl.EGLConfig;
154-import javax.microedition.khronos.opengles.GL10;
155-
156-import android.opengl.GLES20;
157-import android.opengl.GLSurfaceView;
158-
159-public class MyGLRenderer implements GLSurfaceView.Renderer {
160-
161- private Triangle mTriangle;
162-
163- @Override
164- public void onSurfaceCreated(GL10 unused, EGLConfig config) {
165-
166- // Set the background frame color
167- GLES20.glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
168-
169- mTriangle = new Triangle();
170- }
171-
172- @Override
173- public void onDrawFrame(GL10 unused) {
174-
175- // Draw background color
176- GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT);
177-
178- // Draw triangle
179- mTriangle.draw();
180- }
181-
182- @Override
183- public void onSurfaceChanged(GL10 unused, int width, int height) {
184- // Adjust the viewport based on geometry changes,
185- // such as screen rotation
186- GLES20.glViewport(0, 0, width, height);
187- }
188-
189- public static int loadShader(int type, String shaderCode){
190-
191- // create a vertex shader type (GLES20.GL_VERTEX_SHADER)
192- // or a fragment shader type (GLES20.GL_FRAGMENT_SHADER)
193- int shader = GLES20.glCreateShader(type);
194-
195- // add the source code to the shader and compile it
196- GLES20.glShaderSource(shader, shaderCode);
197- GLES20.glCompileShader(shader);
198-
199- return shader;
200- }
201-
202-}
203-
204-class Triangle
205-{
206-
207- private final String vertexShaderCode =
208- "attribute vec4 vPosition;" +
209- "void main() {" +
210- " gl_Position = vPosition;" +
211- "}";
212-
213- private final String fragmentShaderCode =
214- "precision mediump float;" +
215- "uniform vec4 vColor;" +
216- "void main() {" +
217- " gl_FragColor = vColor;" +
218- "}";
219-
220- private final FloatBuffer vertexBuffer;
221- private final int mProgram;
222- private int mPositionHandle;
223- private int mColorHandle;
224-
225- // number of coordinates per vertex in this array
226- static final int COORDS_PER_VERTEX = 3;
227- static float triangleCoords[] = { // in counterclockwise order:
228- 0.0f, 0.622008459f, 0.0f, // top
229- -0.5f, -0.311004243f, 0.0f, // bottom left
230- 0.5f, -0.311004243f, 0.0f // bottom right
231- };
232- private final int vertexCount = triangleCoords.length / COORDS_PER_VERTEX;
233- private final int vertexStride = COORDS_PER_VERTEX * 4; // bytes per vertex
234-
235- // Set color with red, green, blue and alpha (opacity) values
236- float color[] = { 0.63671875f, 0.76953125f, 0.22265625f, 1.0f };
237-
238- public Triangle() {
239- // initialize vertex byte buffer for shape coordinates
240- ByteBuffer bb = ByteBuffer.allocateDirect(
241- // (number of coordinate values * 4 bytes per float)
242- triangleCoords.length * 4);
243- // use the device hardware's native byte order
244- bb.order(ByteOrder.nativeOrder());
245-
246- // create a floating point buffer from the ByteBuffer
247- vertexBuffer = bb.asFloatBuffer();
248- // add the coordinates to the FloatBuffer
249- vertexBuffer.put(triangleCoords);
250- // set the buffer to read the first coordinate
251- vertexBuffer.position(0);
252-
253- // prepare shaders and OpenGL program
254- int vertexShader = MyGLRenderer.loadShader(GLES20.GL_VERTEX_SHADER,
255- vertexShaderCode);
256- int fragmentShader = MyGLRenderer.loadShader(GLES20.GL_FRAGMENT_SHADER,
257- fragmentShaderCode);
258-
259- mProgram = GLES20.glCreateProgram(); // create empty OpenGL Program
260- GLES20.glAttachShader(mProgram, vertexShader); // add the vertex shader to program
261- GLES20.glAttachShader(mProgram, fragmentShader); // add the fragment shader to program
262- GLES20.glLinkProgram(mProgram); // create OpenGL program executables
263-
264- }
265-
266- public void draw() {
267- // Add program to OpenGL environment
268- GLES20.glUseProgram(mProgram);
269-
270- // get handle to vertex shader's vPosition member
271- mPositionHandle = GLES20.glGetAttribLocation(mProgram, "vPosition");
272-
273- // Enable a handle to the triangle vertices
274- GLES20.glEnableVertexAttribArray(mPositionHandle);
275-
276- // Prepare the triangle coordinate data
277- GLES20.glVertexAttribPointer(mPositionHandle, COORDS_PER_VERTEX,
278- GLES20.GL_FLOAT, false,
279- vertexStride, vertexBuffer);
280-
281- // get handle to fragment shader's vColor member
282- mColorHandle = GLES20.glGetUniformLocation(mProgram, "vColor");
283-
284- // Set color for drawing the triangle
285- GLES20.glUniform4fv(mColorHandle, 1, color, 0);
286-
287- // Draw the triangle
288- GLES20.glDrawArrays(GLES20.GL_TRIANGLES, 0, vertexCount);
289-
290- // Disable vertex array
291- GLES20.glDisableVertexAttribArray(mPositionHandle);
292- }
293-}
294Index: ../trunk-jpl/src/android/helloworld/ISSM/src/com/example/issm/ISSM.java
295===================================================================
296--- ../trunk-jpl/src/android/helloworld/ISSM/src/com/example/issm/ISSM.java (revision 13837)
297+++ ../trunk-jpl/src/android/helloworld/ISSM/src/com/example/issm/ISSM.java (revision 13838)
298@@ -1,97 +0,0 @@
299-package com.example.issm;
300-
301-import android.app.Activity;
302-import android.content.Context;
303-import android.opengl.GLES20;
304-import android.opengl.GLSurfaceView;
305-import android.opengl.GLSurfaceView.Renderer;
306-import android.os.Bundle;
307-import android.util.AttributeSet;
308-import android.view.Menu;
309-import android.view.View;
310-import android.view.View.OnClickListener;
311-import android.widget.Button;
312-import android.widget.FrameLayout;
313-import android.widget.RelativeLayout;
314-import android.widget.SeekBar;
315-import android.widget.SeekBar.OnSeekBarChangeListener;
316-import android.widget.TextView;
317-import android.widget.Toast;
318-import java.nio.ByteBuffer;
319-import java.nio.ByteOrder;
320-import java.nio.FloatBuffer;
321-import java.nio.ShortBuffer;
322-import javax.microedition.khronos.egl.EGLConfig;
323-import javax.microedition.khronos.opengles.GL10;
324-
325-public class ISSM extends Activity implements OnSeekBarChangeListener
326-{
327- private SeekBar bar;
328- private TextView txtStatus, txtValue;
329- private GLSurfaceView mGLView;
330- private FrameLayout frame;
331- @Override
332- public void onCreate(Bundle savedInstanceState) {
333- super.onCreate(savedInstanceState);
334- setContentView(R.layout.activity_issm);
335-
336- bar = (SeekBar)findViewById(R.id.seekBar); // make seekbar object
337- bar.setOnSeekBarChangeListener(this); // set seekbar listener
338- txtValue = (TextView)findViewById(R.id.value);
339- txtStatus = (TextView)findViewById(R.id.status);
340-
341- mGLView = new MyGLSurfaceView(this);
342- frame = (FrameLayout)findViewById(R.id.frame);
343- frame.addView(mGLView);
344-
345- }
346-
347-
348- @Override
349- public void onProgressChanged(SeekBar seekBar, int val,
350- boolean fromUser)
351- {
352- // change progress text label with current Seekbar value
353- txtValue.setText("Value: " + val);
354- txtStatus.setText("Status: changing");
355- }
356- @Override
357- public void onStartTrackingTouch(SeekBar seekBar)
358- {
359- txtStatus.setText("Status: Starting to track touch");
360-
361- }
362- @Override
363- public void onStopTrackingTouch(SeekBar seekBar)
364- {
365- seekBar.setSecondaryProgress(seekBar.getProgress()); // set the shade of the previous value.
366- txtStatus.setText("Status: Ended tracking touch");
367- }
368-
369- @Override
370- protected void onPause() {
371- super.onPause();
372- // The following call pauses the rendering thread.
373- // If your OpenGL application is memory intensive,
374- // you should consider de-allocating objects that
375- // consume significant memory here.
376- mGLView.onPause();
377- }
378-
379- @Override
380- protected void onResume() {
381- super.onResume();
382- // The following call resumes a paused rendering thread.
383- // If you de-allocated graphic objects for onPause()
384- // this is a good place to re-allocate them.
385- mGLView.onResume();
386- }
387-
388-
389- @Override
390- public boolean onCreateOptionsMenu(Menu menu)
391- {
392- getMenuInflater().inflate(R.menu.activity_issm, menu);
393- return true;
394- }
395-}
396Index: ../trunk-jpl/src/android/helloworld/ISSM/src/com/example/issm/MyGLSurfaceView.java
397===================================================================
398--- ../trunk-jpl/src/android/helloworld/ISSM/src/com/example/issm/MyGLSurfaceView.java (revision 13837)
399+++ ../trunk-jpl/src/android/helloworld/ISSM/src/com/example/issm/MyGLSurfaceView.java (revision 13838)
400@@ -1,21 +0,0 @@
401-package com.example.issm;
402-
403-import android.content.Context;
404-import android.opengl.GLSurfaceView;
405-
406-
407-class MyGLSurfaceView extends GLSurfaceView {
408-
409- public MyGLSurfaceView(Context context) {
410- super(context);
411-
412- // Create an OpenGL ES 2.0 context.
413- setEGLContextClientVersion(2);
414-
415- // Set the Renderer for drawing on the GLSurfaceView
416- setRenderer(new MyGLRenderer());
417-
418- // Render the view only when there is a change in the drawing data
419- setRenderMode(GLSurfaceView.RENDERMODE_WHEN_DIRTY);
420- }
421-}
422\ No newline at end of file
423Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/ISSM.apk
424===================================================================
425Cannot display: file marked as a binary type.
426svn:mime-type = application/octet-stream
427Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/AndroidManifest.xml
428===================================================================
429--- ../trunk-jpl/src/android/helloworld/ISSM/bin/AndroidManifest.xml (revision 13837)
430+++ ../trunk-jpl/src/android/helloworld/ISSM/bin/AndroidManifest.xml (revision 13838)
431@@ -1,25 +0,0 @@
432-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
433- package="com.example.issm"
434- android:versionCode="1"
435- android:versionName="1.0" >
436-
437- <uses-sdk
438- android:minSdkVersion="5"
439- android:targetSdkVersion="15" />
440-
441- <application
442- android:icon="@drawable/ic_launcher"
443- android:label="@string/app_name"
444- android:theme="@style/AppTheme" >
445- <activity
446- android:name=".ISSM"
447- android:label="@string/title_activity_issm" >
448- <intent-filter>
449- <action android:name="android.intent.action.MAIN" />
450-
451- <category android:name="android.intent.category.LAUNCHER" />
452- </intent-filter>
453- </activity>
454- </application>
455-
456-</manifest>
457\ No newline at end of file
458Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/resources.ap_
459===================================================================
460Cannot display: file marked as a binary type.
461svn:mime-type = application/octet-stream
462Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/res/drawable-hdpi/ic_launcher.png
463===================================================================
464Cannot display: file marked as a binary type.
465svn:mime-type = application/octet-stream
466Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/res/drawable-hdpi/ic_action_search.png
467===================================================================
468Cannot display: file marked as a binary type.
469svn:mime-type = application/octet-stream
470Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/res/drawable-ldpi/ic_launcher.png
471===================================================================
472Cannot display: file marked as a binary type.
473svn:mime-type = application/octet-stream
474Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/res/drawable-mdpi/ic_launcher.png
475===================================================================
476Cannot display: file marked as a binary type.
477svn:mime-type = application/octet-stream
478Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/res/drawable-mdpi/ic_action_search.png
479===================================================================
480Cannot display: file marked as a binary type.
481svn:mime-type = application/octet-stream
482Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/res/drawable-xhdpi/ic_launcher.png
483===================================================================
484Cannot display: file marked as a binary type.
485svn:mime-type = application/octet-stream
486Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/res/drawable-xhdpi/ic_action_search.png
487===================================================================
488Cannot display: file marked as a binary type.
489svn:mime-type = application/octet-stream
490Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/jarlist.cache
491===================================================================
492--- ../trunk-jpl/src/android/helloworld/ISSM/bin/jarlist.cache (revision 13837)
493+++ ../trunk-jpl/src/android/helloworld/ISSM/bin/jarlist.cache (revision 13838)
494@@ -1,3 +0,0 @@
495-# cache for current jar dependecy. DO NOT EDIT.
496-# format is <lastModified> <length> <SHA-1> <path>
497-# Encoding is UTF-8
498Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/classes.dex
499===================================================================
500Cannot display: file marked as a binary type.
501svn:mime-type = application/octet-stream
502Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/classes/com/example/issm/ISSM.class
503===================================================================
504Cannot display: file marked as a binary type.
505svn:mime-type = application/octet-stream
506Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/classes/com/example/issm/MyGLSurfaceView.class
507===================================================================
508Cannot display: file marked as a binary type.
509svn:mime-type = application/octet-stream
510Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/classes/com/example/issm/R$string.class
511===================================================================
512Cannot display: file marked as a binary type.
513svn:mime-type = application/octet-stream
514Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/classes/com/example/issm/MyGLRenderer.class
515===================================================================
516Cannot display: file marked as a binary type.
517svn:mime-type = application/octet-stream
518Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/classes/com/example/issm/R$attr.class
519===================================================================
520Cannot display: file marked as a binary type.
521svn:mime-type = application/octet-stream
522Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/classes/com/example/issm/R.class
523===================================================================
524Cannot display: file marked as a binary type.
525svn:mime-type = application/octet-stream
526Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/classes/com/example/issm/R$id.class
527===================================================================
528Cannot display: file marked as a binary type.
529svn:mime-type = application/octet-stream
530Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/classes/com/example/issm/R$layout.class
531===================================================================
532Cannot display: file marked as a binary type.
533svn:mime-type = application/octet-stream
534Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/classes/com/example/issm/BuildConfig.class
535===================================================================
536Cannot display: file marked as a binary type.
537svn:mime-type = application/octet-stream
538Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/classes/com/example/issm/Triangle.class
539===================================================================
540Cannot display: file marked as a binary type.
541svn:mime-type = application/octet-stream
542Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/classes/com/example/issm/R$style.class
543===================================================================
544Cannot display: file marked as a binary type.
545svn:mime-type = application/octet-stream
546Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/classes/com/example/issm/R$drawable.class
547===================================================================
548Cannot display: file marked as a binary type.
549svn:mime-type = application/octet-stream
550Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/classes/com/example/issm/R$menu.class
551===================================================================
552Cannot display: file marked as a binary type.
553svn:mime-type = application/octet-stream
554Index: ../trunk-jpl/src/android/helloworld/ISSM/gen/com/example/issm/R.java
555===================================================================
556--- ../trunk-jpl/src/android/helloworld/ISSM/gen/com/example/issm/R.java (revision 13837)
557+++ ../trunk-jpl/src/android/helloworld/ISSM/gen/com/example/issm/R.java (revision 13838)
558@@ -1,39 +0,0 @@
559-/* AUTO-GENERATED FILE. DO NOT MODIFY.
560- *
561- * This class was automatically generated by the
562- * aapt tool from the resource data it found. It
563- * should not be modified by hand.
564- */
565-
566-package com.example.issm;
567-
568-public final class R {
569- public static final class attr {
570- }
571- public static final class drawable {
572- public static final int ic_action_search=0x7f020000;
573- public static final int ic_launcher=0x7f020001;
574- }
575- public static final class id {
576- public static final int frame=0x7f070004;
577- public static final int menu_settings=0x7f070005;
578- public static final int relativeLay=0x7f070000;
579- public static final int seekBar=0x7f070003;
580- public static final int status=0x7f070002;
581- public static final int value=0x7f070001;
582- }
583- public static final class layout {
584- public static final int activity_issm=0x7f030000;
585- }
586- public static final class menu {
587- public static final int activity_issm=0x7f060000;
588- }
589- public static final class string {
590- public static final int app_name=0x7f040000;
591- public static final int menu_settings=0x7f040001;
592- public static final int title_activity_issm=0x7f040002;
593- }
594- public static final class style {
595- public static final int AppTheme=0x7f050000;
596- }
597-}
598Index: ../trunk-jpl/src/android/helloworld/ISSM/gen/com/example/issm/BuildConfig.java
599===================================================================
600--- ../trunk-jpl/src/android/helloworld/ISSM/gen/com/example/issm/BuildConfig.java (revision 13837)
601+++ ../trunk-jpl/src/android/helloworld/ISSM/gen/com/example/issm/BuildConfig.java (revision 13838)
602@@ -1,6 +0,0 @@
603-/** Automatically generated file. DO NOT MODIFY */
604-package com.example.issm;
605-
606-public final class BuildConfig {
607- public final static boolean DEBUG = true;
608-}
609\ No newline at end of file
610Index: ../trunk-jpl/src/android/helloworld/ISSM/libs/android-support-v4.jar
611===================================================================
612Cannot display: file marked as a binary type.
613svn:mime-type = application/octet-stream
614Index: ../trunk-jpl/src/android/helloworld/ISSM/res/values/styles.xml
615===================================================================
616--- ../trunk-jpl/src/android/helloworld/ISSM/res/values/styles.xml (revision 13837)
617+++ ../trunk-jpl/src/android/helloworld/ISSM/res/values/styles.xml (revision 13838)
618@@ -1,5 +0,0 @@
619-<resources>
620-
621- <style name="AppTheme" parent="android:Theme.Light" />
622-
623-</resources>
624\ No newline at end of file
625Index: ../trunk-jpl/src/android/helloworld/ISSM/res/values/strings.xml
626===================================================================
627--- ../trunk-jpl/src/android/helloworld/ISSM/res/values/strings.xml (revision 13837)
628+++ ../trunk-jpl/src/android/helloworld/ISSM/res/values/strings.xml (revision 13838)
629@@ -1,7 +0,0 @@
630-<resources>
631-
632- <string name="app_name">ISSM</string>
633- <string name="menu_settings">Settings</string>
634- <string name="title_activity_issm">ISSM</string>
635-
636-</resources>
637\ No newline at end of file
638Index: ../trunk-jpl/src/android/helloworld/ISSM/res/drawable-hdpi/ic_launcher.png
639===================================================================
640Cannot display: file marked as a binary type.
641svn:mime-type = application/octet-stream
642Index: ../trunk-jpl/src/android/helloworld/ISSM/res/drawable-hdpi/ic_action_search.png
643===================================================================
644Cannot display: file marked as a binary type.
645svn:mime-type = application/octet-stream
646Index: ../trunk-jpl/src/android/helloworld/ISSM/res/menu/activity_issm.xml
647===================================================================
648--- ../trunk-jpl/src/android/helloworld/ISSM/res/menu/activity_issm.xml (revision 13837)
649+++ ../trunk-jpl/src/android/helloworld/ISSM/res/menu/activity_issm.xml (revision 13838)
650@@ -1,6 +0,0 @@
651-<menu xmlns:android="http://schemas.android.com/apk/res/android">
652- <item android:id="@+id/menu_settings"
653- android:title="@string/menu_settings"
654- android:orderInCategory="100"
655- android:showAsAction="never" />
656-</menu>
657Index: ../trunk-jpl/src/android/helloworld/ISSM/res/values-v11/styles.xml
658===================================================================
659--- ../trunk-jpl/src/android/helloworld/ISSM/res/values-v11/styles.xml (revision 13837)
660+++ ../trunk-jpl/src/android/helloworld/ISSM/res/values-v11/styles.xml (revision 13838)
661@@ -1,5 +0,0 @@
662-<resources>
663-
664- <style name="AppTheme" parent="android:Theme.Holo.Light" />
665-
666-</resources>
667\ No newline at end of file
668Index: ../trunk-jpl/src/android/helloworld/ISSM/res/drawable-ldpi/ic_launcher.png
669===================================================================
670Cannot display: file marked as a binary type.
671svn:mime-type = application/octet-stream
672Index: ../trunk-jpl/src/android/helloworld/ISSM/res/values-v14/styles.xml
673===================================================================
674--- ../trunk-jpl/src/android/helloworld/ISSM/res/values-v14/styles.xml (revision 13837)
675+++ ../trunk-jpl/src/android/helloworld/ISSM/res/values-v14/styles.xml (revision 13838)
676@@ -1,5 +0,0 @@
677-<resources>
678-
679- <style name="AppTheme" parent="android:Theme.Holo.Light.DarkActionBar" />
680-
681-</resources>
682\ No newline at end of file
683Index: ../trunk-jpl/src/android/helloworld/ISSM/res/drawable-mdpi/ic_launcher.png
684===================================================================
685Cannot display: file marked as a binary type.
686svn:mime-type = application/octet-stream
687Index: ../trunk-jpl/src/android/helloworld/ISSM/res/drawable-mdpi/ic_action_search.png
688===================================================================
689Cannot display: file marked as a binary type.
690svn:mime-type = application/octet-stream
691Index: ../trunk-jpl/src/android/helloworld/ISSM/res/drawable-xhdpi/ic_launcher.png
692===================================================================
693Cannot display: file marked as a binary type.
694svn:mime-type = application/octet-stream
695Index: ../trunk-jpl/src/android/helloworld/ISSM/res/drawable-xhdpi/ic_action_search.png
696===================================================================
697Cannot display: file marked as a binary type.
698svn:mime-type = application/octet-stream
699Index: ../trunk-jpl/src/android/helloworld/ISSM/res/layout/activity_issm.xml
700===================================================================
701--- ../trunk-jpl/src/android/helloworld/ISSM/res/layout/activity_issm.xml (revision 13837)
702+++ ../trunk-jpl/src/android/helloworld/ISSM/res/layout/activity_issm.xml (revision 13838)
703@@ -1,44 +0,0 @@
704-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
705- xmlns:tools="http://schemas.android.com/tools"
706- android:id="@+id/relativeLay"
707- android:layout_width="match_parent"
708- android:layout_height="match_parent"
709- android:orientation="horizontal" >
710-
711- <SeekBar
712- android:id="@+id/seekBar"
713- android:layout_width="match_parent"
714- android:layout_height="wrap_content"
715- android:layout_alignParentBottom="true"
716- android:layout_alignParentLeft="true"
717- android:layout_marginBottom="41dp" />
718-
719- <TextView
720- android:id="@+id/status"
721- android:layout_width="wrap_content"
722- android:layout_height="wrap_content"
723- android:layout_above="@+id/seekBar"
724- android:layout_centerHorizontal="true"
725- android:layout_marginBottom="16dp"
726- android:text="Status: " />
727-
728- <FrameLayout
729- xmlns:android="http://schemas.android.com/apk/res/android"
730- xmlns:tools="http://schemas.android.com/tools"
731- android:id="@+id/frame"
732- android:layout_width="wrap_content"
733- android:layout_height="wrap_content"
734- android:layout_centerHorizontal="true"
735- android:layout_marginBottom="128dp" >
736- </FrameLayout>
737-
738- <TextView
739- android:id="@+id/value"
740- android:layout_width="wrap_content"
741- android:layout_height="wrap_content"
742- android:layout_above="@+id/status"
743- android:layout_alignRight="@+id/status"
744- android:layout_marginBottom="16dp"
745- android:text="Value: " />
746-
747-</RelativeLayout>
748Index: ../trunk-jpl/src/android/helloworld/ISSM/ic_launcher-web.png
749===================================================================
750Cannot display: file marked as a binary type.
751svn:mime-type = application/octet-stream
Note: See TracBrowser for help on using the repository browser.