mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make most internal activities non-exported by removing uneeded intent-filter

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@3008 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2014-01-01 13:56:34 +00:00
parent caa4ee02d5
commit a0fcecfc96
3 changed files with 19 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
android/AndroidManifest.xml
View file

@ -101,8 +101,7 @@
</activity>
<activity android:name=".PreferencesActivity"
android:label="@string/preferences_name"
android:stateNotNeeded="true">
</activity>
android:stateNotNeeded="true"/>
<activity android:name=".encode.EncodeActivity"
android:stateNotNeeded="true">
<intent-filter>
@ -142,36 +141,16 @@
</activity>
<activity android:name=".history.HistoryActivity"
android:label="@string/history_title"
android:stateNotNeeded="true">
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
android:stateNotNeeded="true"/>
<activity android:name=".share.BookmarkPickerActivity"
android:label="@string/bookmark_picker_name"
android:stateNotNeeded="true">
<intent-filter>
<action android:name="android.intent.action.PICK"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
android:stateNotNeeded="true"/>
<activity android:name=".share.AppPickerActivity"
android:label="@string/app_picker_name"
android:stateNotNeeded="true"
android:configChanges="orientation">
<intent-filter>
<action android:name="android.intent.action.PICK"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
android:stateNotNeeded="true"/>
<activity android:name=".HelpActivity"
android:screenOrientation="user">
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
android:label="@string/menu_help"
android:screenOrientation="user"/>
</application>
</manifest>

5
android/gen/R.java.d
View file

@ -60,4 +60,9 @@
/Users/srowen/Documents/ZXing/android/res/values-zh-rCN/strings.xml \
/Users/srowen/Documents/ZXing/android/res/values-zh-rTW/strings.xml \
/Users/srowen/Documents/ZXing/android/res/xml/preferences.xml \
/Users/srowen/Documents/ZXing/android/bin/res/drawable/launcher_icon.png \
/Users/srowen/Documents/ZXing/android/bin/res/drawable/share_via_barcode.png \
/Users/srowen/Documents/ZXing/android/bin/res/drawable-hdpi/launcher_icon.png \
/Users/srowen/Documents/ZXing/android/bin/res/drawable-xhdpi/launcher_icon.png \
/Users/srowen/Documents/ZXing/android/bin/res/drawable-xxhdpi/launcher_icon.png \
/Users/srowen/Documents/ZXing/android/bin/AndroidManifest.xml \

9
android/src/com/google/zxing/client/android/PreferencesActivity.java
View file

@ -54,7 +54,14 @@ public final class PreferencesActivity extends Activity {
protected void onCreate(Bundle icicle) {
super.onCreate(icicle);
getFragmentManager().beginTransaction().replace(android.R.id.content, new PreferencesFragment()).commit();
}
// Apparently this will be necessary when targeting API 19+:
/*
@Override
protected boolean isValidFragment(String fragmentName) {
return true;
}
*/
}