Skip to content

Commit ba6f8e4

Browse files
vogellavogella
committed
Merge branch 'master' of [email protected]:vogella/vogella.git
Conflicts: com.vogella.android.actionbar.progress/.classpath
2 parents 97ae9cd + 1cee074 commit ba6f8e4

467 files changed

Lines changed: 8041 additions & 606 deletions

File tree

Some content is hidden

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

‎andoid.lint.example/project.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
# project structure.
99

1010
# Project target.
11-
target=android-15
11+
target=android-17

‎android.example/project.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
# project structure.
99

1010
# Project target.
11-
target=Google Inc.:Google APIs:15
11+
target=Google Inc.:Google APIs:17

‎com.example.drawable.lightswitch/res/drawable/button_default.xml‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<shape
3-
xmlns:android="http://schemas.android.com/apk/res/android"
4-
android:shape="rectangle">
5-
<stroke
6-
android:width="2dp"
7-
android:color="#FFFFFFFF" />
8-
<gradient
9-
android:endColor="#DDBBBBBB"
10-
android:startColor="#DD777777"
11-
android:angle="90" />
12-
<corners
13-
android:bottomRightRadius="7dp"
14-
android:bottomLeftRadius="7dp"
15-
android:topLeftRadius="7dp"
16-
android:topRightRadius="7dp" />
2+
<shape xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:shape="rectangle" >
4+
5+
<stroke
6+
android:width="2dp"
7+
android:color="#FFFFFFFF" />
8+
9+
<gradient
10+
android:angle="90"
11+
android:endColor="#DDBBBBBB"
12+
android:startColor="#DD777777" />
13+
14+
<corners android:radius="7dp" />
15+
1716
</shape>

‎com.vogella.android.actionbar.actionprovider/res/menu/activity_main.xml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
22

3+
<item
4+
android:id="@+id/refresh"
5+
android:orderInCategory="20"
6+
android:showAsAction="always|collapseActionView"
7+
android:title="Refresh">
8+
</item>
39
<item
410
android:id="@+id/menu_settings"
511
android:orderInCategory="100"
612
android:showAsAction="never"
713
android:title="@string/menu_settings"/>
8-
<item android:id="@+id/item1" android:title="Refresh" android:showAsAction="always|collapseActionView" android:orderInCategory="20"></item>
9-
<item android:id="@+id/item2" android:title="Start" android:orderInCategory="10" android:showAsAction="always"></item>
1014

1115
</menu>

‎com.vogella.android.actionbar.actionprovider/src/com/example/com/vogella/android/actionbar/actionprovider/MainActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
5252
// case R.id.menu_share:
5353
// doShare();
5454
// break;
55-
case R.id.item1:
55+
case R.id.refresh:
5656
// Get the ActionProvider
5757
findItem = item;
5858
MenuItem setActionView = findItem.setActionView(R.layout.progress);

‎com.vogella.android.actionbar.actionview.search/.classpath‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" path="src"/>
4+
<classpathentry kind="src" path="gen"/>
5+
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
6+
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
7+
<classpathentry kind="output" path="bin/classes"/>
8+
</classpath>

‎com.vogella.android.actionbar.actionview.search/.project‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>com.vogella.android.actionbar.actionview.search</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
<buildCommand>
19+
<name>org.eclipse.jdt.core.javabuilder</name>
20+
<arguments>
21+
</arguments>
22+
</buildCommand>
23+
<buildCommand>
24+
<name>com.android.ide.eclipse.adt.ApkBuilder</name>
25+
<arguments>
26+
</arguments>
27+
</buildCommand>
28+
</buildSpec>
29+
<natures>
30+
<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
31+
<nature>org.eclipse.jdt.core.javanature</nature>
32+
</natures>
33+
</projectDescription>

‎com.vogella.android.actionbar.actionview.search/AndroidManifest.xml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
package="com.vogella.android.actionbar.actionview.search"
4+
android:versionCode="1"
5+
android:versionName="1.0" >
6+
7+
<uses-sdk
8+
android:minSdkVersion="17"
9+
android:targetSdkVersion="17" />
10+
11+
<application
12+
android:allowBackup="true"
13+
android:icon="@drawable/ic_launcher"
14+
android:label="@string/app_name"
15+
android:theme="@style/AppTheme" >
16+
17+
<activity android:name="SearchResultActivity" >
18+
<intent-filter>
19+
<action android:name="android.intent.action.SEARCH" />
20+
</intent-filter>
21+
22+
<meta-data
23+
android:name="android.app.searchable"
24+
android:resource="@xml/search" />
25+
</activity>
26+
<activity
27+
android:name="com.vogella.android.actionbar.actionview.search.MainActivity"
28+
android:label="@string/app_name" >
29+
<intent-filter>
30+
<action android:name="android.intent.action.MAIN" />
31+
32+
<category android:name="android.intent.category.LAUNCHER" />
33+
</intent-filter>
34+
35+
<meta-data
36+
android:name="android.app.default_searchable"
37+
android:value=".SearchResultActivity" />
38+
</activity>
39+
40+
</application>
41+
42+
</manifest>

‎com.vogella.android.actionbar.actionview.search/ic_launcher-web.png‎

19 KB
Loading

‎com.vogella.android.actionbar.actionview.search/libs/android-support-v4.jar‎

384 KB
Binary file not shown.

0 commit comments

Comments
 (0)