mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-25 14:35:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

Keep screen on & close bottom sheet

Browse source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-01-25 15:46:37 +01:00
parent 30aea14646
commit f08b8e63bb
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java
View file

@ -206,6 +206,7 @@ public class CallMenuController extends BaseController implements FlexibleAdapte
Intent intent = new Intent(shareIntent);
intent.setComponent(new ComponentName(appItem.getPackageName(), appItem.getName()));
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
eventBus.post(new BottomSheetLockEvent(true, 0, false));
getActivity().startActivity(intent);
} else {
bundle.putInt(BundleKeys.KEY_OPERATION_CODE, 7);

1
app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java
View file

@ -118,6 +118,7 @@ public class EntryMenuController extends BaseController {
intent.setComponent(new ComponentName(packageName, name));
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
getActivity().startActivity(intent);
eventBus.post(new BottomSheetLockEvent(true, 0, false));
}
}
}

5
app/src/main/res/layout/controller_server_selection.xml
View file

@ -73,6 +73,7 @@
android:indeterminate="true"
android:indeterminateTint="@color/nc_white_color_complete"
android:indeterminateTintMode="src_in"
android:keepScreenOn="true"
android:visibility="invisible"/>
<TextView
@ -81,12 +82,12 @@
android:layout_height="wrap_content"
android:layout_below="@id/progress_bar"
android:layout_centerHorizontal="true"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginTop="56dp"
android:lines="2"
android:text="@string/nc_get_from_provider"
android:textAlignment="center"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginStart="@dimen/activity_horizontal_margin"
android:textAllCaps="true"
android:textColor="@color/nc_light_blue_color"/>