File tree Expand file tree Collapse file tree 12 files changed +9
-24
lines changed
aapt_friendly_merged_manifests/debug/aapt
incremental/packageDebugResources
manifest_merge_blame_file/debug
packaged_res/debug/values-de Expand file tree Collapse file tree 12 files changed +9
-24
lines changed Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ android {
55
66
77 defaultConfig {
8- minSdkVersion 22
8+ minSdkVersion 23
99 targetSdkVersion 28
1010 versionCode 1
1111 versionName " 1.0"
Original file line number Diff line number Diff line change 55 android : versionName =" 1.0" >
66
77 <uses-sdk
8- android : minSdkVersion =" 22 "
8+ android : minSdkVersion =" 23 "
99 android : targetSdkVersion =" 28" />
1010
1111 <uses-permission android : name =" android.permission.READ_EXTERNAL_STORAGE" />
Original file line number Diff line number Diff line change 1- # Sun Oct 03 14:05:04 CEST 2021
1+ # Sun Oct 03 14:34:21 CEST 2021
22/media/berthold/Bertholds\ Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res/drawable/document.png =/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/build/intermediates/packaged_res/debug/drawable/document.png
33/media/berthold/Bertholds\ Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res/layout/activity_file_chooser.xml =/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/build/intermediates/packaged_res/debug/layout/activity_file_chooser.xml
44/media/berthold/Bertholds\ Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res/drawable/camera.png =/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/build/intermediates/packaged_res/debug/drawable/camera.png
Original file line number Diff line number Diff line change 11<?xml version =" 1.0" encoding =" utf-8" ?>
22<resources >
3- <string name =" activity_name" >Dateiauswahl</string >
3+ <string name =" activity_name" >Dateiauswahl 1.0 </string >
44</resources >
Load Diff This file was deleted.
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 11<?xml version =" 1.0" encoding =" utf-8" ?>
2- <merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res"/><source path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/build/generated/res/rs/debug"/><source path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res"><file name="camera" path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res/drawable/camera.png" qualifiers="" type="drawable"/><file name="document" path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res/drawable/document.png" qualifiers="" type="drawable"/><file name="ic_delete_forever_black_24dp" path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res/drawable/ic_delete_forever_black_24dp.png" qualifiers="" type="drawable"/><file name="ic_search_black_24dp" path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res/drawable/ic_search_black_24dp.png" qualifiers="" type="drawable"/><file name="nopicture" path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res/drawable/nopicture.png" qualifiers="" type="drawable"/><file name="openfolder" path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res/drawable/openfolder.png" qualifiers="" type="drawable"/><file name="activity_file_chooser" path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res/layout/activity_file_chooser.xml" qualifiers="" type="layout"/><file name="file_list_active_entry" path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res/layout/file_list_active_entry.xml" qualifiers="" type="layout"/><file name="fragment_dialog_show_file_info" path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res/layout/fragment_dialog_show_file_info.xml" qualifiers="" type="layout"/><file name="menu_file_chooser" path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res/menu/menu_file_chooser.xml" qualifiers="" type="menu"/><file path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res/values/colors.xml" qualifiers=""><color name="colorLightGrey">#888888</color><color name="colorPrimary">#008577</color><color name="colorPrimaryDark">#00574B</color><color name="colorAccent">#D81B60</color></file><file path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res/values/dimens.xml" qualifiers=""><dimen name="activity_horizontal_margin">16dp</dimen><dimen name="activity_vertical_margin">16dp</dimen><dimen name="fab_margin">16dp</dimen></file><file path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res/values/strings.xml" qualifiers=""><string name="activity_name">Dateiauswahl</string></file><file path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res/values-de/strings.xml" qualifiers="de"><string name="activity_name">Dateiauswahl</string></file><file path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res/values-en/strings.xml" qualifiers="en"><string name="activity_name">Select file</string></file></source><source path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/build/generated/res/rs/debug"/><source path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/debug/res"/></dataSet><mergedItems/></merger>
2+ <merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res"/><source path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/build/generated/res/rs/debug"/><source path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res"><file name="camera" path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res/drawable/camera.png" qualifiers="" type="drawable"/><file name="document" path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res/drawable/document.png" qualifiers="" type="drawable"/><file name="ic_delete_forever_black_24dp" path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res/drawable/ic_delete_forever_black_24dp.png" qualifiers="" type="drawable"/><file name="ic_search_black_24dp" path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res/drawable/ic_search_black_24dp.png" qualifiers="" type="drawable"/><file name="nopicture" path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res/drawable/nopicture.png" qualifiers="" type="drawable"/><file name="openfolder" path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res/drawable/openfolder.png" qualifiers="" type="drawable"/><file name="activity_file_chooser" path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res/layout/activity_file_chooser.xml" qualifiers="" type="layout"/><file name="file_list_active_entry" path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res/layout/file_list_active_entry.xml" qualifiers="" type="layout"/><file name="fragment_dialog_show_file_info" path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res/layout/fragment_dialog_show_file_info.xml" qualifiers="" type="layout"/><file name="menu_file_chooser" path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res/menu/menu_file_chooser.xml" qualifiers="" type="menu"/><file path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res/values/colors.xml" qualifiers=""><color name="colorLightGrey">#888888</color><color name="colorPrimary">#008577</color><color name="colorPrimaryDark">#00574B</color><color name="colorAccent">#D81B60</color></file><file path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res/values/dimens.xml" qualifiers=""><dimen name="activity_horizontal_margin">16dp</dimen><dimen name="activity_vertical_margin">16dp</dimen><dimen name="fab_margin">16dp</dimen></file><file path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res/values/strings.xml" qualifiers=""><string name="activity_name">Dateiauswahl</string></file><file path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res/values-de/strings.xml" qualifiers="de"><string name="activity_name">Dateiauswahl 1.0</string></file><file path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/res/values-en/strings.xml" qualifiers="en"><string name="activity_name">Select file</string></file></source><source path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/build/generated/res/rs/debug"/><source path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/debug/res"/></dataSet><mergedItems/></merger>
Original file line number Diff line number Diff line change 55 android : versionName =" 1.0" >
66
77 <uses-sdk
8- android : minSdkVersion =" 22 "
8+ android : minSdkVersion =" 23 "
99 android : targetSdkVersion =" 28" />
1010
1111 <uses-permission android : name =" android.permission.READ_EXTERNAL_STORAGE" />
Original file line number Diff line number Diff line change 555 android:versionName="1.0" >
666
777 <uses-sdk
8- 8 android:minSdkVersion="22 "
8+ 8 android:minSdkVersion="23 "
998-->/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/AndroidManifest.xml
10109 android:targetSdkVersion="28" />
11119-->/media/berthold/Bertholds Zeug/NFSShare/myCode/AndroidStudioProjects/MyApps/FileDialogTool/filedialogtool/src/main/AndroidManifest.xml
You can’t perform that action at this time.
0 commit comments