Skip to content
This repository has been archived by the owner on Nov 5, 2022. It is now read-only.

Commit

Permalink
Quickly changed a few elements within the app which reffered to Googl…
Browse files Browse the repository at this point in the history 
…e stuff.
  • Loading branch information
kevinmcdonagh committed Oct 4, 2011
1 parent 0cbcc32 commit 3220692
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 71 deletions.
4 changes: 2 additions & 2 deletions android-app/.classpath
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="lib" path="libs/android-support-v4.jar"/>
<classpathentry kind="lib" path="libs/libGoogleAnalytics.jar"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="output" path="bin"/>
</classpath>
42 changes: 0 additions & 42 deletions android-app/res/xml/blocks.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,55 +16,13 @@
-->
<blocks>

<!-- Thursday, October 6th 2011 -->
<block>
<start>2011-10-06T09:00:00.000+01:00</start>
<end>2011-10-06T17:00:00.000+01:00</end>
<title>On-site check-in</title>
</block>
<block>
<start>2011-10-06T09:00:00.000+01:00</start>
<end>2011-10-06T17:30:00.000+01:00</end>
<title>BarCamp</title>
<type>session</type>
</block>
<block>
<start>2011-10-06T17:30:00.000+01:00</start>
<end>2011-10-06T19:30:00.000+01:00</end>
<title>Demo Camp</title>
<type>session</type>
</block>
<block>
<start>2011-10-06T19:30:00.000+01:00</start>
<end>2011-10-06T22:30:00.000+01:00</end>
<title>After Hours Party</title>
<type>food</type>
</block>

<!-- Friday, October 7th 2011 -->
<block>
<start>2011-10-07T08:30:00.000+01:00</start>
<end>2011-10-07T09:00:00.000+01:00</end>
<title>Coffee break</title>
<type>food</type>
</block>
<block>
<start>2011-10-07T08:30:00.000+01:00</start>
<end>2011-10-07T17:00:00.000+01:00</end>
<title>On-site check-in</title>
</block>
<block>
<start>2011-10-07T11:25:00.000+01:00</start>
<end>2011-10-07T11:50:00.000+01:00</end>
<title>Coffee break</title>
<type>food</type>
</block>
<block>
<start>2011-10-07T16:00:00.000+01:00</start>
<end>2011-10-07T16:25:00.000+01:00</end>
<title>Coffee break</title>
<type>food</type>
</block>
<block>
<start>2011-10-07T13:00:00.000+01:00</start>
<end>2011-10-07T14:10:00.000+01:00</end>
Expand Down
9 changes: 0 additions & 9 deletions android-app/res/xml/rooms.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,7 @@
<room><id>2</id><name>Room 2</name><floor>2</floor></room>
<room><id>3</id><name>Room 3</name><floor>2</floor></room>
<room><id>4</id><name>Room 4</name><floor>2</floor></room>
<room><id>5</id><name>Room 5</name><floor>2</floor></room>
<room><id>6</id><name>Room 6</name><floor>2</floor></room>
<room><id>7</id><name>Room 7</name><floor>2</floor></room>
<room><id>8</id><name>Room 8</name><floor>2</floor></room>
<room><id>9</id><name>Room 9</name><floor>2</floor></room>
<room><id>10</id><name>Room 10</name><floor>2</floor></room>
<room><id>11</id><name>Room 11</name><floor>3</floor></room>

<room><id>lunchroom</id><name>Lunch Room</name><floor>1</floor></room>
<room><id>officehoursfloor2</id><name>Office Hours Floor 2</name><floor>2</floor></room>
<room><id>officehoursfloor3</id><name>Office Hours Floor 3</name><floor>3</floor></room>

</rooms>
17 changes: 0 additions & 17 deletions android-app/res/xml/search_suggest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,8 @@
limitations under the License.
-->
<search_suggest>
<word>ajax</word>
<word>analytics</word>
<word>android</word>
<word>api</word>
<word>app engine</word>
<word>applications</word>
<word>accessibility</word>
<word>apps</word>
Expand All @@ -28,13 +25,10 @@
<word>business</word>
<word>buzz</word>
<word>calendar</word>
<word>charts</word>
<word>chat</word>
<word>chrome</word>
<word>client</word>
<word>cloud</word>
<word>closure</word>
<word>cloud</word>
<word>css</word>
<word>compiler</word>
<word>dalvik</word>
Expand All @@ -54,17 +48,12 @@
<word>flash</word>
<word>framework</word>
<word>friends</word>
<word>fusion tables</word>
<word>gadgets</word>
<word>gaming</word>
<word>geo</word>
<word>geospatial</word>
<word>go</word>
<word>google</word>
<word>gwt</word>
<word>honeycomb</word>
<word>html</word>
<word>html5</word>
<word>java</word>
<word>javascript</word>
<word>kml</word>
Expand All @@ -74,17 +63,12 @@
<word>mobile</word>
<word>monetizing</word>
<word>native</word>
<word>oauth</word>
<word>oauth2</word>
<word>openid</word>
<word>performance</word>
<word>platform</word>
<word>power</word>
<word>python</word>
<word>restful</word>
<word>robotics</word>
<word>scalable</word>
<word>scripting</word>
<word>search</word>
<word>security</word>
<word>server</word>
Expand All @@ -100,5 +84,4 @@
<word>tv</word>
<word>ui</word>
<word>ux</word>
<word>youtube</word>
</search_suggest>
2 changes: 1 addition & 1 deletion android-app/src/com/google/android/apps/iosched/util/ParserUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public class ParserUtils {

public static final String BLOCK_TYPE_FOOD = "food";
public static final String BLOCK_TYPE_SESSION = "session";
public static final String BLOCK_TYPE_OFFICE_HOURS = "officehours";
public static final String BLOCK_TYPE_OFFICE_HOURS = "Displays";

// TODO: factor this out into a separate data file.
public static final Set<String> LOCAL_TRACK_IDS = Sets.newHashSet(
Expand Down

0 comments on commit 3220692

Please sign in to comment.