Skip to content

C
core
Kaydet (Commit) b9e8e8c1 authored tarafından Jan Holesovsky's avatar Jan Holesovsky
Dosyalara gözat
Seçenekler

Kill trailing whitespace, tabs -> spaces, add modelines. 

Change-Id: I24154279154ba2a9d1ba6cab81d066fcba23cb4e
üst 9dfc5fe0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 375 additions and 358 deletions
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java
Dosyayı görüntüle @ b9e8e8c1
...@@ -66,7 +66,7 @@ public class FileUtilities { ...@@ -66,7 +66,7 @@ public class FileUtilities {
mExtnMap.put(".svg", DRAWING); mExtnMap.put(".svg", DRAWING);
mExtnMap.put(".vsd", DRAWING); mExtnMap.put(".vsd", DRAWING);
mExtnMap.put(".wpg", DRAWING); mExtnMap.put(".wpg", DRAWING);
// FIXME: we need to expand this ... // FIXME: we need to expand this ...
} }
private static final String getExtension(String filename) private static final String getExtension(String filename)
...@@ -133,67 +133,68 @@ public class FileUtilities { ...@@ -133,67 +133,68 @@ public class FileUtilities {
static FilenameFilter getFilenameFilter(final int mode) static FilenameFilter getFilenameFilter(final int mode)
{ {
return new FilenameFilter() { return new FilenameFilter() {
public boolean accept(File dir, String filename) { public boolean accept(File dir, String filename) {
if( new File( dir , filename ).isDirectory() ) if( new File( dir , filename ).isDirectory() )
return true; return true;
return doAccept(filename, mode, ""); return doAccept(filename, mode, "");
} }
}; };
} }
static void sortFiles(File[] files , int sortMode){ static void sortFiles(File[] files , int sortMode)
// Should really change all this to a switch statement... {
if( sortMode == SORT_AZ ){ // Should really change all this to a switch statement...
Arrays.sort( files , new Comparator<File>() { if( sortMode == SORT_AZ ){
public int compare(File lhs, File rhs) { Arrays.sort( files , new Comparator<File>() {
return lhs.getName().compareTo( rhs.getName() ); public int compare(File lhs, File rhs) {
} return lhs.getName().compareTo( rhs.getName() );
}); }
return; });
} return;
if( sortMode == SORT_ZA ){ }
Arrays.sort( files , new Comparator<File>() { if( sortMode == SORT_ZA ){
public int compare(File lhs, File rhs) { Arrays.sort( files , new Comparator<File>() {
return rhs.getName().compareTo( lhs.getName() ); public int compare(File lhs, File rhs) {
} return rhs.getName().compareTo( lhs.getName() );
}); }
return; });
} return;
if( sortMode == SORT_OLDEST ){ }
Arrays.sort( files , new Comparator<File>() { if( sortMode == SORT_OLDEST ){
public int compare(File lhs, File rhs) { Arrays.sort( files , new Comparator<File>() {
return Long.valueOf( lhs.lastModified() ).compareTo( rhs.lastModified() ); public int compare(File lhs, File rhs) {
} return Long.valueOf( lhs.lastModified() ).compareTo( rhs.lastModified() );
}); }
return; });
} return;
if( sortMode == SORT_NEWEST ){ }
Arrays.sort( files , new Comparator<File>() { if( sortMode == SORT_NEWEST ){
public int compare(File lhs, File rhs) { Arrays.sort( files , new Comparator<File>() {
return Long.valueOf( rhs.lastModified() ).compareTo( lhs.lastModified() ); public int compare(File lhs, File rhs) {
} return Long.valueOf( rhs.lastModified() ).compareTo( lhs.lastModified() );
}); }
return; });
} return;
if( sortMode == SORT_LARGEST ){ }
Arrays.sort( files , new Comparator<File>() { if( sortMode == SORT_LARGEST ){
public int compare(File lhs, File rhs) { Arrays.sort( files , new Comparator<File>() {
return Long.valueOf( rhs.length() ).compareTo( lhs.length() ); public int compare(File lhs, File rhs) {
} return Long.valueOf( rhs.length() ).compareTo( lhs.length() );
}); }
return; });
} return;
if( sortMode == SORT_SMALLEST ){ }
Arrays.sort( files , new Comparator<File>() { if( sortMode == SORT_SMALLEST ){
public int compare(File lhs, File rhs) { Arrays.sort( files , new Comparator<File>() {
return Long.valueOf( lhs.length() ).compareTo( rhs.length() ); public int compare(File lhs, File rhs) {
} return Long.valueOf( lhs.length() ).compareTo( rhs.length() );
}); }
return; });
} return;
return; }
} return;
}
static boolean isHidden( File file ){ static boolean isHidden( File file ){
if( file.getName().startsWith(".") ) if( file.getName().startsWith(".") )
......
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
Dosyayı görüntüle @ b9e8e8c1
/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* /*
* This file is part of the LibreOffice project. * This file is part of the LibreOffice project.
* *
...@@ -30,95 +31,95 @@ import android.graphics.Canvas; ...@@ -30,95 +31,95 @@ import android.graphics.Canvas;
import android.graphics.Paint; import android.graphics.Paint;
import android.graphics.Color; import android.graphics.Color;
public class GridItemAdapter extends BaseAdapter{ public class GridItemAdapter extends BaseAdapter {
Context mContext; Context mContext;
File[] filePaths; File[] filePaths;
File currentDirectory; File currentDirectory;
String TAG = "GridItemAdapter"; String TAG = "GridItemAdapter";
public GridItemAdapter(Context mContext, File[] filePaths) { public GridItemAdapter(Context mContext, File[] filePaths) {
this.mContext = mContext; this.mContext = mContext;
this.filePaths = filePaths; this.filePaths = filePaths;
for(File fn : filePaths){ for(File fn : filePaths){
Log.d(TAG, fn.getName()); Log.d(TAG, fn.getName());
} }
} }
public GridItemAdapter(Context mContext, File currentDirectory) {
this.mContext = mContext;
this.currentDirectory = currentDirectory;
filePaths = currentDirectory.listFiles();
}
public GridItemAdapter(Context mContext, File currentDirectory, File[] filteredFiles)
{
this.mContext = mContext;
this.currentDirectory = currentDirectory;
filePaths = filteredFiles;
}
public int getCount() {
return filePaths.length;
}
public Object getItem(int position) {
return null;//filePaths[ position ];
}
public long getItemId(int position) { public GridItemAdapter(Context mContext, File currentDirectory) {
// TODO Auto-generated method stub this.mContext = mContext;
return 0; this.currentDirectory = currentDirectory;
} filePaths = currentDirectory.listFiles();
}
public View getView(int position, View convertView, ViewGroup parent) public GridItemAdapter(Context mContext, File currentDirectory, File[] filteredFiles)
{ {
LayoutInflater inflater = (LayoutInflater) mContext.getSystemService( this.mContext = mContext;
Context.LAYOUT_INFLATER_SERVICE); this.currentDirectory = currentDirectory;
filePaths = filteredFiles;
}
View gridView; public int getCount() {
return filePaths.length;
}
if (convertView == null) { public Object getItem(int position) {
gridView = new View(mContext); return null;//filePaths[ position ];
} else { }
gridView = (View) convertView;
}
// get layout from mobile.xml public long getItemId(int position) {
gridView = inflater.inflate(R.layout.file_explorer_grid_item, null); // TODO Auto-generated method stub
return 0;
}
// set value into textview public View getView(int position, View convertView, ViewGroup parent)
TextView textView = (TextView) gridView {
.findViewById(R.id.grid_item_label); LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(
Context.LAYOUT_INFLATER_SERVICE);
View gridView;
if (convertView == null) {
gridView = new View(mContext);
} else {
gridView = (View) convertView;
}
// get layout from mobile.xml
gridView = inflater.inflate(R.layout.file_explorer_grid_item, null);
// set value into textview
TextView textView = (TextView) gridView
.findViewById(R.id.grid_item_label);
textView.setText(filePaths[position].getName());
// set image based on selected text
ImageView imageView = (ImageView) gridView
.findViewById(R.id.grid_item_image);
if( filePaths[position].isDirectory() ) // Is a folder
{
// Default view is a generic folder icon.
imageView.setImageResource(R.drawable.folder);
// How should we handle empty folders / folders with no thumbnails? -> new files
gridView = inflater.inflate(R.layout.file_explorer_folder_icon, null);
org.libreoffice.ui.FolderIconView icon =
(org.libreoffice.ui.FolderIconView)gridView.findViewById(R.id.folder_icon);
icon.setDir( filePaths[position]);
textView = (TextView) gridView.findViewById(R.id.grid_item_label);
textView.setText(filePaths[position].getName()); textView.setText(filePaths[position].getName());
// set image based on selected text return gridView;
ImageView imageView = (ImageView) gridView }
.findViewById(R.id.grid_item_image); else
if( filePaths[position].isDirectory() ) // Is a folder {
{ File thumbnailFile = new File( filePaths[position].getParent() , "."
// Default view is a generic folder icon. + filePaths[position].getName().split("[.]")[0] + ".png");
imageView.setImageResource(R.drawable.folder); BitmapFactory factory = new BitmapFactory();
// How should we handle empty folders / folders with no thumbnails? -> new files Bitmap thumb = factory.decodeFile( thumbnailFile.getAbsolutePath() );
gridView = inflater.inflate(R.layout.file_explorer_folder_icon, null); if(thumb != null){
org.libreoffice.ui.FolderIconView icon = Log.i( "GRID" , "true" );
(org.libreoffice.ui.FolderIconView)gridView.findViewById(R.id.folder_icon); }else{
icon.setDir( filePaths[position]); Log.i( "GRID" , thumbnailFile.getAbsolutePath() );
textView = (TextView) gridView.findViewById(R.id.grid_item_label);
textView.setText(filePaths[position].getName());
return gridView;
} }
else switch (FileUtilities.getType(filePaths[position].getName()))
{ {
File thumbnailFile = new File( filePaths[position].getParent() , "."
+ filePaths[position].getName().split("[.]")[0] + ".png");
BitmapFactory factory = new BitmapFactory();
Bitmap thumb = factory.decodeFile( thumbnailFile.getAbsolutePath() );
if(thumb != null){
Log.i( "GRID" , "true" );
}else{
Log.i( "GRID" , thumbnailFile.getAbsolutePath() );
}
switch (FileUtilities.getType(filePaths[position].getName()))
{
case FileUtilities.DOC: case FileUtilities.DOC:
if( thumb != null){ if( thumb != null){
imageView.setImageBitmap( thumb ); imageView.setImageBitmap( thumb );
...@@ -126,22 +127,24 @@ public class GridItemAdapter extends BaseAdapter{ ...@@ -126,22 +127,24 @@ public class GridItemAdapter extends BaseAdapter{
} }
imageView.setImageResource(R.drawable.writer); imageView.setImageResource(R.drawable.writer);
break; break;
case FileUtilities.CALC: case FileUtilities.CALC:
imageView.setImageResource(R.drawable.calc); imageView.setImageResource(R.drawable.calc);
break; break;
case FileUtilities.DRAWING: // FIXME: only for now ... case FileUtilities.DRAWING: // FIXME: only for now ...
case FileUtilities.IMPRESS: case FileUtilities.IMPRESS:
imageView.setImageResource(R.drawable.impress); imageView.setImageResource(R.drawable.impress);
break; break;
case FileUtilities.UNKNOWN: case FileUtilities.UNKNOWN:
default: default:
break; // FIXME something prettier ? break; // FIXME something prettier ?
} }
} }
return gridView; return gridView;
} }
public void update(){ public void update(){
this.notifyDataSetChanged(); this.notifyDataSetChanged();
} }
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/ListItemAdapter.java
Dosyayı görüntüle @ b9e8e8c1
/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* /*
* This file is part of the LibreOffice project. * This file is part of the LibreOffice project.
* *
...@@ -25,144 +26,145 @@ import android.widget.ListAdapter; ...@@ -25,144 +26,145 @@ import android.widget.ListAdapter;
import android.widget.TextView; import android.widget.TextView;
/*Currently this is class is not used but instead is implemented as an inner class in LibreOfficeUI. /*Currently this is class is not used but instead is implemented as an inner class in LibreOfficeUI.
* This is because I can't get the onItemClickListener to fire on the listview so I need to set an * This is because I can't get the onItemClickListener to fire on the listview so I need to set an
* onClick listener in the adapter. ( I've tried turning off the focusability etc of the listitem * onClick listener in the adapter. ( I've tried turning off the focusability etc of the listitem
* contents but no dice...) */ * contents but no dice...) */
public class ListItemAdapter implements ListAdapter{ public class ListItemAdapter implements ListAdapter{
private Context mContext; private Context mContext;
private File[] filePaths; private File[] filePaths;
private final long KB = 1024; private final long KB = 1024;
private final long MB = 1048576; private final long MB = 1048576;
public ListItemAdapter(Context mContext, File[] filePaths) { public ListItemAdapter(Context mContext, File[] filePaths) {
this.mContext = mContext; this.mContext = mContext;
this.filePaths = filePaths; this.filePaths = filePaths;
} }
public int getCount() { public int getCount() {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return filePaths.length; return filePaths.length;
} }
public Object getItem(int arg0) { public Object getItem(int arg0) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
public long getItemId(int arg0) { public long getItemId(int arg0) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return 0; return 0;
} }
public int getItemViewType(int arg0) { public int getItemViewType(int arg0) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return 0; return 0;
} }
public View getView(int position, View convertView, ViewGroup parent) { public View getView(int position, View convertView, ViewGroup parent) {
LayoutInflater inflater = (LayoutInflater) mContext.getSystemService( LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(
Context.LAYOUT_INFLATER_SERVICE); Context.LAYOUT_INFLATER_SERVICE);
View listItem; View listItem;
if (convertView == null) { if (convertView == null) {
listItem = new View(mContext); listItem = new View(mContext);
listItem = inflater.inflate(R.layout.file_list_item, null); listItem = inflater.inflate(R.layout.file_list_item, null);
} else { } else {
listItem = (View) convertView; listItem = (View) convertView;
} }
listItem.setClickable(true); listItem.setClickable(true);
listItem.setOnClickListener(new OnClickListener() { listItem.setOnClickListener(new OnClickListener() {
public void onClick(View v) { public void onClick(View v) {
Log.d("LIST", "click!"); Log.d("LIST", "click!");
} }
}); });
// set value into textview // set value into textview
TextView filename = (TextView) listItem.findViewById(R.id.file_list_item_name); TextView filename = (TextView) listItem.findViewById(R.id.file_list_item_name);
filename.setText( filePaths[ position ].getName() ); filename.setText( filePaths[ position ].getName() );
//filename.setClickable(true); //filename.setClickable(true);
TextView fileSize = (TextView) listItem.findViewById(R.id.file_list_item_size); TextView fileSize = (TextView) listItem.findViewById(R.id.file_list_item_size);
//TODO Give size in KB , MB as appropriate. //TODO Give size in KB , MB as appropriate.
String size = "0B"; String size = "0B";
long length = filePaths[ position ].length(); long length = filePaths[ position ].length();
if( length < KB ){ if( length < KB ){
size = Long.toString( length ) + "B"; size = Long.toString( length ) + "B";
} }
if( length >= KB && length < MB){ if( length >= KB && length < MB){
size = Long.toString( length/KB ) + "KB"; size = Long.toString( length/KB ) + "KB";
} }
if( length >= MB){ if( length >= MB){
size = Long.toString( length/MB ) + "MB"; size = Long.toString( length/MB ) + "MB";
} }
fileSize.setText( size ); fileSize.setText( size );
//fileSize.setClickable(true); //fileSize.setClickable(true);
TextView fileDate = (TextView) listItem.findViewById(R.id.file_list_item_date); TextView fileDate = (TextView) listItem.findViewById(R.id.file_list_item_date);
SimpleDateFormat df = new SimpleDateFormat("dd MMM yyyy hh:ss"); SimpleDateFormat df = new SimpleDateFormat("dd MMM yyyy hh:ss");
Date date = new Date( filePaths[ position ].lastModified() ); Date date = new Date( filePaths[ position ].lastModified() );
//TODO format date //TODO format date
fileDate.setText( df.format( date ) ); fileDate.setText( df.format( date ) );
// set image based on selected text // set image based on selected text
ImageView imageView = (ImageView) listItem.findViewById(R.id.file_list_item_icon); ImageView imageView = (ImageView) listItem.findViewById(R.id.file_list_item_icon);
if( filePaths[position].getName().endsWith(".odt") ){ if( filePaths[position].getName().endsWith(".odt") ){
imageView.setImageResource(R.drawable.writer); imageView.setImageResource(R.drawable.writer);
} }
if( filePaths[position].getName().endsWith(".ods") ){ if( filePaths[position].getName().endsWith(".ods") ){
imageView.setImageResource(R.drawable.calc); imageView.setImageResource(R.drawable.calc);
} }
if( filePaths[position].getName().endsWith(".odp") ){ if( filePaths[position].getName().endsWith(".odp") ){
imageView.setImageResource(R.drawable.impress); imageView.setImageResource(R.drawable.impress);
} }
if( filePaths[position].isDirectory() ){ if( filePaths[position].isDirectory() ){
//Eventually have thumbnails of each sub file on a black circle //Eventually have thumbnails of each sub file on a black circle
//For now just a folder icon //For now just a folder icon
imageView.setImageResource(R.drawable.folder); imageView.setImageResource(R.drawable.folder);
} }
//imageView.setClickable(true); //imageView.setClickable(true);
return listItem; return listItem;
} }
public int getViewTypeCount() { public int getViewTypeCount() {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return 1; return 1;
} }
public boolean hasStableIds() { public boolean hasStableIds() {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return false; return false;
} }
public boolean isEmpty() { public boolean isEmpty() {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return false; return false;
} }
public void registerDataSetObserver(DataSetObserver arg0) { public void registerDataSetObserver(DataSetObserver arg0) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
public void unregisterDataSetObserver(DataSetObserver arg0) { public void unregisterDataSetObserver(DataSetObserver arg0) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
public boolean areAllItemsEnabled() { public boolean areAllItemsEnabled() {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return false; return false;
} }
public boolean isEnabled(int position) { public boolean isEnabled(int position) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return false; return false;
} }
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/PageView.java
Dosyayı görüntüle @ b9e8e8c1
/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
package org.libreoffice.ui; package org.libreoffice.ui;
import org.libreoffice.R; import org.libreoffice.R;
...@@ -13,53 +15,55 @@ import android.util.Log; ...@@ -13,53 +15,55 @@ import android.util.Log;
import android.view.View; import android.view.View;
public class PageView extends View{ public class PageView extends View{
private Bitmap bmp; private Bitmap bmp;
private Paint mPaintBlack; private Paint mPaintBlack;
private String tag = "PageView"; private String tag = "PageView";
public PageView(Context context ) { public PageView(Context context ) {
super(context); super(context);
bmp = BitmapFactory.decodeResource(getResources(), R.drawable.dummy_page); bmp = BitmapFactory.decodeResource(getResources(), R.drawable.dummy_page);
intialise(); intialise();
} }
public PageView(Context context, AttributeSet attrs) { public PageView(Context context, AttributeSet attrs) {
super(context, attrs); super(context, attrs);
bmp = BitmapFactory.decodeResource(getResources(), R.drawable.dummy_page); bmp = BitmapFactory.decodeResource(getResources(), R.drawable.dummy_page);
Log.d( tag , bmp.toString()); Log.d( tag , bmp.toString());
intialise(); intialise();
} }
public PageView(Context context, AttributeSet attrs, int defStyle) { public PageView(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle); super(context, attrs, defStyle);
bmp = BitmapFactory.decodeResource(getResources(), R.drawable.dummy_page);//load a "page" bmp = BitmapFactory.decodeResource(getResources(), R.drawable.dummy_page);//load a "page"
intialise(); intialise();
} }
private void intialise(){ private void intialise(){
mPaintBlack = new Paint(); mPaintBlack = new Paint();
mPaintBlack.setARGB(255, 0, 0, 0); mPaintBlack.setARGB(255, 0, 0, 0);
Log.d(tag, " Doing some set-up"); Log.d(tag, " Doing some set-up");
}
public void setBitmap(Bitmap bmp){
this.bmp = bmp;
}
@Override
protected void onDraw(Canvas canvas) {
super.onDraw(canvas);
Log.d(tag, "Draw");
Log.d(tag, Integer.toString(bmp.getHeight()));
if( bmp != null ){
int horizontalMargin = (int) (canvas.getWidth()*0.1);
//int verticalMargin = (int) (canvas.getHeight()*0.1);
int verticalMargin = horizontalMargin;
canvas.drawBitmap(bmp, new Rect(0, 0, bmp.getWidth(), bmp.getHeight()),
new Rect(horizontalMargin,verticalMargin,canvas.getWidth()-horizontalMargin,
canvas.getHeight()-verticalMargin),
mPaintBlack);//
}
if( bmp == null)
canvas.drawText("Bmp is null!", 100, 100, new Paint());
} }
public void setBitmap(Bitmap bmp){
this.bmp = bmp;
}
@Override
protected void onDraw(Canvas canvas) {
super.onDraw(canvas);
Log.d(tag, "Draw");
Log.d(tag, Integer.toString(bmp.getHeight()));
if( bmp != null ){
int horizontalMargin = (int) (canvas.getWidth()*0.1);
//int verticalMargin = (int) (canvas.getHeight()*0.1);
int verticalMargin = horizontalMargin;
canvas.drawBitmap(bmp, new Rect(0, 0, bmp.getWidth(), bmp.getHeight()),
new Rect(horizontalMargin,verticalMargin,canvas.getWidth()-horizontalMargin,
canvas.getHeight()-verticalMargin),
mPaintBlack);//
}
if( bmp == null)
canvas.drawText("Bmp is null!", 100, 100, new Paint());
}
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/PreferenceEditor.java
Dosyayı görüntüle @ b9e8e8c1
/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* /*
* This file is part of the LibreOffice project. * This file is part of the LibreOffice project.
* *
...@@ -5,6 +6,7 @@ ...@@ -5,6 +6,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
package org.libreoffice.ui; package org.libreoffice.ui;
import org.libreoffice.R; import org.libreoffice.R;
...@@ -16,12 +18,14 @@ import android.preference.Preference.OnPreferenceClickListener; ...@@ -16,12 +18,14 @@ import android.preference.Preference.OnPreferenceClickListener;
import android.preference.PreferenceActivity; import android.preference.PreferenceActivity;
public class PreferenceEditor extends PreferenceActivity { public class PreferenceEditor extends PreferenceActivity {
public final static String FilterTypePrefKey = "FilterTypePreference"; public final static String FilterTypePrefKey = "FilterTypePreference";
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
addPreferencesFromResource( R.xml.libreoffice_preferences ); addPreferencesFromResource( R.xml.libreoffice_preferences );
//mPrefs = getSharedPreferences( LibreOfficeUIActivity.EXPLORER_PREFS_KEY , MODE_PRIVATE ); //mPrefs = getSharedPreferences( LibreOfficeUIActivity.EXPLORER_PREFS_KEY , MODE_PRIVATE );
} }
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/WriterViewerActivity.java
Dosyayı görüntüle @ b9e8e8c1
/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* /*
* This file is part of the LibreOffice project. * This file is part of the LibreOffice project.
* *
...@@ -17,31 +18,33 @@ import android.os.Bundle; ...@@ -17,31 +18,33 @@ import android.os.Bundle;
import android.view.MenuItem; import android.view.MenuItem;
public class WriterViewerActivity extends Activity{ public class WriterViewerActivity extends Activity{
private Bundle extras; private Bundle extras;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
extras = getIntent().getExtras(); extras = getIntent().getExtras();
setContentView(R.layout.main); setContentView(R.layout.main);
ActionBar actionBar = getActionBar(); ActionBar actionBar = getActionBar();
actionBar.setDisplayHomeAsUpEnabled(true); actionBar.setDisplayHomeAsUpEnabled(true);
} }
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case android.R.id.home: case android.R.id.home:
// app icon in action bar clicked; go home // app icon in action bar clicked; go home
Intent intent = new Intent(this, LibreOfficeUIActivity.class); Intent intent = new Intent(this, LibreOfficeUIActivity.class);
intent.putExtras( extras ); intent.putExtras( extras );
//intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); //intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
startActivity(intent); startActivity(intent);
return true; return true;
default: default:
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }
} }
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment