Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
e25d4e7d
Kaydet (Commit)
e25d4e7d
authored
Agu 15, 2012
tarafından
Andrzej J.R. Hunt
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Linked ABS. Migrated Settings Activity to v4 + ABS.
Change-Id: I93195124aafd8472671a2cf4edddd82c37789016
üst
1be58f5c
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
29 additions
and
42 deletions
+29
-42
project.properties
android/abs-lib/project.properties
+1
-1
.classpath
android/sdremote/.classpath
+1
-0
project.properties
android/sdremote/project.properties
+1
-0
activity_settings.xml
android/sdremote/res/layout/activity_settings.xml
+0
-6
PairingActivity.java
...te/src/org/libreoffice/impressremote/PairingActivity.java
+3
-2
SettingsActivity.java
...e/src/org/libreoffice/impressremote/SettingsActivity.java
+23
-20
SettingsFragment.java
...e/src/org/libreoffice/impressremote/SettingsFragment.java
+0
-13
No files found.
android/abs-lib/project.properties
Dosyayı görüntüle @
e25d4e7d
...
...
@@ -9,4 +9,4 @@
android.library
=
true
# Project target.
target
=
android-1
4
target
=
android-1
5
android/sdremote/.classpath
Dosyayı görüntüle @
e25d4e7d
...
...
@@ -4,5 +4,6 @@
<classpathentry
kind=
"con"
path=
"com.android.ide.eclipse.adt.LIBRARIES"
/>
<classpathentry
kind=
"src"
path=
"src"
/>
<classpathentry
kind=
"src"
path=
"gen"
/>
<classpathentry
combineaccessrules=
"false"
kind=
"src"
path=
"/abs-lib"
/>
<classpathentry
kind=
"output"
path=
"bin/classes"
/>
</classpath>
android/sdremote/project.properties
Dosyayı görüntüle @
e25d4e7d
...
...
@@ -12,3 +12,4 @@
# Project target.
target
=
android-15
android.library.reference.1
=
../abs-lib/
android/sdremote/res/layout/activity_settings.xml
deleted
100644 → 0
Dosyayı görüntüle @
1be58f5c
<?xml version="1.0" encoding="utf-8"?>
<fragment
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:id=
"@+id/settings_fragment"
android:name=
"org.libreoffice.impressremote.SettingsFragment"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
/>
android/sdremote/src/org/libreoffice/impressremote/PairingActivity.java
Dosyayı görüntüle @
e25d4e7d
...
...
@@ -13,7 +13,6 @@ import java.text.MessageFormat;
import
org.libreoffice.impressremote.communication.CommunicationService
;
import
org.libreoffice.impressremote.communication.CommunicationService.State
;
import
android.app.Activity
;
import
android.content.BroadcastReceiver
;
import
android.content.ComponentName
;
import
android.content.Context
;
...
...
@@ -25,7 +24,9 @@ import android.os.IBinder;
import
android.support.v4.content.LocalBroadcastManager
;
import
android.widget.TextView
;
public
class
PairingActivity
extends
Activity
{
import
com.actionbarsherlock.app.SherlockActivity
;
public
class
PairingActivity
extends
SherlockActivity
{
private
CommunicationService
mCommunicationService
;
private
boolean
mIsBound
=
false
;
private
TextView
mPinText
;
...
...
android/sdremote/src/org/libreoffice/impressremote/SettingsActivity.java
Dosyayı görüntüle @
e25d4e7d
package
org
.
libreoffice
.
impressremote
;
import
android.app.Activity
;
import
android.os.Bundle
;
import
android.view.MenuItem
;
public
class
SettingsActivity
extends
Activity
{
import
com.actionbarsherlock.app.SherlockPreferenceActivity
;
@Override
protected
void
onCreate
(
Bundle
savedInstanceState
)
{
// TODO Auto-generated method stub
super
.
onCreate
(
savedInstanceState
);
setContentView
(
R
.
layout
.
activity_settings
);
getActionBar
().
setDisplayHomeAsUpEnabled
(
true
);
}
public
class
SettingsActivity
extends
SherlockPreferenceActivity
{
@Override
public
boolean
onOptionsItemSelected
(
MenuItem
item
)
{
switch
(
item
.
getItemId
())
{
case
android
.
R
.
id
.
home
:
finish
();
return
true
;
default
:
return
super
.
onOptionsItemSelected
(
item
);
}
}
// We use addPreferencesFromResource as we need sdk-9 compatibility
@SuppressWarnings
(
"deprecation"
)
@Override
protected
void
onCreate
(
Bundle
savedInstanceState
)
{
// TODO Auto-generated method stub
super
.
onCreate
(
savedInstanceState
);
getSupportActionBar
().
setDisplayHomeAsUpEnabled
(
true
);
addPreferencesFromResource
(
R
.
xml
.
preferences
);
}
@Override
public
boolean
onOptionsItemSelected
(
com
.
actionbarsherlock
.
view
.
MenuItem
item
)
{
switch
(
item
.
getItemId
())
{
case
android
.
R
.
id
.
home
:
finish
();
return
true
;
default
:
return
super
.
onOptionsItemSelected
(
item
);
}
}
}
android/sdremote/src/org/libreoffice/impressremote/SettingsFragment.java
deleted
100644 → 0
Dosyayı görüntüle @
1be58f5c
package
org
.
libreoffice
.
impressremote
;
import
android.os.Bundle
;
import
android.preference.PreferenceFragment
;
public
class
SettingsFragment
extends
PreferenceFragment
{
@Override
public
void
onCreate
(
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
addPreferencesFromResource
(
R
.
xml
.
preferences
);
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment