Various fixes and reorganisation of files for Android library project

This commit is contained in:
Martin Fleisz
2013-02-20 02:06:03 -08:00
parent 295d799afe
commit f0fb640bb4
35 changed files with 23 additions and 193 deletions

View File

@@ -12,17 +12,6 @@
<supports-screens android:anyDensity="true" android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" />
<application>
<!-- Session request handler activity - used for search and internally to start sessions -->
<activity android:name=".services.SessionRequestHandlerActivity"
android:theme="@android:style/Theme.NoDisplay"
android:noHistory="true"
android:excludeFromRecents="true">
<intent-filter>
<action android:name="android.intent.action.SEARCH" />
</intent-filter>
<meta-data android:name="android.app.searchable"
android:resource="@xml/searchable" />
</activity>
<!-- Activity to create shortcuts -->
<activity android:name=".presentation.ShortcutsActivity"

View File

@@ -1,20 +0,0 @@
# To enable ProGuard in your project, edit project.properties
# to define the proguard.config property as described in that file.
#
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
# in ${sdk.dir}/tools/proguard/proguard-android.txt
# You can edit the include path and order by changing the ProGuard
# include property in project.properties.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# Add any project specific keep options here:
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

View File

@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
Bookmark searchable definition
Copyright 2013 Thinstuff Technologies GmbH, Author: Martin Fleisz
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/.
*/
-->
<searchable
xmlns:android="http://schemas.android.com/apk/res/android"
android:label="@string/search_label"
android:hint="@string/search_hint"
android:searchMode="queryRewriteFromText"
android:imeOptions="actionGo"
android:searchSuggestAuthority="com.freerdp.freerdpcore.services.freerdpsuggestionprovider"
android:searchSuggestIntentAction="android.intent.action.VIEW"
android:searchSuggestSelection=" ? "
android:includeInGlobalSearch="true"
android:searchSettingsDescription="@string/search_settings_description"
>
</searchable>

View File

@@ -25,6 +25,29 @@
</intent-filter>
</activity>
<!-- Session request handler activity - used for search and internally to start sessions -->
<!-- This should actually be defined in FreeRDPCore lib but Android manifest merging will -->
<!-- append the libs manifest to the apps manifest and therefore aliasing is not possible -->
<activity android:name="com.freerdp.freerdpcore.services.SessionRequestHandlerActivity"
android:theme="@android:style/Theme.NoDisplay"
android:noHistory="true"
android:excludeFromRecents="true">
</activity>
<activity-alias android:name=".services.SessionRequestHandlerActivity"
android:targetActivity="com.freerdp.freerdpcore.services.SessionRequestHandlerActivity">
<intent-filter>
<action android:name="android.intent.action.SEARCH" />
</intent-filter>
<meta-data android:name="android.app.searchable"
android:resource="@xml/searchable" />
</activity-alias>
<provider android:name="com.freerdp.freerdpcore.services.FreeRDPSuggestionProvider"
android:authorities="com.freerdp.afreerdp.services.freerdpsuggestionprovider"
>
</provider>
</application>
</manifest>

View File

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 40 KiB

View File

Before

Width:  |  Height:  |  Size: 140 KiB

After

Width:  |  Height:  |  Size: 140 KiB

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 140 KiB

After

Width:  |  Height:  |  Size: 140 KiB

View File

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 62 KiB

View File

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 39 KiB

View File

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

View File

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

View File

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

View File

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

View File

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

View File

Before

Width:  |  Height:  |  Size: 125 KiB

After

Width:  |  Height:  |  Size: 125 KiB

View File

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 100 KiB

View File

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

Before

Width:  |  Height:  |  Size: 140 KiB

After

Width:  |  Height:  |  Size: 140 KiB

View File

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

View File

@@ -1,3 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<lint>
</lint>

View File

@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="key_height">50dip</dimen>
</resources>

View File

@@ -1,72 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- key codes to switch between keyboards -->
<integer name="keycode_cursor_keyboard">0xF1</integer>
<integer name="keycode_numpad_keyboard">0xF2</integer>
<integer name="keycode_specialkeys_keyboard">0xF3</integer>
<!-- common keys - maps to Android KeyEvent.KeyCode consts -->
<integer name="keycode_enter">0x01</integer>
<integer name="keycode_backspace">0x02</integer>
<!-- shared keys -->
<integer name="keycode_win">0x03</integer>
<integer name="keycode_menu">0x04</integer>
<integer name="keycode_esc">0x05</integer>
<integer name="keycode_toggle_win">0x06</integer>
<integer name="keycode_toggle_ctrl">0x07</integer>
<integer name="keycode_toggle_shift">0x08</integer>
<integer name="keycode_toggle_alt">0x09</integer>
<!-- numpad key codes -->
<integer name="keycode_numpad_0">0x0A</integer>
<integer name="keycode_numpad_1">0x0B</integer>
<integer name="keycode_numpad_2">0x0C</integer>
<integer name="keycode_numpad_3">0x0D</integer>
<integer name="keycode_numpad_4">0x0E</integer>
<integer name="keycode_numpad_5">0x0F</integer>
<integer name="keycode_numpad_6">0x10</integer>
<integer name="keycode_numpad_7">0x11</integer>
<integer name="keycode_numpad_8">0x12</integer>
<integer name="keycode_numpad_9">0x13</integer>
<integer name="keycode_numpad_add">0x14</integer>
<integer name="keycode_numpad_comma">0x15</integer>
<integer name="keycode_numpad_divide">0x16</integer>
<integer name="keycode_numpad_enter">0x17</integer>
<integer name="keycode_numpad_multiply">0x18</integer>
<integer name="keycode_numpad_subtract">0x19</integer>
<integer name="keycode_numpad_equals">0x1A</integer>
<integer name="keycode_numpad_numlock">0x1B</integer>
<integer name="keycode_numpad_left_paren">0x1C</integer>
<integer name="keycode_numpad_right_paren">0x1D</integer>
<!-- special key codes -->
<integer name="keycode_F1">0x1E</integer>
<integer name="keycode_F2">0x1F</integer>
<integer name="keycode_F3">0x20</integer>
<integer name="keycode_F4">0x21</integer>
<integer name="keycode_F5">0x22</integer>
<integer name="keycode_F6">0x23</integer>
<integer name="keycode_F7">0x24</integer>
<integer name="keycode_F8">0x25</integer>
<integer name="keycode_F9">0x26</integer>
<integer name="keycode_F10">0x27</integer>
<integer name="keycode_F11">0x28</integer>
<integer name="keycode_F12">0x29</integer>
<integer name="keycode_tab">0x2A</integer>
<integer name="keycode_print">0x2B</integer>
<integer name="keycode_insert">0x2C</integer>
<integer name="keycode_delete">0x2D</integer>
<integer name="keycode_home">0x2E</integer>
<integer name="keycode_end">0x2F</integer>
<integer name="keycode_pgup">0x30</integer>
<integer name="keycode_pgdn">0x31</integer>
<!-- cursor key codes -->
<integer name="keycode_up">0x32</integer>
<integer name="keycode_down">0x33</integer>
<integer name="keycode_left">0x34</integer>
<integer name="keycode_right">0x45</integer>
</resources>

View File

@@ -1,57 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources>
<style name="Theme.Settings" parent="android:Theme.Light">
<item name="android:listSeparatorTextViewStyle">@style/SettingsCategory</item>
</style>
<style name="Theme.Main" parent="android:Theme.Light">
</style>
<style name="SettingsCategory">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">25dip</item>
<item name="android:textStyle">bold</item>
<item name="android:textSize">14sp</item>
<item name="android:gravity">center_vertical</item>
<item name="android:paddingLeft">5sp</item>
<item name="android:textColor">@color/separator_text_color</item>
<item name="android:layout_margin">2dp</item>
<item name="android:background">@drawable/separator_background</item>
</style>
<style name="ButtonText">
<item name="android:textColor">@color/button_text_color</item>
<item name="android:gravity">center</item>
<item name="android:layout_margin">2dp</item>
<item name="android:textSize">18dp</item>
<item name="android:padding">6dp</item>
<item name="android:background">@drawable/button_background</item>
</style>
<style name="LabelText">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textColor">@android:color/primary_text_light</item>
<item name="android:layout_margin">2dp</item>
<item name="android:textSize">14dp</item>
</style>
<style name="GetStartedHeaderText">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textColor">@android:color/primary_text_light</item>
<item name="android:textSize">18dp</item>
<item name="android:textStyle">bold</item>
<item name="android:paddingTop">10dp</item>
<item name="android:paddingBottom">10dp</item>
<item name="android:paddingLeft">4dp</item>
<item name="android:paddingRight">4dp</item>
</style>
<style name="GetStartedText">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textColor">@android:color/primary_text_light</item>
<item name="android:textSize">15dp</item>
<item name="android:paddingLeft">4dp</item>
<item name="android:paddingRight">4dp</item>
<item name="android:paddingTop">5dp</item>
<item name="android:paddingBottom">5dp</item>
</style>
</resources>