Permalink
Browse files

Merge pull request #7364 from riking/android-reformat

Reformat all Android code
  • Loading branch information...
delroth committed Aug 27, 2018
2 parents 0d4a28d + 248ee12 commit b1889fc7854a204f7b4c687747a44590ca0f4566
Showing with 11,840 additions and 11,060 deletions.
  1. +2 −1 Source/Android/app/build.gradle
  2. +18 −16 Source/Android/app/src/main/AndroidManifest.xml
  3. +9 −9 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/DolphinApplication.java
  4. +444 −435 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
  5. +112 −109 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/AppLinkActivity.java
  6. +13 −12 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/CustomFilePickerActivity.java
  7. +836 −791 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
  8. +192 −183 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java
  9. +124 −115 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameRowPresenter.java
  10. +45 −45 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/PlatformPagerAdapter.java
  11. +24 −24 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/SettingsRowPresenter.java
  12. +45 −46 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java
  13. +205 −201 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/MotionAlertDialog.java
  14. +19 −19 ...e/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.java
  15. +19 −19 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/FloatSetting.java
  16. +36 −36 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.java
  17. +31 −33 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Setting.java
  18. +52 −52 ...e/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/SettingSection.java
  19. +143 −137 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java
  20. +19 −19 ...ce/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/StringSetting.java
  21. +43 −42 ...oid/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/CheckBoxSetting.java
  22. +9 −9 ...droid/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/HeaderSetting.java
  23. +40 −40 ...app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/InputBindingSetting.java
  24. +80 −84 ...ndroid/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/SettingsItem.java
  25. +69 −67 ...app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/SingleChoiceSetting.java
  26. +100 −99 ...droid/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/SliderSetting.java
  27. +73 −68 ...c/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/StringSingleChoiceSetting.java
  28. +16 −15 ...roid/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/SubmenuSetting.java
  29. +95 −95 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/MenuTag.java
  30. +239 −238 ...ce/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.java
  31. +148 −145 ...d/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityPresenter.java
  32. +122 −122 ...ndroid/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityView.java
  33. +398 −387 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.java
  34. +168 −165 ...ce/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragment.java
  35. +1,337 −941 ...d/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java
  36. +74 −74 ...ndroid/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentView.java
  37. +44 −44 ...Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFrameLayout.java
  38. +32 −32 ...ain/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/CheckBoxSettingViewHolder.java
  39. +21 −21 ...app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/HeaderViewHolder.java
  40. +28 −28 ...java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/InputBindingSettingViewHolder.java
  41. +42 −41 ...pp/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/SettingViewHolder.java
  42. +42 −42 ...c/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/SingleChoiceViewHolder.java
  43. +35 −35 ...app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/SliderViewHolder.java
  44. +35 −35 ...pp/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/SubmenuViewHolder.java
  45. +583 −562 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java
  46. +9 −9 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/CustomFilePickerFragment.java
  47. +434 −429 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java
  48. +55 −49 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/MenuFragment.java
  49. +100 −82 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/SaveLoadStateFragment.java
  50. +49 −43 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameFile.java
  51. +82 −76 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameFileCache.java
  52. +45 −45 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/HomeScreenChannel.java
  53. +21 −21 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/TvSettingsItem.java
  54. +1,117 −984 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java
  55. +115 −113 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableButton.java
  56. +184 −179 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableDpad.java
  57. +227 −216 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableJoystick.java
  58. +193 −185 .../Android/app/src/main/java/org/dolphinemu/dolphinemu/services/DirectoryInitializationService.java
  59. +113 −113 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/GameFileCacheService.java
  60. +139 −138 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/SyncChannelJobService.java
  61. +134 −136 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/SyncProgramsJobService.java
  62. +10 −5 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/USBPermService.java
  63. +137 −137 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/DividerItemDecoration.java
  64. +6 −6 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/NVidiaShieldWorkaroundView.java
  65. +52 −50 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/CustomTitleView.java
  66. +209 −204 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java
  67. +97 −97 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java
  68. +20 −20 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainView.java
  69. +255 −247 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java
  70. +42 −40 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/platform/Platform.java
  71. +74 −77 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/platform/PlatformGamesFragment.java
  72. +18 −22 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/platform/PlatformGamesView.java
  73. +97 −94 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Analytics.java
  74. +18 −18 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Animations.java
  75. +146 −146 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/AppLinkHelper.java
  76. +15 −15 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/BiMap.java
  77. +52 −45 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/ControllerMappingHelper.java
  78. +66 −67 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/CoverHelper.java
  79. +15 −11 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/DirectoryStateReceiver.java
  80. +362 −363 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/EGLHelper.java
  81. +36 −34 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/FileBrowserHelper.java
  82. +139 −130 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_GCAdapter.java
  83. +144 −141 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_WiimoteAdapter.java
  84. +41 −41 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Log.java
  85. +55 −45 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/PermissionsHandler.java
  86. +101 −94 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/PicassoUtils.java
  87. +51 −51 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/StartupHandler.java
  88. +210 −211 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/TvUtil.java
  89. +10 −10 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/VolleyUtil.java
  90. +10 −10 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/FileViewHolder.java
  91. +12 −12 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/GameViewHolder.java
  92. +10 −10 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/TvGameViewHolder.java
  93. +9 −9 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/TvSettingsViewHolder.java
  94. +12 −12 Source/Android/app/src/main/res/animator/menu_slide_out_to_left.xml
  95. +12 −12 Source/Android/app/src/main/res/animator/menu_slide_out_to_right.xml
  96. +2 −2 Source/Android/app/src/main/res/drawable/tv_card_background_gamecube.xml
  97. +2 −2 Source/Android/app/src/main/res/drawable/tv_card_background_wii.xml
  98. +2 −2 Source/Android/app/src/main/res/drawable/tv_card_background_wiiware.xml
  99. +5 −5 Source/Android/app/src/main/res/layout-television/fragment_emulation.xml
  100. +7 −7 Source/Android/app/src/main/res/layout/fragment_saveload_state.xml
  101. +1 −1 Source/Android/app/src/main/res/values/styles.xml
  102. +0 −4 Source/Android/gradle.properties
@@ -67,7 +67,8 @@ android {
defaultConfig {
externalNativeBuild {
cmake {
arguments "-DANDROID_STL=c++_static", "-DCMAKE_BUILD_TYPE=RelWithDebInfo" // , "-DENABLE_GENERIC=ON"
arguments "-DANDROID_STL=c++_static", "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
// , "-DENABLE_GENERIC=ON"
abiFilters "arm64-v8a", "x86_64" //, "armeabi-v7a", "x86"
}
}
@@ -11,13 +11,13 @@
android:name="android.software.leanback"
android:required="false"/>
<uses-feature android:glEsVersion="0x00030000" />
<uses-feature android:glEsVersion="0x00030000"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="com.android.providers.tv.permission.READ_EPG_DATA" />
<uses-permission android:name="com.android.providers.tv.permission.WRITE_EPG_DATA" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="com.android.providers.tv.permission.READ_EPG_DATA"/>
<uses-permission android:name="com.android.providers.tv.permission.WRITE_EPG_DATA"/>
<application
android:name=".DolphinApplication"
@@ -27,7 +27,9 @@
android:supportsRtl="true"
android:isGame="true"
android:banner="@drawable/banner_tv">
<meta-data android:name="android.max_aspect" android:value="2.1" />
<meta-data
android:name="android.max_aspect"
android:value="2.1"/>
<activity
android:name=".ui.main.MainActivity"
@@ -67,18 +69,18 @@
android:label="@string/app_name"
android:theme="@style/FilePickerTheme">
<intent-filter>
<action android:name="android.intent.action.GET_CONTENT" />
<category android:name="android.intent.category.DEFAULT" />
<action android:name="android.intent.action.GET_CONTENT"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
<activity android:name=".activities.AppLinkActivity" >
<activity android:name=".activities.AppLinkActivity">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
<data
android:host="@string/host"
android:scheme="@string/scheme" />
android:scheme="@string/scheme"/>
</intent-filter>
</activity>
@@ -87,11 +89,11 @@
<service
android:name=".services.SyncChannelJobService"
android:exported="false"
android:permission="android.permission.BIND_JOB_SERVICE" />
android:permission="android.permission.BIND_JOB_SERVICE"/>
<service
android:name=".services.SyncProgramsJobService"
android:exported="false"
android:permission="android.permission.BIND_JOB_SERVICE" />
android:permission="android.permission.BIND_JOB_SERVICE"/>
<provider
android:name="android.support.v4.content.FileProvider"
@@ -100,7 +102,7 @@
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/nnf_provider_paths" />
android:resource="@xml/nnf_provider_paths"/>
</provider>
</application>
@@ -8,15 +8,15 @@
public class DolphinApplication extends Application
{
@Override
public void onCreate()
{
super.onCreate();
@Override
public void onCreate()
{
super.onCreate();
VolleyUtil.init(getApplicationContext());
System.loadLibrary("main");
VolleyUtil.init(getApplicationContext());
System.loadLibrary("main");
if (PermissionsHandler.hasWriteAccess(getApplicationContext()))
DirectoryInitializationService.startService(getApplicationContext());
}
if (PermissionsHandler.hasWriteAccess(getApplicationContext()))
DirectoryInitializationService.startService(getApplicationContext());
}
}
Oops, something went wrong.

0 comments on commit b1889fc

Please sign in to comment.