Skip to content

Commit

Permalink
fix lint err
Browse files Browse the repository at this point in the history
  • Loading branch information
wysaid committed May 5, 2024
1 parent f77f3e4 commit 444811d
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 7 deletions.
6 changes: 4 additions & 2 deletions cgeDemo/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<manifest xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.CAMERA" />
Expand All @@ -12,7 +13,8 @@
<permission
android:name="android.permission.FLASHLIGHT"
android:permissionGroup="android.permission-group.HARDWARE_CONTROLS"
android:protectionLevel="normal" />
android:protectionLevel="normal"
tools:ignore="ReservedSystemPermission" />

<application
android:allowBackup="true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ public void galleryBtnClicked(View view) {

@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
switch (requestCode) {
case REQUEST_CODE_PICK_IMAGE:
if (resultCode == RESULT_OK) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public void run() {
});
}

public static class MyButtons extends Button {
public static class MyButtons extends androidx.appcompat.widget.AppCompatButton {

public String filterConfig;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ protected void onResume() {
}

public void onActivityResult(final int requestCode, final int resultCode, final Intent data) {
super.onActivityResult(requestCode, resultCode, data);
switch (requestCode) {
case REQUEST_CODE_PICK_IMAGE:
if (resultCode == RESULT_OK) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ public void onClick(final android.view.View view) {
};

public void onActivityResult(final int requestCode, final int resultCode, final Intent data) {
super.onActivityResult(requestCode, resultCode, data);
switch (requestCode) {
case REQUEST_CODE_PICK_IMAGE:
if (resultCode == RESULT_OK) {
Expand Down
2 changes: 1 addition & 1 deletion cgeDemo/src/main/java/org/wysaid/cgeDemo/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ public static class DemoClassDescription {
new DemoClassDescription("TestCaseActivity", "Test Cases")
};

public class DemoButton extends Button implements View.OnClickListener {
public class DemoButton extends androidx.appcompat.widget.AppCompatButton implements View.OnClickListener {
private DemoClassDescription mDemo;

public void setDemo(DemoClassDescription demo) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public boolean playFailed(MediaPlayer player, final int what, final int extra) {
}
};

class MyVideoButton extends Button implements View.OnClickListener {
class MyVideoButton extends androidx.appcompat.widget.AppCompatButton implements View.OnClickListener {

Uri videoUri;
SimplePlayerGLSurfaceView videoView;
Expand Down Expand Up @@ -315,6 +315,7 @@ public void onClick(final android.view.View view) {
};

public void onActivityResult(final int requestCode, final int resultCode, final Intent data) {
super.onActivityResult(requestCode, resultCode, data);
switch (requestCode) {
case REQUEST_CODE_PICK_VIDEO:
if (resultCode == RESULT_OK) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public boolean playFailed(MediaPlayer player, final int what, final int extra) {
}
};

class MyVideoButton extends Button implements View.OnClickListener {
class MyVideoButton extends androidx.appcompat.widget.AppCompatButton implements View.OnClickListener {

Uri videoUri;
VideoPlayerGLSurfaceView videoView;
Expand Down Expand Up @@ -266,6 +266,7 @@ public void onClick(final android.view.View view) {
};

public void onActivityResult(final int requestCode, final int resultCode, final Intent data) {
super.onActivityResult(requestCode, resultCode, data);
switch (requestCode) {
case REQUEST_CODE_PICK_VIDEO:
if (resultCode == RESULT_OK) {
Expand Down
6 changes: 5 additions & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ include ':library', ':cgeDemo'

def pFile = new File(settingsDir, 'local.properties')
Properties properties = new Properties()
properties.load(pFile.newDataInputStream())

/// if the local.properties file does not exist, create it.
if (pFile.exists()) {
properties.load(pFile.newDataInputStream())
}

if (properties.getProperty('usingCMakeCompile', null) == null) {
pFile.append('\nusingCMakeCompile=false\n')
Expand Down

0 comments on commit 444811d

Please sign in to comment.