Skip to content

Commit c8d2fd1

Browse files
committed
support custom android.jar
1 parent 6a16f9d commit c8d2fd1

File tree

345 files changed

+271
-7499
lines changed

Some content is hidden

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

345 files changed

+271
-7499
lines changed

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

androidlogcat/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
android:launchMode="singleTop">
1717
<meta-data
1818
android:name="android.app.shortcuts"
19-
android:resource="@xml/shortcuts"/>
19+
android:resource="@xml/logcat_shortcuts"/>
2020
</activity>
2121

2222
<activity android:name=".ui.RecordLogDialogActivity"/>

androidlogcat/src/main/java/com/pluscubed/logcat/ui/SettingsActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public static class SettingsFragment extends PreferenceFragment implements OnPre
9797
@Override
9898
public void onCreate(Bundle savedInstanceState) {
9999
super.onCreate(savedInstanceState);
100-
addPreferencesFromResource(R.xml.settings);
100+
addPreferencesFromResource(R.xml.logcat_settings);
101101

102102
setUpPreferences();
103103
}

androidlogcat/src/main/res/xml/settings.xml renamed to androidlogcat/src/main/res/xml/logcat_settings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929

3030
<PreferenceCategory android:title="@string/pref_cat_configuration">
3131

32-
<!-- TODO: Switch to MultiSelectListPreference-->
3332
<com.pluscubed.logcat.widget.MultipleChoicePreference
3433
android:defaultValue="@string/pref_buffer_choice_main_value"
3534
android:entries="@array/pref_buffer_choices"

app/src/main/assets/android-21/appcompat-v7-21.0.0/AndroidManifest.xml

Lines changed: 0 additions & 17 deletions
This file was deleted.

app/src/main/assets/android-21/appcompat-v7-21.0.0/R.txt

Lines changed: 0 additions & 938 deletions
This file was deleted.
-2.12 KB
Binary file not shown.
-504 KB
Binary file not shown.

0 commit comments

Comments
 (0)