mirror of
https://github.com/nextcloud/android.git
synced 2024-11-27 09:39:25 +03:00
layout fixes after rebase
This commit is contained in:
parent
220de2fef3
commit
7ff136854b
2 changed files with 2 additions and 11 deletions
|
@ -18,7 +18,6 @@
|
|||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
-->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:id="@+id/upload_files_layout"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
|
@ -27,15 +26,7 @@
|
|||
<include
|
||||
layout="@layout/toolbar_standard" />
|
||||
|
||||
<TextView android:layout_width="fill_parent"
|
||||
android:text="@string/uploader_top_message"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/drawer_username"
|
||||
android:textColor="@android:color/black"
|
||||
android:gravity="center_horizontal">
|
||||
</TextView>
|
||||
|
||||
<FrameLayout android:layout_height="fill_parent"
|
||||
<FrameLayout android:layout_height="0dp"
|
||||
android:layout_width="fill_parent"
|
||||
android:id="@+id/frameLayout1"
|
||||
android:layout_weight="1">
|
||||
|
|
|
@ -386,7 +386,7 @@ public class ReceiveExternalFilesActivity extends FileActivity
|
|||
|
||||
String current_dir = mParents.peek();
|
||||
if (current_dir.equals("")) {
|
||||
actionBar.setTitle(getString(R.string.default_display_name_for_root_folder));
|
||||
actionBar.setTitle(getString(R.string.uploader_top_message));
|
||||
} else {
|
||||
actionBar.setTitle(current_dir);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue