android/sdremote/AndroidManifest.xml | 17 +++ android/sdremote/res/drawable-xxhdpi/ic_action_add_computer.png |binary android/sdremote/res/drawable-xxhdpi/ic_logo.png |binary android/sdremote/res/drawable/bg_action_bar_tab.xml | 17 +++ android/sdremote/res/drawable/bg_grid_slide.xml | 17 +++ android/sdremote/res/drawable/underline_header.xml | 17 +++ android/sdremote/res/layout-land/fragment_empty_slide.xml | 17 +++ android/sdremote/res/layout-land/fragment_slides_pager.xml | 17 +++ android/sdremote/res/layout-v11/action_bar_computer_creation.xml | 17 +++ android/sdremote/res/layout/action_bar_computer_creation.xml | 17 +++ android/sdremote/res/layout/activity_computer_creation.xml | 17 +++ android/sdremote/res/layout/activity_computers.xml | 17 +++ android/sdremote/res/layout/activity_licenses.xml | 17 +++ android/sdremote/res/layout/activity_requirements.xml | 17 +++ android/sdremote/res/layout/fragment_computer_connection.xml | 17 +++ android/sdremote/res/layout/fragment_computers_list.xml | 17 +++ android/sdremote/res/layout/fragment_empty_slide.xml | 17 +++ android/sdremote/res/layout/fragment_slides_grid.xml | 17 +++ android/sdremote/res/layout/fragment_slides_pager.xml | 17 +++ android/sdremote/res/layout/list_item.xml | 17 +++ android/sdremote/res/layout/view_grid_slide.xml | 17 +++ android/sdremote/res/layout/view_pager_slide.xml | 17 +++ android/sdremote/res/menu/menu_action_bar_computer_connection.xml | 17 +++ android/sdremote/res/menu/menu_action_bar_computers.xml | 17 +++ android/sdremote/res/menu/menu_action_bar_slide_show.xml | 17 +++ android/sdremote/res/menu/menu_context_computers.xml | 17 +++ android/sdremote/res/values/colors.xml | 17 +++ android/sdremote/res/values/dimens.xml | 17 +++ android/sdremote/res/values/strings.xml | 19 ++++ android/sdremote/res/values/styles.xml | 17 +++ android/sdremote/res/values/themes.xml | 17 +++ android/sdremote/res/xml/preferences.xml | 23 ++++ android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java | 47 ++++++++++ android/sdremote/src/org/libreoffice/impressremote/util/Preferences.java | 3 android/sdremote/src/org/libreoffice/impressremote/util/SavedStates.java | 1 35 files changed, 568 insertions(+), 1 deletion(-)
New commits: commit 7d98cbb5beafe6f0853e0232bd7b51098cbcae80 Author: Artur Dryomov <artur.dryo...@gmail.com> Date: Fri Oct 4 01:14:59 2013 +0300 Add missing license headers to XML source files. Change-Id: I171bf4101fe3f049f1d032a9a29ef0f8d40a5ee1 diff --git a/android/sdremote/AndroidManifest.xml b/android/sdremote/AndroidManifest.xml index 714b05f..82bf17e 100644 --- a/android/sdremote/AndroidManifest.xml +++ b/android/sdremote/AndroidManifest.xml @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you 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 . +--> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.libreoffice.impressremote" android:versionCode="8" diff --git a/android/sdremote/res/drawable/bg_action_bar_tab.xml b/android/sdremote/res/drawable/bg_action_bar_tab.xml index 4293fcf..2b49758 100644 --- a/android/sdremote/res/drawable/bg_action_bar_tab.xml +++ b/android/sdremote/res/drawable/bg_action_bar_tab.xml @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you 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 . +--> <selector xmlns:android="http://schemas.android.com/apk/res/android"> <!-- Non focused states --> diff --git a/android/sdremote/res/drawable/bg_grid_slide.xml b/android/sdremote/res/drawable/bg_grid_slide.xml index e7fca36..b18ce97 100644 --- a/android/sdremote/res/drawable/bg_grid_slide.xml +++ b/android/sdremote/res/drawable/bg_grid_slide.xml @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you 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 . +--> <shape xmlns:android="http://schemas.android.com/apk/res/android"> <solid diff --git a/android/sdremote/res/drawable/underline_header.xml b/android/sdremote/res/drawable/underline_header.xml index 9613dbf..e19bc22 100644 --- a/android/sdremote/res/drawable/underline_header.xml +++ b/android/sdremote/res/drawable/underline_header.xml @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you 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 . +--> <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> diff --git a/android/sdremote/res/layout-land/fragment_empty_slide.xml b/android/sdremote/res/layout-land/fragment_empty_slide.xml index 37a733d..1f49152 100644 --- a/android/sdremote/res/layout-land/fragment_empty_slide.xml +++ b/android/sdremote/res/layout-land/fragment_empty_slide.xml @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you 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 . +--> <ImageView xmlns:android="http://schemas.android.com/apk/res/android" android:src="@color/background_slide_empty" android:contentDescription="@string/description_empty_slide" diff --git a/android/sdremote/res/layout-land/fragment_slides_pager.xml b/android/sdremote/res/layout-land/fragment_slides_pager.xml index c539b852..ea70c82 100644 --- a/android/sdremote/res/layout-land/fragment_slides_pager.xml +++ b/android/sdremote/res/layout-land/fragment_slides_pager.xml @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you 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 . +--> <android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/pager_slides" diff --git a/android/sdremote/res/layout-v11/action_bar_computer_creation.xml b/android/sdremote/res/layout-v11/action_bar_computer_creation.xml index 20f1e29..90b73fa 100644 --- a/android/sdremote/res/layout-v11/action_bar_computer_creation.xml +++ b/android/sdremote/res/layout-v11/action_bar_computer_creation.xml @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you 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 . +--> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" android:divider="?android:attr/dividerVertical" diff --git a/android/sdremote/res/layout/action_bar_computer_creation.xml b/android/sdremote/res/layout/action_bar_computer_creation.xml index 59e1495..2e31abb 100644 --- a/android/sdremote/res/layout/action_bar_computer_creation.xml +++ b/android/sdremote/res/layout/action_bar_computer_creation.xml @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you 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 . +--> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" android:layout_width="match_parent" diff --git a/android/sdremote/res/layout/activity_computer_creation.xml b/android/sdremote/res/layout/activity_computer_creation.xml index 50fde03..28ce196 100644 --- a/android/sdremote/res/layout/activity_computer_creation.xml +++ b/android/sdremote/res/layout/activity_computer_creation.xml @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you 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 . +--> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent"> diff --git a/android/sdremote/res/layout/activity_computers.xml b/android/sdremote/res/layout/activity_computers.xml index 6e5332d..1345208 100644 --- a/android/sdremote/res/layout/activity_computers.xml +++ b/android/sdremote/res/layout/activity_computers.xml @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you 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 . +--> <android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/pager_computers" diff --git a/android/sdremote/res/layout/activity_licenses.xml b/android/sdremote/res/layout/activity_licenses.xml index 5bc5886..6319f3f 100644 --- a/android/sdremote/res/layout/activity_licenses.xml +++ b/android/sdremote/res/layout/activity_licenses.xml @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you 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 . +--> <WebView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/view_licenses" android:layout_width="match_parent" diff --git a/android/sdremote/res/layout/activity_requirements.xml b/android/sdremote/res/layout/activity_requirements.xml index dc48b7c..adee272 100644 --- a/android/sdremote/res/layout/activity_requirements.xml +++ b/android/sdremote/res/layout/activity_requirements.xml @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you 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 . +--> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent"> diff --git a/android/sdremote/res/layout/fragment_computer_connection.xml b/android/sdremote/res/layout/fragment_computer_connection.xml index 4caf01c..0953e44 100644 --- a/android/sdremote/res/layout/fragment_computer_connection.xml +++ b/android/sdremote/res/layout/fragment_computer_connection.xml @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you 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 . +--> <ViewAnimator xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/view_animator" android:inAnimation="@android:anim/fade_in" diff --git a/android/sdremote/res/layout/fragment_computers_list.xml b/android/sdremote/res/layout/fragment_computers_list.xml index 4f34433..03bbbfe 100644 --- a/android/sdremote/res/layout/fragment_computers_list.xml +++ b/android/sdremote/res/layout/fragment_computers_list.xml @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you 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 . +--> <ViewAnimator xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/view_animator" android:inAnimation="@android:anim/fade_in" diff --git a/android/sdremote/res/layout/fragment_empty_slide.xml b/android/sdremote/res/layout/fragment_empty_slide.xml index 5e01fe3..6ec99bc 100644 --- a/android/sdremote/res/layout/fragment_empty_slide.xml +++ b/android/sdremote/res/layout/fragment_empty_slide.xml @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you 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 . +--> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:gravity="center" diff --git a/android/sdremote/res/layout/fragment_slides_grid.xml b/android/sdremote/res/layout/fragment_slides_grid.xml index 6a09fea..6077577 100644 --- a/android/sdremote/res/layout/fragment_slides_grid.xml +++ b/android/sdremote/res/layout/fragment_slides_grid.xml @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you 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 . +--> <GridView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/grid_slides" android:columnWidth="@dimen/width_slides_grid_column" diff --git a/android/sdremote/res/layout/fragment_slides_pager.xml b/android/sdremote/res/layout/fragment_slides_pager.xml index 8bf235c..97c5c72 100644 --- a/android/sdremote/res/layout/fragment_slides_pager.xml +++ b/android/sdremote/res/layout/fragment_slides_pager.xml @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you 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 . +--> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:gravity="center" diff --git a/android/sdremote/res/layout/list_item.xml b/android/sdremote/res/layout/list_item.xml index 275b9ba..496bc50 100644 --- a/android/sdremote/res/layout/list_item.xml +++ b/android/sdremote/res/layout/list_item.xml @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you 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 . +--> <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:singleLine="true" android:textSize="@dimen/text_size_list_item" diff --git a/android/sdremote/res/layout/view_grid_slide.xml b/android/sdremote/res/layout/view_grid_slide.xml index 8b5177c..bab316c 100644 --- a/android/sdremote/res/layout/view_grid_slide.xml +++ b/android/sdremote/res/layout/view_grid_slide.xml @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you 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 . +--> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:padding="@dimen/padding_slide" android:layout_width="match_parent" diff --git a/android/sdremote/res/layout/view_pager_slide.xml b/android/sdremote/res/layout/view_pager_slide.xml index 6b2dc4e..0992381 100644 --- a/android/sdremote/res/layout/view_pager_slide.xml +++ b/android/sdremote/res/layout/view_pager_slide.xml @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you 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 . +--> <ImageView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/image_slide_preview" android:scaleType="fitCenter" diff --git a/android/sdremote/res/menu/menu_action_bar_computer_connection.xml b/android/sdremote/res/menu/menu_action_bar_computer_connection.xml index ca8714d..0fff21e 100644 --- a/android/sdremote/res/menu/menu_action_bar_computer_connection.xml +++ b/android/sdremote/res/menu/menu_action_bar_computer_connection.xml @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you 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 . +--> <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item diff --git a/android/sdremote/res/menu/menu_action_bar_computers.xml b/android/sdremote/res/menu/menu_action_bar_computers.xml index 6d1dfbd..4cd93b3 100644 --- a/android/sdremote/res/menu/menu_action_bar_computers.xml +++ b/android/sdremote/res/menu/menu_action_bar_computers.xml @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you 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 . +--> <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item diff --git a/android/sdremote/res/menu/menu_action_bar_slide_show.xml b/android/sdremote/res/menu/menu_action_bar_slide_show.xml index 457e6bc..768442a 100644 --- a/android/sdremote/res/menu/menu_action_bar_slide_show.xml +++ b/android/sdremote/res/menu/menu_action_bar_slide_show.xml @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you 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 . +--> <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item diff --git a/android/sdremote/res/menu/menu_context_computers.xml b/android/sdremote/res/menu/menu_context_computers.xml index d2490c0..7113567 100644 --- a/android/sdremote/res/menu/menu_context_computers.xml +++ b/android/sdremote/res/menu/menu_context_computers.xml @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you 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 . +--> <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item diff --git a/android/sdremote/res/values/colors.xml b/android/sdremote/res/values/colors.xml index 43877b0..d1e5876 100644 --- a/android/sdremote/res/values/colors.xml +++ b/android/sdremote/res/values/colors.xml @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you 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 . +--> <resources> <color name="background_action_bar">#e46f1f</color> diff --git a/android/sdremote/res/values/dimens.xml b/android/sdremote/res/values/dimens.xml index 259ab3a..7e76175 100644 --- a/android/sdremote/res/values/dimens.xml +++ b/android/sdremote/res/values/dimens.xml @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you 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 . +--> <resources> <!-- It is a good practice to follow official design metrics. --> diff --git a/android/sdremote/res/values/strings.xml b/android/sdremote/res/values/strings.xml index d5658d6..fb31b46 100644 --- a/android/sdremote/res/values/strings.xml +++ b/android/sdremote/res/values/strings.xml @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you 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 . +--> <resources> <string name="application_name">Impress Remote</string> diff --git a/android/sdremote/res/values/styles.xml b/android/sdremote/res/values/styles.xml index 62aad2b..dff0505 100644 --- a/android/sdremote/res/values/styles.xml +++ b/android/sdremote/res/values/styles.xml @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you 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 . +--> <resources> <style name="SectionHeader"> diff --git a/android/sdremote/res/values/themes.xml b/android/sdremote/res/values/themes.xml index 400b675..9cb6a0f 100644 --- a/android/sdremote/res/values/themes.xml +++ b/android/sdremote/res/values/themes.xml @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you 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 . +--> <resources xmlns:android="http://schemas.android.com/apk/res/android"> <style name="Theme.ImpressRemote" parent="Theme.Sherlock.Light.DarkActionBar.ForceOverflow"> diff --git a/android/sdremote/res/xml/preferences.xml b/android/sdremote/res/xml/preferences.xml index 1318aaf..676ce09 100644 --- a/android/sdremote/res/xml/preferences.xml +++ b/android/sdremote/res/xml/preferences.xml @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you 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 . +--> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <CheckBoxPreference commit 3ac54aa0dfb7b32a9c676dbe7411d08b25f9c799 Author: Artur Dryomov <artur.dryo...@gmail.com> Date: Thu Oct 3 23:50:43 2013 +0300 Add a xxhdpi version of the logo. Change-Id: Ia9afd7c9100cdb1f84813dd2aff7e37f46eafb6c diff --git a/android/sdremote/res/drawable-xxhdpi/ic_logo.png b/android/sdremote/res/drawable-xxhdpi/ic_logo.png new file mode 100644 index 0000000..fd225ff Binary files /dev/null and b/android/sdremote/res/drawable-xxhdpi/ic_logo.png differ commit 790693d8b2d0dccb240228f20dea01c7a4f66441 Author: Artur Dryomov <artur.dryo...@gmail.com> Date: Thu Oct 3 23:47:01 2013 +0300 Add missing xxhdpi action bar icon. Change-Id: I0d01b0e9780e228d8ee60aafd80e70c5990eab4e diff --git a/android/sdremote/res/drawable-xxhdpi/ic_action_add_computer.png b/android/sdremote/res/drawable-xxhdpi/ic_action_add_computer.png new file mode 100644 index 0000000..c42c2bf Binary files /dev/null and b/android/sdremote/res/drawable-xxhdpi/ic_action_add_computer.png differ commit 99389390b8c784a3af7f7f0ef1a121b35134bb60 Author: Artur Dryomov <artur.dryo...@gmail.com> Date: Thu Oct 3 21:35:44 2013 +0300 Add support for setting vibrate mode while showing a slide show. Change-Id: I8f407fbce3b90b56a0fb24b1143bcd7f2a243020 diff --git a/android/sdremote/res/values/strings.xml b/android/sdremote/res/values/strings.xml index cf84a3a..d5658d6 100644 --- a/android/sdremote/res/values/strings.xml +++ b/android/sdremote/res/values/strings.xml @@ -64,6 +64,8 @@ <string name="preferences_volume_keys_actions_summary">Switch slides and activate animations using volume keys</string> <string name="preferences_keep_screen_on_title">Keep screen on</string> <string name="preferences_keep_screen_on_summary">Prevent phone from sleeping while presenting</string> + <string name="preferences_quiet_mode_title">Quiet mode</string> + <string name="preferences_quiet_mode_summary">Set up vibrate ringer mode while presenting</string> <string name="requirements_libreoffice_version">LibreOffice version 4.0.3 or higher running on a computer.</string> <string name="requirements_libreoffice_general_enabled">Impress Remote enabled at âTools â Options â LibreOffice Impress â Generalâ in LibreOffice Impress.</string> diff --git a/android/sdremote/res/xml/preferences.xml b/android/sdremote/res/xml/preferences.xml index 104c528..1318aaf 100644 --- a/android/sdremote/res/xml/preferences.xml +++ b/android/sdremote/res/xml/preferences.xml @@ -13,4 +13,10 @@ android:title="@string/preferences_keep_screen_on_title" android:summary="@string/preferences_keep_screen_on_summary"/> + <CheckBoxPreference + android:key="quiet_mode" + android:defaultValue="false" + android:title="@string/preferences_quiet_mode_title" + android:summary="@string/preferences_quiet_mode_summary"/> + </PreferenceScreen> \ No newline at end of file diff --git a/android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java b/android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java index 3c41ecc..1dbc22f 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java +++ b/android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java @@ -14,6 +14,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.ServiceConnection; +import android.media.AudioManager; import android.os.Bundle; import android.os.IBinder; import android.support.v4.app.DialogFragment; @@ -46,6 +47,8 @@ public class SlideShowActivity extends SherlockFragmentActivity implements Servi private Mode mMode; + private int mRingerMode; + private CommunicationService mCommunicationService; private IntentsReceiver mIntentsReceiver; @@ -59,6 +62,9 @@ public class SlideShowActivity extends SherlockFragmentActivity implements Servi setUpFragment(); setUpKeepingScreenOn(); + saveRingerMode(aSavedInstanceState); + enableQuietMode(); + bindService(); } @@ -104,6 +110,32 @@ public class SlideShowActivity extends SherlockFragmentActivity implements Servi return aPreferences.getBoolean(Preferences.Keys.KEEP_SCREEN_ON); } + private void saveRingerMode(Bundle aSavedInstanceState) { + if (aSavedInstanceState == null) { + mRingerMode = getAudioManager().getRingerMode(); + } else { + mRingerMode = aSavedInstanceState.getInt(SavedStates.Keys.RINGER_MODE); + } + } + + private AudioManager getAudioManager() { + return (AudioManager) getSystemService(AUDIO_SERVICE); + } + + private void enableQuietMode() { + if (!isQuietModeRequired()) { + return; + } + + getAudioManager().setRingerMode(AudioManager.RINGER_MODE_VIBRATE); + } + + private boolean isQuietModeRequired() { + Preferences aPreferences = Preferences.getSettingsInstance(this); + + return aPreferences.getBoolean(Preferences.Keys.QUIET_MODE); + } + private void bindService() { Intent aIntent = Intents.buildCommunicationServiceIntent(this); bindService(aIntent, this, Context.BIND_AUTO_CREATE); @@ -509,16 +541,23 @@ public class SlideShowActivity extends SherlockFragmentActivity implements Servi super.onSaveInstanceState(aOutState); saveMode(aOutState); + rememberRingerMode(aOutState); } private void saveMode(Bundle aOutState) { aOutState.putSerializable(SavedStates.Keys.MODE, mMode); } + private void rememberRingerMode(Bundle aOutState) { + aOutState.putInt(SavedStates.Keys.RINGER_MODE, mRingerMode); + } + @Override protected void onDestroy() { super.onDestroy(); + disableQuietMode(); + if (!isServiceBound()) { return; } @@ -526,6 +565,14 @@ public class SlideShowActivity extends SherlockFragmentActivity implements Servi unbindService(); } + private void disableQuietMode() { + if (!isQuietModeRequired()) { + return; + } + + getAudioManager().setRingerMode(mRingerMode); + } + private void unbindService() { unbindService(this); } diff --git a/android/sdremote/src/org/libreoffice/impressremote/util/Preferences.java b/android/sdremote/src/org/libreoffice/impressremote/util/Preferences.java index 5a9b0c7..ca5fbae 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/util/Preferences.java +++ b/android/sdremote/src/org/libreoffice/impressremote/util/Preferences.java @@ -30,8 +30,9 @@ public final class Preferences { public static final String SELECTED_COMPUTERS_TAB_INDEX = "selected_computers_tab_index"; - public static final String VOLUME_KEYS_ACTIONS = "volume_keys_actions"; public static final String KEEP_SCREEN_ON = "keep_screen_on"; + public static final String VOLUME_KEYS_ACTIONS = "volume_keys_actions"; + public static final String QUIET_MODE = "quiet_mode"; } private static final class Defaults { diff --git a/android/sdremote/src/org/libreoffice/impressremote/util/SavedStates.java b/android/sdremote/src/org/libreoffice/impressremote/util/SavedStates.java index 7bc5dad..062462e 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/util/SavedStates.java +++ b/android/sdremote/src/org/libreoffice/impressremote/util/SavedStates.java @@ -22,6 +22,7 @@ public final class SavedStates { public static final String MODE = "MODE"; public static final String PIN = "PIN"; public static final String PROGRESS_MESSAGE = "PROGRESS_MESSAGE"; + public static final String RINGER_MODE = "RINGER_MODE"; } }
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits