diff options
| author | Jorge Ruesga <jorge@ruesga.com> | 2012-11-04 02:04:54 +0100 |
|---|---|---|
| committer | DvTonder <david.vantonder@gmail.com> | 2012-11-04 09:33:49 -0500 |
| commit | b0601629d55fb1da6a4241442a66058d87c18321 (patch) | |
| tree | 4006084798850688d5901733b4af56b4da301f45 /res | |
| parent | 4e9f8bb0ddecaf81a4226534d4c8b488a19d1044 (diff) | |
| download | android_packages_apps_CMFileManager-b0601629d55fb1da6a4241442a66058d87c18321.tar.gz android_packages_apps_CMFileManager-b0601629d55fb1da6a4241442a66058d87c18321.tar.bz2 android_packages_apps_CMFileManager-b0601629d55fb1da6a4241442a66058d87c18321.zip | |
CMFileManager : Allow rotation
Override onConfigurationChanged to help keep the state
intact and allow orientation change.
Patchset 2 : Override for other activities as well
Patchset 3 : Fixed scrollbars dialogs
Patchset 4 : Fixed landscape mode of picker activity
Patchset 5 : New landscape layout for NavigationActivity
Patchset 6 : Fix whitespace errors in copyright headers
Change-Id: Ibe52f0a0ebf0ea88d79dab1c8a06fb262d63ecb1
Diffstat (limited to 'res')
48 files changed, 1284 insertions, 1246 deletions
diff --git a/res/layout/associations_dialog.xml b/res/layout/associations_dialog.xml index 99fb003c..11cf0ed8 100644 --- a/res/layout/associations_dialog.xml +++ b/res/layout/associations_dialog.xml @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License. ---> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/res/layout/associations_item.xml b/res/layout/associations_item.xml index 857098fd..8299b437 100644 --- a/res/layout/associations_item.xml +++ b/res/layout/associations_item.xml @@ -1,19 +1,19 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
---> +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="@dimen/grid_width" android:layout_height="wrap_content" diff --git a/res/layout/bookmarks.xml b/res/layout/bookmarks.xml index f2a0854a..5ae41a9c 100644 --- a/res/layout/bookmarks.xml +++ b/res/layout/bookmarks.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
--> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent"> diff --git a/res/layout/bookmarks_item.xml b/res/layout/bookmarks_item.xml index 393903cf..f1c7acca 100644 --- a/res/layout/bookmarks_item.xml +++ b/res/layout/bookmarks_item.xml @@ -1,19 +1,19 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
---> +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="@dimen/default_row_height" diff --git a/res/layout/breadcrumb_item.xml b/res/layout/breadcrumb_item.xml index fc33af0d..472aaf66 100644 --- a/res/layout/breadcrumb_item.xml +++ b/res/layout/breadcrumb_item.xml @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License. ---> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <com.cyanogenmod.filemanager.ui.widgets.BreadcrumbItem xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/breadcrumb_item" diff --git a/res/layout/breadcrumb_item_divider.xml b/res/layout/breadcrumb_item_divider.xml index 296e01ea..fd446eda 100644 --- a/res/layout/breadcrumb_item_divider.xml +++ b/res/layout/breadcrumb_item_divider.xml @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
---> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <ImageView xmlns:android="http://schemas.android.com/apk/res/android" style="@style/breadcrumb_elemement" android:layout_width="wrap_content" diff --git a/res/layout/breadcrumb_view.xml b/res/layout/breadcrumb_view.xml index 7ebdb50e..cc59d195 100644 --- a/res/layout/breadcrumb_view.xml +++ b/res/layout/breadcrumb_view.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
--> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/breadcrumb_view" android:layout_width="match_parent" diff --git a/res/layout/dialog_message.xml b/res/layout/dialog_message.xml index 2a43a02b..69abae38 100644 --- a/res/layout/dialog_message.xml +++ b/res/layout/dialog_message.xml @@ -1,21 +1,23 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
--> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" > +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:scrollbars="vertical"> <TextView android:id="@+id/dialog_message" @@ -26,4 +28,4 @@ android:textAppearance="@style/primary_text_appearance" android:textStyle="normal" /> -</LinearLayout>
\ No newline at end of file +</ScrollView>
\ No newline at end of file diff --git a/res/layout/dialog_scrolled_message.xml b/res/layout/dialog_scrolled_message.xml deleted file mode 100644 index 46addedc..00000000 --- a/res/layout/dialog_scrolled_message.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
--> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" > - - <ScrollView - android:id="@+id/editor_scroller" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_alignParentLeft="true" - android:layout_alignParentTop="true" - android:layout_alignParentRight="true" - android:layout_alignParentBottom="true" - android:layout_margin="@dimen/extra_large_margin" - android:scrollbars="vertical" - android:fillViewport="true"> - - <TextView - android:id="@+id/dialog_message" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:singleLine="false" - android:gravity="left|top" - android:textAppearance="@style/primary_text_appearance" - android:textStyle="normal" /> - - </ScrollView> - -</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/dialog_title.xml b/res/layout/dialog_title.xml index 58bb9b16..67b10b5c 100644 --- a/res/layout/dialog_title.xml +++ b/res/layout/dialog_title.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
--> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="wrap_content" > diff --git a/res/layout/editor.xml b/res/layout/editor.xml index d39dd505..d24f9fbb 100644 --- a/res/layout/editor.xml +++ b/res/layout/editor.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
--> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -25,7 +26,6 @@ android:focusableInTouchMode="true" /> <ScrollView - android:id="@+id/editor_scroller" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_alignParentLeft="true" diff --git a/res/layout/execution_dialog.xml b/res/layout/execution_dialog.xml index 20732449..4831d9c5 100644 --- a/res/layout/execution_dialog.xml +++ b/res/layout/execution_dialog.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
--> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" @@ -90,7 +91,6 @@ <!-- Console --> <ScrollView - android:id="@+id/editor_scroller" android:layout_width="match_parent" android:layout_height="@dimen/console_height" android:layout_margin="@dimen/default_margin" diff --git a/res/layout/filesystem_info_dialog.xml b/res/layout/filesystem_info_dialog.xml index bb4da707..00b5541b 100644 --- a/res/layout/filesystem_info_dialog.xml +++ b/res/layout/filesystem_info_dialog.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
--> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="wrap_content" > @@ -65,173 +66,179 @@ </LinearLayout> <!-- Info --> - <TableLayout + <ScrollView android:id="@+id/filesystem_tab_info" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@id/filesystem_tabs" android:paddingBottom="@dimen/extra_large_margin" android:paddingTop="@dimen/default_margin" - android:shrinkColumns="1" > + android:scrollbars="vertical"> - <!-- Status --> - <TableRow - android:layout_marginLeft="@dimen/extra_large_margin" - android:layout_marginRight="@dimen/extra_large_margin" > + <TableLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:shrinkColumns="1" > - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/default_margin" - android:gravity="left|center_vertical" - android:text="@string/filesystem_info_dialog_status" - android:textAppearance="@style/primary_text_appearance" /> + <!-- Status --> + <TableRow + android:layout_marginLeft="@dimen/extra_large_margin" + android:layout_marginRight="@dimen/extra_large_margin" > - <Switch - android:id="@+id/filesystem_info_status" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:layout_margin="@dimen/default_margin" - android:textOff="@string/mount_point_readonly" - android:textOn="@string/mount_point_readwrite" /> - </TableRow> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="@dimen/default_margin" + android:gravity="left|center_vertical" + android:text="@string/filesystem_info_dialog_status" + android:textAppearance="@style/primary_text_appearance" /> - <!-- Mount Point --> - <TableRow - android:layout_marginLeft="@dimen/extra_large_margin" - android:layout_marginRight="@dimen/extra_large_margin" > + <Switch + android:id="@+id/filesystem_info_status" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_margin="@dimen/default_margin" + android:textOff="@string/mount_point_readonly" + android:textOn="@string/mount_point_readwrite" /> + </TableRow> - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/default_margin" - android:gravity="left|center_vertical" - android:text="@string/filesystem_info_dialog_mount_point" - android:textAppearance="@style/primary_text_appearance" /> + <!-- Mount Point --> + <TableRow + android:layout_marginLeft="@dimen/extra_large_margin" + android:layout_marginRight="@dimen/extra_large_margin" > - <TextView - android:id="@+id/filesystem_info_mount_point" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/default_margin" - android:gravity="left|center_vertical" - android:singleLine="false" - android:textAppearance="@style/secondary_text_appearance" /> - </TableRow> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="@dimen/default_margin" + android:gravity="left|center_vertical" + android:text="@string/filesystem_info_dialog_mount_point" + android:textAppearance="@style/primary_text_appearance" /> - <!-- Device --> - <TableRow - android:layout_marginLeft="@dimen/extra_large_margin" - android:layout_marginRight="@dimen/extra_large_margin" > + <TextView + android:id="@+id/filesystem_info_mount_point" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="@dimen/default_margin" + android:gravity="left|center_vertical" + android:singleLine="false" + android:textAppearance="@style/secondary_text_appearance" /> + </TableRow> - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/default_margin" - android:gravity="left|center_vertical" - android:text="@string/filesystem_info_dialog_device" - android:textAppearance="@style/primary_text_appearance" /> + <!-- Device --> + <TableRow + android:layout_marginLeft="@dimen/extra_large_margin" + android:layout_marginRight="@dimen/extra_large_margin" > - <TextView - android:id="@+id/filesystem_info_device" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/default_margin" - android:gravity="left|center_vertical" - android:singleLine="false" - android:textAppearance="@style/secondary_text_appearance" /> - </TableRow> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="@dimen/default_margin" + android:gravity="left|center_vertical" + android:text="@string/filesystem_info_dialog_device" + android:textAppearance="@style/primary_text_appearance" /> - <!-- Type --> - <TableRow - android:layout_marginLeft="@dimen/extra_large_margin" - android:layout_marginRight="@dimen/extra_large_margin" > + <TextView + android:id="@+id/filesystem_info_device" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="@dimen/default_margin" + android:gravity="left|center_vertical" + android:singleLine="false" + android:textAppearance="@style/secondary_text_appearance" /> + </TableRow> - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/default_margin" - android:gravity="left|top" - android:text="@string/filesystem_info_dialog_type" - android:textAppearance="@style/primary_text_appearance" /> + <!-- Type --> + <TableRow + android:layout_marginLeft="@dimen/extra_large_margin" + android:layout_marginRight="@dimen/extra_large_margin" > - <TextView - android:id="@+id/filesystem_info_type" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/default_margin" - android:gravity="left|center_vertical" - android:singleLine="false" - android:textAppearance="@style/secondary_text_appearance" /> - </TableRow> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="@dimen/default_margin" + android:gravity="left|top" + android:text="@string/filesystem_info_dialog_type" + android:textAppearance="@style/primary_text_appearance" /> - <!-- Options --> - <TableRow - android:layout_marginLeft="@dimen/extra_large_margin" - android:layout_marginRight="@dimen/extra_large_margin" > + <TextView + android:id="@+id/filesystem_info_type" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="@dimen/default_margin" + android:gravity="left|center_vertical" + android:singleLine="false" + android:textAppearance="@style/secondary_text_appearance" /> + </TableRow> - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/default_margin" - android:gravity="left|center_vertical" - android:text="@string/filesystem_info_dialog_options" - android:textAppearance="@style/primary_text_appearance" /> + <!-- Options --> + <TableRow + android:layout_marginLeft="@dimen/extra_large_margin" + android:layout_marginRight="@dimen/extra_large_margin" > - <TextView - android:id="@+id/filesystem_info_options" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/default_margin" - android:gravity="left|center_vertical" - android:singleLine="false" - android:maxLines="5" - android:textAppearance="@style/secondary_text_appearance" /> - </TableRow> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="@dimen/default_margin" + android:gravity="left|center_vertical" + android:text="@string/filesystem_info_dialog_options" + android:textAppearance="@style/primary_text_appearance" /> - <!-- Dump/Pass --> - <TableRow - android:layout_marginLeft="@dimen/extra_large_margin" - android:layout_marginRight="@dimen/extra_large_margin" > + <TextView + android:id="@+id/filesystem_info_options" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="@dimen/default_margin" + android:gravity="left|center_vertical" + android:singleLine="false" + android:maxLines="5" + android:textAppearance="@style/secondary_text_appearance" /> + </TableRow> - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/default_margin" - android:gravity="left|center_vertical" - android:text="@string/filesystem_info_dialog_dump_pass" - android:textAppearance="@style/primary_text_appearance" /> + <!-- Dump/Pass --> + <TableRow + android:layout_marginLeft="@dimen/extra_large_margin" + android:layout_marginRight="@dimen/extra_large_margin" > + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="@dimen/default_margin" + android:gravity="left|center_vertical" + android:text="@string/filesystem_info_dialog_dump_pass" + android:textAppearance="@style/primary_text_appearance" /> + + <TextView + android:id="@+id/filesystem_info_dump_pass" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="@dimen/default_margin" + android:gravity="left|center_vertical" + android:singleLine="false" + android:textAppearance="@style/secondary_text_appearance" /> + </TableRow> + + <!-- Info message --> <TextView - android:id="@+id/filesystem_info_dump_pass" + android:id="@+id/filesystem_info_msg" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="@dimen/default_margin" + android:layout_gravity="center_vertical" + android:layout_marginLeft="@dimen/extra_large_margin" + android:layout_marginRight="@dimen/extra_large_margin" + android:contentDescription="@null" + android:drawableLeft="@drawable/ic_holo_light_fs_warning" + android:drawablePadding="@dimen/default_margin" android:gravity="left|center_vertical" android:singleLine="false" - android:textAppearance="@style/secondary_text_appearance" /> - </TableRow> - - <!-- Info message --> - <TextView - android:id="@+id/filesystem_info_msg" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_marginLeft="@dimen/extra_large_margin" - android:layout_marginRight="@dimen/extra_large_margin" - android:contentDescription="@null" - android:drawableLeft="@drawable/ic_holo_light_fs_warning" - android:drawablePadding="@dimen/default_margin" - android:gravity="left|center_vertical" - android:singleLine="false" - android:background="@drawable/holo_selector" - android:text="@string/filesystem_info_mount_not_allowed_msg" - android:textAppearance="@style/secondary_text_appearance" - android:textSize="@dimen/note_text_size" - android:visibility="gone" /> - </TableLayout> + android:background="@drawable/holo_selector" + android:text="@string/filesystem_info_mount_not_allowed_msg" + android:textAppearance="@style/secondary_text_appearance" + android:textSize="@dimen/note_text_size" + android:visibility="gone" /> + </TableLayout> + </ScrollView> <!-- Disk Usage --> <LinearLayout diff --git a/res/layout/fso_properties_dialog.xml b/res/layout/fso_properties_dialog.xml index ab6f498c..13cd1260 100644 --- a/res/layout/fso_properties_dialog.xml +++ b/res/layout/fso_properties_dialog.xml @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License. ---> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" > @@ -64,239 +64,21 @@ </TableLayout> <!-- Info --> - <TableLayout + <ScrollView android:id="@+id/fso_tab_info" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@id/fso_tabs" android:paddingBottom="@dimen/extra_large_margin" android:paddingTop="@dimen/default_margin" - android:shrinkColumns="1" > - - <!-- Name --> - <TableRow - android:layout_marginLeft="@dimen/extra_large_margin" - android:layout_marginRight="@dimen/extra_large_margin" > - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/default_margin" - android:gravity="left|center_vertical" - android:text="@string/fso_properties_dialog_name" - android:textAppearance="@style/primary_text_appearance" /> - - <TextView - android:id="@+id/fso_properties_name" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/default_margin" - android:gravity="left|center_vertical" - android:singleLine="false" - android:textAppearance="@style/secondary_text_appearance" /> - </TableRow> - - <!-- Parent --> - <TableRow - android:layout_marginLeft="@dimen/extra_large_margin" - android:layout_marginRight="@dimen/extra_large_margin" > - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/default_margin" - android:gravity="left|center_vertical" - android:text="@string/fso_properties_dialog_parent" - android:textAppearance="@style/primary_text_appearance" /> - - <TextView - android:id="@+id/fso_properties_parent" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/default_margin" - android:gravity="left|center_vertical" - android:singleLine="false" - android:maxLines="5" - android:textAppearance="@style/secondary_text_appearance" /> - </TableRow> - - <!-- Type --> - <TableRow - android:layout_marginLeft="@dimen/extra_large_margin" - android:layout_marginRight="@dimen/extra_large_margin" > - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/default_margin" - android:gravity="left|center_vertical" - android:text="@string/fso_properties_dialog_type" - android:textAppearance="@style/primary_text_appearance" /> - - <TextView - android:id="@+id/fso_properties_type" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/default_margin" - android:gravity="left|center_vertical" - android:singleLine="false" - android:textAppearance="@style/secondary_text_appearance" /> - </TableRow> - - <!-- Category --> - <TableRow - android:id="@+id/fso_properties_category_row" - android:layout_marginLeft="@dimen/extra_large_margin" - android:layout_marginRight="@dimen/extra_large_margin" > - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/default_margin" - android:gravity="left|center_vertical" - android:text="@string/fso_properties_dialog_category" - android:textAppearance="@style/primary_text_appearance" /> - - <TextView - android:id="@+id/fso_properties_category" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/default_margin" - android:gravity="left|center_vertical" - android:singleLine="false" - android:textAppearance="@style/secondary_text_appearance" /> - </TableRow> + android:scrollbars="vertical"> - <!-- Link --> - <TableRow - android:id="@+id/fso_properties_link_row" - android:layout_marginLeft="@dimen/extra_large_margin" - android:layout_marginRight="@dimen/extra_large_margin" - android:visibility="gone" > - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/default_margin" - android:gravity="left|center_vertical" - android:text="@string/fso_properties_dialog_link" - android:textAppearance="@style/primary_text_appearance" /> - - <TextView - android:id="@+id/fso_properties_link" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/default_margin" - android:gravity="left|center_vertical" - android:singleLine="false" - android:textAppearance="@style/secondary_text_appearance" /> - </TableRow> - - <!-- Size --> - <TableRow - android:layout_marginLeft="@dimen/extra_large_margin" - android:layout_marginRight="@dimen/extra_large_margin" > - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/default_margin" - android:gravity="left|center_vertical" - android:text="@string/fso_properties_dialog_size" - android:textAppearance="@style/primary_text_appearance" /> - - <TextView - android:id="@+id/fso_properties_size" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/default_margin" - android:gravity="left|center_vertical" - android:singleLine="false" - android:textAppearance="@style/secondary_text_appearance" /> - </TableRow> - - <!-- Contains --> - <TableRow - android:id="@+id/fso_properties_contains_row" - android:layout_marginLeft="@dimen/extra_large_margin" - android:layout_marginRight="@dimen/extra_large_margin" - android:visibility="gone" > - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/default_margin" - android:gravity="left|center_vertical" - android:text="@string/fso_properties_dialog_contains" - android:textAppearance="@style/primary_text_appearance" /> - - <TextView - android:id="@+id/fso_properties_contains" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/default_margin" - android:gravity="left|center_vertical" - android:singleLine="false" - android:textAppearance="@style/secondary_text_appearance" /> - </TableRow> - - <!-- Date --> - <TableRow - android:layout_marginLeft="@dimen/extra_large_margin" - android:layout_marginRight="@dimen/extra_large_margin" > - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/default_margin" - android:gravity="left|center_vertical" - android:text="@string/fso_properties_dialog_date" - android:textAppearance="@style/primary_text_appearance" /> - - <TextView - android:id="@+id/fso_properties_date" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/default_margin" - android:gravity="left|center_vertical" - android:singleLine="false" - android:textAppearance="@style/secondary_text_appearance" /> - </TableRow> - - <!-- Info message --> - <TextView - android:id="@+id/fso_properties_msg" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_marginLeft="@dimen/extra_large_margin" - android:layout_marginRight="@dimen/extra_large_margin" - android:contentDescription="@null" - android:drawableLeft="@drawable/ic_holo_light_fs_warning" - android:drawablePadding="@dimen/default_margin" - android:gravity="left|center_vertical" - android:singleLine="false" - android:text="@null" - android:textAppearance="@style/secondary_text_appearance" - android:textSize="@dimen/note_text_size" - android:visibility="gone" /> - </TableLayout> - - <LinearLayout - android:id="@+id/fso_tab_permissions" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_below="@id/fso_tabs" - android:paddingBottom="@dimen/extra_large_margin" - android:paddingTop="@dimen/default_margin" - android:orientation="vertical" > - - <!-- Owners --> <TableLayout android:layout_width="match_parent" - android:layout_height="wrap_content" > + android:layout_height="wrap_content" + android:shrinkColumns="1" > - <!-- Owner --> + <!-- Name --> <TableRow android:layout_marginLeft="@dimen/extra_large_margin" android:layout_marginRight="@dimen/extra_large_margin" > @@ -306,20 +88,20 @@ android:layout_height="wrap_content" android:layout_margin="@dimen/default_margin" android:gravity="left|center_vertical" - android:text="@string/fso_properties_dialog_owner" + android:text="@string/fso_properties_dialog_name" android:textAppearance="@style/primary_text_appearance" /> - <Spinner - android:id="@+id/fso_properties_owner" - android:layout_width="wrap_content" + <TextView + android:id="@+id/fso_properties_name" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/default_margin" android:gravity="left|center_vertical" - android:spinnerMode="dialog" + android:singleLine="false" android:textAppearance="@style/secondary_text_appearance" /> </TableRow> - <!-- Group --> + <!-- Parent --> <TableRow android:layout_marginLeft="@dimen/extra_large_margin" android:layout_marginRight="@dimen/extra_large_margin" > @@ -329,233 +111,464 @@ android:layout_height="wrap_content" android:layout_margin="@dimen/default_margin" android:gravity="left|center_vertical" - android:text="@string/fso_properties_dialog_group" + android:text="@string/fso_properties_dialog_parent" android:textAppearance="@style/primary_text_appearance" /> - <Spinner - android:id="@+id/fso_properties_group" - android:layout_width="wrap_content" + <TextView + android:id="@+id/fso_properties_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/default_margin" android:gravity="left|center_vertical" - android:spinnerMode="dialog" + android:singleLine="false" + android:maxLines="5" android:textAppearance="@style/secondary_text_appearance" /> </TableRow> - </TableLayout> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="5dp" - android:layout_marginBottom="5dp" > - <include layout="@layout/vertical_divider" /> - </LinearLayout> - - <!-- Permissions --> - <TableLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" > - - <!-- Title --> + <!-- Type --> <TableRow android:layout_marginLeft="@dimen/extra_large_margin" android:layout_marginRight="@dimen/extra_large_margin" > <TextView - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" android:layout_margin="@dimen/default_margin" android:gravity="left|center_vertical" - android:text="@null" + android:text="@string/fso_properties_dialog_type" android:textAppearance="@style/primary_text_appearance" /> <TextView - android:layout_width="0dip" + android:id="@+id/fso_properties_type" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" android:layout_margin="@dimen/default_margin" - android:gravity="center" - android:text="@string/fso_properties_dialog_special" - android:textAppearance="@style/primary_text_appearance" /> + android:gravity="left|center_vertical" + android:singleLine="false" + android:textAppearance="@style/secondary_text_appearance" /> + </TableRow> - <TextView - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_margin="@dimen/default_margin" - android:gravity="center" - android:text="@string/fso_properties_dialog_read" - android:textAppearance="@style/primary_text_appearance" /> + <!-- Category --> + <TableRow + android:id="@+id/fso_properties_category_row" + android:layout_marginLeft="@dimen/extra_large_margin" + android:layout_marginRight="@dimen/extra_large_margin" > <TextView - android:layout_width="0dip" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" android:layout_margin="@dimen/default_margin" - android:gravity="center" - android:text="@string/fso_properties_dialog_write" + android:gravity="left|center_vertical" + android:text="@string/fso_properties_dialog_category" android:textAppearance="@style/primary_text_appearance" /> <TextView - android:layout_width="0dip" + android:id="@+id/fso_properties_category" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" android:layout_margin="@dimen/default_margin" - android:gravity="center" - android:text="@string/fso_properties_dialog_execute" - android:textAppearance="@style/primary_text_appearance" /> + android:gravity="left|center_vertical" + android:singleLine="false" + android:textAppearance="@style/secondary_text_appearance" /> </TableRow> - <!-- Owner --> + <!-- Link --> <TableRow + android:id="@+id/fso_properties_link_row" android:layout_marginLeft="@dimen/extra_large_margin" - android:layout_marginRight="@dimen/extra_large_margin" > + android:layout_marginRight="@dimen/extra_large_margin" + android:visibility="gone" > <TextView - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" android:layout_margin="@dimen/default_margin" android:gravity="left|center_vertical" - android:text="@string/fso_properties_dialog_owner" + android:text="@string/fso_properties_dialog_link" android:textAppearance="@style/primary_text_appearance" /> - <CheckBox - android:id="@+id/fso_permissions_owner_read" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_margin="@dimen/default_margin" /> - - <CheckBox - android:id="@+id/fso_permissions_owner_write" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_margin="@dimen/default_margin" /> - - <CheckBox - android:id="@+id/fso_permissions_owner_execute" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_margin="@dimen/default_margin" /> - - <CheckBox - android:id="@+id/fso_permissions_owner_special" - android:layout_width="0dip" + <TextView + android:id="@+id/fso_properties_link" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_margin="@dimen/default_margin" /> + android:layout_margin="@dimen/default_margin" + android:gravity="left|center_vertical" + android:singleLine="false" + android:textAppearance="@style/secondary_text_appearance" /> </TableRow> - <!-- Group --> + <!-- Size --> <TableRow android:layout_marginLeft="@dimen/extra_large_margin" android:layout_marginRight="@dimen/extra_large_margin" > <TextView - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" android:layout_margin="@dimen/default_margin" android:gravity="left|center_vertical" - android:text="@string/fso_properties_dialog_group" + android:text="@string/fso_properties_dialog_size" android:textAppearance="@style/primary_text_appearance" /> - <CheckBox - android:id="@+id/fso_permissions_group_read" - android:layout_width="0dip" + <TextView + android:id="@+id/fso_properties_size" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_margin="@dimen/default_margin" /> + android:layout_margin="@dimen/default_margin" + android:gravity="left|center_vertical" + android:singleLine="false" + android:textAppearance="@style/secondary_text_appearance" /> + </TableRow> - <CheckBox - android:id="@+id/fso_permissions_group_write" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_margin="@dimen/default_margin" /> + <!-- Contains --> + <TableRow + android:id="@+id/fso_properties_contains_row" + android:layout_marginLeft="@dimen/extra_large_margin" + android:layout_marginRight="@dimen/extra_large_margin" + android:visibility="gone" > - <CheckBox - android:id="@+id/fso_permissions_group_execute" - android:layout_width="0dip" + <TextView + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_margin="@dimen/default_margin" /> + android:layout_margin="@dimen/default_margin" + android:gravity="left|center_vertical" + android:text="@string/fso_properties_dialog_contains" + android:textAppearance="@style/primary_text_appearance" /> - <CheckBox - android:id="@+id/fso_permissions_group_special" - android:layout_width="0dip" + <TextView + android:id="@+id/fso_properties_contains" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_margin="@dimen/default_margin" /> + android:layout_margin="@dimen/default_margin" + android:gravity="left|center_vertical" + android:singleLine="false" + android:textAppearance="@style/secondary_text_appearance" /> </TableRow> - <!-- Others --> + <!-- Date --> <TableRow android:layout_marginLeft="@dimen/extra_large_margin" android:layout_marginRight="@dimen/extra_large_margin" > <TextView - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" android:layout_margin="@dimen/default_margin" android:gravity="left|center_vertical" - android:text="@string/fso_properties_dialog_others" + android:text="@string/fso_properties_dialog_date" android:textAppearance="@style/primary_text_appearance" /> - <CheckBox - android:id="@+id/fso_permissions_others_read" - android:layout_width="0dip" + <TextView + android:id="@+id/fso_properties_date" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_margin="@dimen/default_margin" /> + android:layout_margin="@dimen/default_margin" + android:gravity="left|center_vertical" + android:singleLine="false" + android:textAppearance="@style/secondary_text_appearance" /> + </TableRow> - <CheckBox - android:id="@+id/fso_permissions_others_write" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_margin="@dimen/default_margin" /> + <!-- Info message --> + <TextView + android:id="@+id/fso_properties_msg" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_marginLeft="@dimen/extra_large_margin" + android:layout_marginRight="@dimen/extra_large_margin" + android:contentDescription="@null" + android:drawableLeft="@drawable/ic_holo_light_fs_warning" + android:drawablePadding="@dimen/default_margin" + android:gravity="left|center_vertical" + android:singleLine="false" + android:text="@null" + android:textAppearance="@style/secondary_text_appearance" + android:textSize="@dimen/note_text_size" + android:visibility="gone" /> + </TableLayout> + </ScrollView> - <CheckBox - android:id="@+id/fso_permissions_others_execute" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_margin="@dimen/default_margin" /> + <!-- Permissions --> + <ScrollView + android:id="@+id/fso_tab_permissions" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@id/fso_tabs" + android:paddingBottom="@dimen/extra_large_margin" + android:paddingTop="@dimen/default_margin" + android:scrollbars="vertical"> - <CheckBox - android:id="@+id/fso_permissions_others_special" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_margin="@dimen/default_margin" /> - </TableRow> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > - </TableLayout> + <!-- Owners --> + <TableLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" > + + <!-- Owner --> + <TableRow + android:layout_marginLeft="@dimen/extra_large_margin" + android:layout_marginRight="@dimen/extra_large_margin" > + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="@dimen/default_margin" + android:gravity="left|center_vertical" + android:text="@string/fso_properties_dialog_owner" + android:textAppearance="@style/primary_text_appearance" /> + + <Spinner + android:id="@+id/fso_properties_owner" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="@dimen/default_margin" + android:gravity="left|center_vertical" + android:spinnerMode="dialog" + android:textAppearance="@style/secondary_text_appearance" /> + </TableRow> + + <!-- Group --> + <TableRow + android:layout_marginLeft="@dimen/extra_large_margin" + android:layout_marginRight="@dimen/extra_large_margin" > + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="@dimen/default_margin" + android:gravity="left|center_vertical" + android:text="@string/fso_properties_dialog_group" + android:textAppearance="@style/primary_text_appearance" /> + + <Spinner + android:id="@+id/fso_properties_group" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="@dimen/default_margin" + android:gravity="left|center_vertical" + android:spinnerMode="dialog" + android:textAppearance="@style/secondary_text_appearance" /> + </TableRow> + + </TableLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="5dp" + android:layout_marginBottom="5dp" > + <include layout="@layout/vertical_divider" /> + </LinearLayout> - <!-- Info message --> - <TextView - android:id="@+id/fso_info_msg" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_marginLeft="@dimen/extra_large_margin" - android:layout_marginRight="@dimen/extra_large_margin" - android:contentDescription="@null" - android:drawableLeft="@drawable/ic_holo_light_fs_warning" - android:drawablePadding="@dimen/default_margin" - android:gravity="left|center_vertical" - android:singleLine="false" - android:background="@drawable/holo_selector" - android:text="@string/fso_properties_permissions_not_allowed_msg" - android:textSize="@dimen/note_text_size" - android:visibility="gone" /> - </LinearLayout> + <!-- Permissions --> + <TableLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" > + + <!-- Title --> + <TableRow + android:layout_marginLeft="@dimen/extra_large_margin" + android:layout_marginRight="@dimen/extra_large_margin" > + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_margin="@dimen/default_margin" + android:gravity="left|center_vertical" + android:text="@null" + android:textAppearance="@style/primary_text_appearance" /> + + <TextView + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_margin="@dimen/default_margin" + android:gravity="center" + android:text="@string/fso_properties_dialog_special" + android:textAppearance="@style/primary_text_appearance" /> + + <TextView + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_margin="@dimen/default_margin" + android:gravity="center" + android:text="@string/fso_properties_dialog_read" + android:textAppearance="@style/primary_text_appearance" /> + + <TextView + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_margin="@dimen/default_margin" + android:gravity="center" + android:text="@string/fso_properties_dialog_write" + android:textAppearance="@style/primary_text_appearance" /> + + <TextView + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_margin="@dimen/default_margin" + android:gravity="center" + android:text="@string/fso_properties_dialog_execute" + android:textAppearance="@style/primary_text_appearance" /> + </TableRow> + + <!-- Owner --> + <TableRow + android:layout_marginLeft="@dimen/extra_large_margin" + android:layout_marginRight="@dimen/extra_large_margin" > + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_margin="@dimen/default_margin" + android:gravity="left|center_vertical" + android:text="@string/fso_properties_dialog_owner" + android:textAppearance="@style/primary_text_appearance" /> + + <CheckBox + android:id="@+id/fso_permissions_owner_read" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_margin="@dimen/default_margin" /> + + <CheckBox + android:id="@+id/fso_permissions_owner_write" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_margin="@dimen/default_margin" /> + + <CheckBox + android:id="@+id/fso_permissions_owner_execute" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_margin="@dimen/default_margin" /> + + <CheckBox + android:id="@+id/fso_permissions_owner_special" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_margin="@dimen/default_margin" /> + </TableRow> + + <!-- Group --> + <TableRow + android:layout_marginLeft="@dimen/extra_large_margin" + android:layout_marginRight="@dimen/extra_large_margin" > + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_margin="@dimen/default_margin" + android:gravity="left|center_vertical" + android:text="@string/fso_properties_dialog_group" + android:textAppearance="@style/primary_text_appearance" /> + + <CheckBox + android:id="@+id/fso_permissions_group_read" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_margin="@dimen/default_margin" /> + + <CheckBox + android:id="@+id/fso_permissions_group_write" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_margin="@dimen/default_margin" /> + + <CheckBox + android:id="@+id/fso_permissions_group_execute" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_margin="@dimen/default_margin" /> + + <CheckBox + android:id="@+id/fso_permissions_group_special" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_margin="@dimen/default_margin" /> + </TableRow> + + <!-- Others --> + <TableRow + android:layout_marginLeft="@dimen/extra_large_margin" + android:layout_marginRight="@dimen/extra_large_margin" > + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_margin="@dimen/default_margin" + android:gravity="left|center_vertical" + android:text="@string/fso_properties_dialog_others" + android:textAppearance="@style/primary_text_appearance" /> + + <CheckBox + android:id="@+id/fso_permissions_others_read" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_margin="@dimen/default_margin" /> + + <CheckBox + android:id="@+id/fso_permissions_others_write" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_margin="@dimen/default_margin" /> + + <CheckBox + android:id="@+id/fso_permissions_others_execute" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_margin="@dimen/default_margin" /> + + <CheckBox + android:id="@+id/fso_permissions_others_special" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_margin="@dimen/default_margin" /> + </TableRow> + + </TableLayout> + + <!-- Info message --> + <TextView + android:id="@+id/fso_info_msg" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_marginLeft="@dimen/extra_large_margin" + android:layout_marginRight="@dimen/extra_large_margin" + android:contentDescription="@null" + android:drawableLeft="@drawable/ic_holo_light_fs_warning" + android:drawablePadding="@dimen/default_margin" + android:gravity="left|center_vertical" + android:singleLine="false" + android:background="@drawable/holo_selector" + android:text="@string/fso_properties_permissions_not_allowed_msg" + android:textSize="@dimen/note_text_size" + android:visibility="gone" /> + </LinearLayout> + </ScrollView> </RelativeLayout>
\ No newline at end of file diff --git a/res/layout/history.xml b/res/layout/history.xml index c8f39635..45a2993b 100644 --- a/res/layout/history.xml +++ b/res/layout/history.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
--> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent"> diff --git a/res/layout/history_item.xml b/res/layout/history_item.xml index 63302c5a..4fca6ff1 100644 --- a/res/layout/history_item.xml +++ b/res/layout/history_item.xml @@ -1,18 +1,19 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
--> +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="@dimen/default_row_height" diff --git a/res/layout/horizontal_divider.xml b/res/layout/horizontal_divider.xml index e1fa3623..ea883363 100644 --- a/res/layout/horizontal_divider.xml +++ b/res/layout/horizontal_divider.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
--> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <TextView xmlns:android="http://schemas.android.com/apk/res/android" style="@style/horizontal_divider" android:layout_width="@dimen/horizontal_divider_width" diff --git a/res/layout/initial_directory.xml b/res/layout/initial_directory.xml index 81c67f49..f87ed111 100644 --- a/res/layout/initial_directory.xml +++ b/res/layout/initial_directory.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
--> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/res/layout/inline_autocomplete.xml b/res/layout/inline_autocomplete.xml index 9e2e2c59..3938cb40 100644 --- a/res/layout/inline_autocomplete.xml +++ b/res/layout/inline_autocomplete.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
--> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" > diff --git a/res/layout/input_name_dialog.xml b/res/layout/input_name_dialog.xml index ca562b5c..3ff195f2 100644 --- a/res/layout/input_name_dialog.xml +++ b/res/layout/input_name_dialog.xml @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License. ---> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/res/layout/menu_item.xml b/res/layout/menu_item.xml index 26505545..5a9112b1 100644 --- a/res/layout/menu_item.xml +++ b/res/layout/menu_item.xml @@ -1,18 +1,19 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
--> +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="@dimen/default_row_height" diff --git a/res/layout/menu_item_separator.xml b/res/layout/menu_item_separator.xml index 2f8ac543..6c9010da 100644 --- a/res/layout/menu_item_separator.xml +++ b/res/layout/menu_item_separator.xml @@ -1,18 +1,19 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
--> +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="@dimen/vertical_divider_height"> diff --git a/res/layout/message_progress_dialog.xml b/res/layout/message_progress_dialog.xml index 41728e43..b30fb197 100644 --- a/res/layout/message_progress_dialog.xml +++ b/res/layout/message_progress_dialog.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
--> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -58,4 +59,4 @@ android:textStyle="normal" android:layout_marginBottom="@dimen/extra_margin" /> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/res/layout/navigation.xml b/res/layout/navigation.xml index 0c614303..d1ab805c 100644 --- a/res/layout/navigation.xml +++ b/res/layout/navigation.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
--> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:filemanager="http://schemas.android.com/apk/res/com.cyanogenmod.filemanager" @@ -38,4 +39,4 @@ <!-- StatusBar --> <include layout="@layout/navigation_view_statusbar" /> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/layout/navigation_view_customtitle.xml b/res/layout/navigation_view_customtitle.xml index ca78aeef..6109f36c 100644 --- a/res/layout/navigation_view_customtitle.xml +++ b/res/layout/navigation_view_customtitle.xml @@ -1,28 +1,42 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
--> -<com.cyanogenmod.filemanager.ui.widgets.NavigationCustomTitleView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/navigation_title_flipper" +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="@dimen/default_row_height" - android:animateFirstView="true" > + android:layout_height="match_parent" + android:orientation="horizontal"> + + <com.cyanogenmod.filemanager.ui.widgets.NavigationCustomTitleView + android:id="@+id/navigation_title_flipper" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:animateFirstView="true"> + + <!-- The breadcrumb layout (breadcrumb + configuration buttom) --> + <include layout="@layout/navigation_view_customtitle_breadcrumb" /> + + <!-- The configuration layout (sort, layout, other options, ...) --> + <include layout="@layout/navigation_view_customtitle_configuration" /> - <!-- The breadcrumb layout (breadcrumb + configuration buttom) --> - <include layout="@layout/navigation_view_customtitle_breadcrumb" /> + </com.cyanogenmod.filemanager.ui.widgets.NavigationCustomTitleView> - <!-- The configuration layout (sort, layout, other options, ...) --> - <include layout="@layout/navigation_view_customtitle_configuration" /> + <LinearLayout + android:id="@+id/navigation_title_landscape_holder" + android:layout_width="wrap_content" + android:layout_height="match_parent" /> -</com.cyanogenmod.filemanager.ui.widgets.NavigationCustomTitleView>
\ No newline at end of file +</LinearLayout> diff --git a/res/layout/navigation_view_customtitle_breadcrumb.xml b/res/layout/navigation_view_customtitle_breadcrumb.xml index 2f35d33c..c805bd59 100644 --- a/res/layout/navigation_view_customtitle_breadcrumb.xml +++ b/res/layout/navigation_view_customtitle_breadcrumb.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
--> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/tb_breadcrumb" android:layout_width="match_parent" @@ -34,4 +35,4 @@ android:layout_height="match_parent" android:layout_toLeftOf="@id/ab_configuration" /> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/res/layout/navigation_view_customtitle_configuration.xml b/res/layout/navigation_view_customtitle_configuration.xml index c4656007..0a41d537 100644 --- a/res/layout/navigation_view_customtitle_configuration.xml +++ b/res/layout/navigation_view_customtitle_configuration.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
--> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/tb_configuration" android:layout_width="match_parent" @@ -61,4 +62,4 @@ android:onClick="onActionBarItemClick" android:src="@drawable/ic_holo_light_expander_close" /> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/res/layout/navigation_view_details.xml b/res/layout/navigation_view_details.xml index b3c078f3..2bf4823d 100644 --- a/res/layout/navigation_view_details.xml +++ b/res/layout/navigation_view_details.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
--> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <com.cyanogenmod.filemanager.ui.widgets.FlingerListView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/navigation_view_layout" diff --git a/res/layout/navigation_view_details_item.xml b/res/layout/navigation_view_details_item.xml index ee3f5b86..243fdeaa 100644 --- a/res/layout/navigation_view_details_item.xml +++ b/res/layout/navigation_view_details_item.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
--> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/navigation_view_details_item" android:layout_width="match_parent" @@ -78,4 +79,4 @@ android:textStyle="bold" /> </RelativeLayout> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/res/layout/navigation_view_icons.xml b/res/layout/navigation_view_icons.xml index 155451b6..8f9ce330 100644 --- a/res/layout/navigation_view_icons.xml +++ b/res/layout/navigation_view_icons.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
--> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <GridView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/navigation_view_layout" style="@style/navigation_grid" diff --git a/res/layout/navigation_view_icons_item.xml b/res/layout/navigation_view_icons_item.xml index 36fdc6f1..fdd15b55 100644 --- a/res/layout/navigation_view_icons_item.xml +++ b/res/layout/navigation_view_icons_item.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
--> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/navigation_view_details_item" android:layout_width="@dimen/navigation_grid_width" @@ -48,4 +49,4 @@ android:textAppearance="@style/secondary_text_appearance" android:textStyle="bold" /> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/res/layout/navigation_view_selectionbar.xml b/res/layout/navigation_view_selectionbar.xml index 96b31fe5..195f3c49 100644 --- a/res/layout/navigation_view_selectionbar.xml +++ b/res/layout/navigation_view_selectionbar.xml @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License. ---> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" @@ -47,4 +47,4 @@ android:text="@null" android:textAppearance="@style/secondary_text_appearance" /> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/layout/navigation_view_simple.xml b/res/layout/navigation_view_simple.xml index b3c078f3..2bf4823d 100644 --- a/res/layout/navigation_view_simple.xml +++ b/res/layout/navigation_view_simple.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
--> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <com.cyanogenmod.filemanager.ui.widgets.FlingerListView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/navigation_view_layout" diff --git a/res/layout/navigation_view_simple_item.xml b/res/layout/navigation_view_simple_item.xml index db2f98d7..3ef98bb1 100644 --- a/res/layout/navigation_view_simple_item.xml +++ b/res/layout/navigation_view_simple_item.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
--> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/navigation_view_details_item" android:layout_width="match_parent" @@ -56,4 +57,4 @@ android:textAppearance="@style/primary_text_appearance" /> </RelativeLayout> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/res/layout/navigation_view_statusbar.xml b/res/layout/navigation_view_statusbar.xml index ceb5640a..3474265c 100644 --- a/res/layout/navigation_view_statusbar.xml +++ b/res/layout/navigation_view_statusbar.xml @@ -1,80 +1,87 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License. ---> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/navigation_statusbar" - android:layout_width="match_parent" - android:layout_height="@dimen/default_row_height" - android:background="@drawable/bg_holo_statusbar" - android:visibility="invisible" > +<!-- Copyright (C) 2012 The CyanogenMod Project - <com.cyanogenmod.filemanager.ui.widgets.ButtonItem - android:id="@+id/ab_overflow" - android:layout_width="@dimen/default_buttom_width" - android:layout_height="match_parent" - android:layout_alignParentRight="true" - android:contentDescription="@string/actionbar_button_overflow_cd" - android:onClick="onActionBarItemClick" - android:src="@drawable/ic_holo_light_overflow" /> + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - <com.cyanogenmod.filemanager.ui.widgets.ButtonItem - android:id="@+id/ab_actions" - android:layout_width="@dimen/default_buttom_width" - android:layout_height="match_parent" - android:contentDescription="@string/actionbar_button_actions_cd" - android:onClick="onActionBarItemClick" - android:src="@drawable/ic_holo_light_contextual_action" /> + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/navigation_statusbar_portrait_holder" + android:layout_width="match_parent" + android:layout_height="@dimen/default_row_height" + android:background="@drawable/bg_holo_statusbar" + android:visibility="invisible"> <RelativeLayout - android:id="@+id/navigation_actionbar" + android:id="@+id/navigation_statusbar" android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_toLeftOf="@id/ab_overflow" - android:layout_toRightOf="@id/ab_actions"> + android:layout_height="match_parent"> <com.cyanogenmod.filemanager.ui.widgets.ButtonItem - android:id="@+id/ab_search" - android:layout_width="@dimen/default_buttom_width" - android:layout_height="match_parent" - android:layout_alignParentRight="true" - android:contentDescription="@string/actionbar_button_search_cd" - android:onClick="onActionBarItemClick" - android:src="@drawable/ic_holo_light_search" - android:visibility="invisible" /> + android:id="@+id/ab_overflow" + android:layout_width="@dimen/default_buttom_width" + android:layout_height="match_parent" + android:layout_alignParentRight="true" + android:contentDescription="@string/actionbar_button_overflow_cd" + android:onClick="onActionBarItemClick" + android:src="@drawable/ic_holo_light_overflow" /> <com.cyanogenmod.filemanager.ui.widgets.ButtonItem - android:id="@+id/ab_bookmarks" + android:id="@+id/ab_actions" android:layout_width="@dimen/default_buttom_width" android:layout_height="match_parent" - android:layout_toLeftOf="@id/ab_search" - android:contentDescription="@string/actionbar_button_bookmarks_cd" + android:contentDescription="@string/actionbar_button_actions_cd" android:onClick="onActionBarItemClick" - android:src="@drawable/ic_holo_light_bookmarks" - android:visibility="invisible" /> + android:src="@drawable/ic_holo_light_contextual_action" /> - <com.cyanogenmod.filemanager.ui.widgets.ButtonItem - android:id="@+id/ab_history" - android:layout_width="@dimen/default_buttom_width" + <RelativeLayout + android:id="@+id/navigation_actionbar" + android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_toLeftOf="@id/ab_bookmarks" - android:contentDescription="@string/actionbar_button_history_cd" - android:onClick="onActionBarItemClick" - android:src="@drawable/ic_holo_light_history" - android:visibility="invisible" /> + android:layout_toLeftOf="@id/ab_overflow" + android:layout_toRightOf="@id/ab_actions"> + + <com.cyanogenmod.filemanager.ui.widgets.ButtonItem + android:id="@+id/ab_search" + android:layout_width="@dimen/default_buttom_width" + android:layout_height="match_parent" + android:layout_alignParentRight="true" + android:contentDescription="@string/actionbar_button_search_cd" + android:onClick="onActionBarItemClick" + android:src="@drawable/ic_holo_light_search" + android:visibility="invisible" /> + + <com.cyanogenmod.filemanager.ui.widgets.ButtonItem + android:id="@+id/ab_bookmarks" + android:layout_width="@dimen/default_buttom_width" + android:layout_height="match_parent" + android:layout_toLeftOf="@id/ab_search" + android:contentDescription="@string/actionbar_button_bookmarks_cd" + android:onClick="onActionBarItemClick" + android:src="@drawable/ic_holo_light_bookmarks" + android:visibility="invisible" /> + + <com.cyanogenmod.filemanager.ui.widgets.ButtonItem + android:id="@+id/ab_history" + android:layout_width="@dimen/default_buttom_width" + android:layout_height="match_parent" + android:layout_toLeftOf="@id/ab_bookmarks" + android:contentDescription="@string/actionbar_button_history_cd" + android:onClick="onActionBarItemClick" + android:src="@drawable/ic_holo_light_history" + android:visibility="invisible" /> + + </RelativeLayout> </RelativeLayout> -</RelativeLayout> +</LinearLayout> diff --git a/res/layout/option_list_item.xml b/res/layout/option_list_item.xml index 90cf16ec..b87aa455 100644 --- a/res/layout/option_list_item.xml +++ b/res/layout/option_list_item.xml @@ -1,18 +1,19 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
--> +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="@dimen/default_row_height" @@ -43,4 +44,4 @@ android:singleLine="true" android:textAppearance="@style/primary_text_appearance_nohighlight" /> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/res/layout/picker.xml b/res/layout/picker.xml index 39e145a0..8baa52e0 100644 --- a/res/layout/picker.xml +++ b/res/layout/picker.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
--> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:filemanager="http://schemas.android.com/apk/res/com.cyanogenmod.filemanager" @@ -41,4 +42,4 @@ android:layout_marginRight="@dimen/extra_margin" filemanager:navigation="pickable" /> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/layout/search.xml b/res/layout/search.xml index befc89e6..3b325247 100644 --- a/res/layout/search.xml +++ b/res/layout/search.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
--> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -75,4 +76,4 @@ android:layout_above="@id/search_status" android:visibility="gone" /> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/res/layout/search_item.xml b/res/layout/search_item.xml index 3058858f..af6e742e 100644 --- a/res/layout/search_item.xml +++ b/res/layout/search_item.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
--> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/search_item" android:layout_width="match_parent" @@ -72,4 +73,4 @@ </LinearLayout> </RelativeLayout> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/res/layout/simple_customtitle.xml b/res/layout/simple_customtitle.xml index 76ce9e72..5a4b23e8 100644 --- a/res/layout/simple_customtitle.xml +++ b/res/layout/simple_customtitle.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
--> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" > @@ -42,4 +43,4 @@ android:ellipsize="end" android:text="@null" /> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/res/layout/spinner_item.xml b/res/layout/spinner_item.xml index 61dd0bcb..31b4009b 100644 --- a/res/layout/spinner_item.xml +++ b/res/layout/spinner_item.xml @@ -1,18 +1,19 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
--> +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/spinner_item" @@ -20,4 +21,4 @@ android:layout_height="wrap_content" android:gravity="left|center_vertical" android:textAppearance="@style/secondary_text_appearance" - android:ellipsize="marquee" />
\ No newline at end of file + android:ellipsize="marquee" /> diff --git a/res/layout/two_columns_menu_item.xml b/res/layout/two_columns_menu_item.xml index 48bc0523..2c5009e7 100644 --- a/res/layout/two_columns_menu_item.xml +++ b/res/layout/two_columns_menu_item.xml @@ -1,19 +1,19 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License. ---> +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="@dimen/default_row_height" @@ -52,4 +52,4 @@ android:textAppearance="@style/primary_text_appearance_nohighlight" android:background="@drawable/holo_selector" /> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/layout/vertical_divider.xml b/res/layout/vertical_divider.xml index 35e35d27..f329473c 100644 --- a/res/layout/vertical_divider.xml +++ b/res/layout/vertical_divider.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License.
--> +<!-- Copyright (C) 2012 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <TextView xmlns:android="http://schemas.android.com/apk/res/android" style="@style/vertical_divider" android:layout_width="match_parent" diff --git a/res/raw/changelog b/res/raw/changelog index db526c62..ce061b9b 100644 --- a/res/raw/changelog +++ b/res/raw/changelog @@ -28,4 +28,4 @@ Features: * File information * Open and Open With * Send to -* Internal editor
\ No newline at end of file +* Internal editor diff --git a/res/values/strings.xml b/res/values/strings.xml index f7c6cc73..2010a2a1 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -708,6 +708,6 @@ your device. To prevent damage, the app will start in a safe, low-privileged mode. \n\nYou can access the advanced, full-privileged mode via Settings. It\'s your responsibility to ensure that an operation doesn\'t break your system. - \n\nThe CyanogenMod Team.</string> + \n\nThe CyanogenMod Team.\n</string> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 4a277e1b..988a8bf1 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -22,7 +22,7 @@ </style> <!-- A theme with overlay --> - <style name="FileManager.Theme.Holo.Light.Overlay" parent="@style/FileManager.Widget.ActionBar.White"> + <style name="FileManager.Theme.Holo.Light.Overlay" parent="@style/FileManager.Theme.Holo.Light"> <item name="android:windowIsTranslucent">true</item> <item name="android:windowBackground">@color/black_transparent</item> <item name="android:windowContentOverlay">@null</item> @@ -31,6 +31,16 @@ <item name="android:backgroundDimEnabled">false</item> </style> + <!-- A theme with overlay --> + <style name="FileManager.Theme.Holo.Light.Transparent" parent="@style/FileManager.Theme.Holo.Light"> + <item name="android:windowIsTranslucent">true</item> + <item name="android:windowBackground">@android:color/transparent</item> + <item name="android:windowContentOverlay">@null</item> + <item name="android:windowNoTitle">true</item> + <item name="android:windowIsFloating">true</item> + <item name="android:backgroundDimEnabled">false</item> + </style> + <!-- Action bar --> <style name="FileManager.Widget.ActionBar.White" parent="@android:style/Widget.Holo.Light.ActionBar"> <item name="android:titleTextStyle">@style/primary_text_appearance</item> diff --git a/res/xml/preferences_general.xml b/res/xml/preferences_general.xml index 1e3a23b0..80a575b9 100644 --- a/res/xml/preferences_general.xml +++ b/res/xml/preferences_general.xml @@ -13,6 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. --> + <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/res/xml/preferences_search.xml b/res/xml/preferences_search.xml index ba9e44a4..1baf5133 100644 --- a/res/xml/preferences_search.xml +++ b/res/xml/preferences_search.xml @@ -68,4 +68,4 @@ android:dependency="cm_filemanager_save_search_terms" /> </PreferenceCategory> -</PreferenceScreen> +</PreferenceScreen> |