Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5cf55a6f authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge branch '835-master-tiles' into 'master' 

camera: Start an activity while collapsing the panel

See merge request !53
parents b5a2de5f 67b018f9

app/src/main/java/net/sourceforge/opencamera/MyTileService.java

+1 −1
Original line number Diff line number Diff line
@@ -46,6 +46,6 @@ public class MyTileService extends TileService { 
        Intent intent = new Intent(this, MainActivity.class);

        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);

        intent.setAction(TILE_ID);

        startActivity(intent);

        startActivityAndCollapse(intent);

    }

}

app/src/main/java/net/sourceforge/opencamera/MyTileServiceFrontCamera.java

+1 −1
Original line number Diff line number Diff line
@@ -46,6 +46,6 @@ public class MyTileServiceFrontCamera extends TileService { 
        Intent intent = new Intent(this, MainActivity.class);

        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);

        intent.setAction(TILE_ID);

        startActivity(intent);

        startActivityAndCollapse(intent);

    }

}

app/src/main/java/net/sourceforge/opencamera/MyTileServiceVideo.java

+1 −1
Original line number Diff line number Diff line
@@ -46,6 +46,6 @@ public class MyTileServiceVideo extends TileService { 
        Intent intent = new Intent(this, MainActivity.class);

        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);

        intent.setAction(TILE_ID);

        startActivity(intent);

        startActivityAndCollapse(intent);

    }

}