From: masensio <masensio@solidgear.es>
Date: Wed, 27 May 2015 12:19:30 +0000 (+0200)
Subject: Merge branch 'remove_ActionBarSherlock' into navigationDrawer_update
X-Git-Tag: oc-android-1.7.2~1^2~23^2~37^2~3
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c20041d157baebede8e47a5f6837ba7dd51204f7?ds=inline

Merge branch 'remove_ActionBarSherlock' into navigationDrawer_update

Conflicts:
	res/menu/main_menu.xml
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/activity/FolderPickerActivity.java
	src/com/owncloud/android/ui/activity/Preferences.java
	src/com/owncloud/android/ui/preview/PreviewImageActivity.java
---

c20041d157baebede8e47a5f6837ba7dd51204f7
diff --cc res/layout/files.xml
index b1050ff0,5d62c131..5f11f068
--- a/res/layout/files.xml
+++ b/res/layout/files.xml
@@@ -16,81 -16,27 +16,81 @@@
  
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 - -->
 -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 +  -->
 +<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
 +    android:id="@+id/drawer_layout"
      android:layout_width="match_parent"
      android:layout_height="match_parent"
 -    android:background="@color/background_color"
 -    android:orientation="horizontal"
 -    android:baselineAligned="false"
 -    >
 -
 -	<FrameLayout 
 -		android:layout_width="0dp"
 -		android:layout_height="match_parent"
 -		android:layout_weight="1"
 -		android:id="@+id/left_fragment_container"
 -	    />
 -	
 -	<FrameLayout 
 -		android:layout_width="0dp"
 -		android:layout_height="match_parent"
 -		android:layout_weight="2"
 -		android:id="@+id/right_fragment_container"
 -	    />
 -	
 - </LinearLayout>
 +    android:clickable="true" >
 +
 +    <!-- The main content view -->
 +    <LinearLayout
 +        xmlns:android="http://schemas.android.com/apk/res/android"
 +        android:layout_width="match_parent"
 +        android:layout_height="match_parent"
 +        android:background="@color/background_color"
 +        android:baselineAligned="false"
 +        android:orientation="horizontal" >
 +
 +
 +        <FrameLayout
 +            android:id="@+id/left_fragment_container"
 +            android:layout_width="0dp"
 +            android:layout_height="match_parent"
 +            android:layout_weight="1" />
 +
 +        <FrameLayout
 +            android:id="@+id/right_fragment_container"
 +            android:layout_width="0dp"
 +            android:layout_height="match_parent"
 +            android:layout_weight="2" />
 +    </LinearLayout>
 +
 +
 +    <LinearLayout
 +        xmlns:android="http://schemas.android.com/apk/res/android"
 +        android:id="@+id/left_drawer"
 +        android:layout_width="240dp"
 +        android:layout_height="match_parent"
 +        android:layout_gravity="start"
 +        android:background="@color/background_color"
 +        android:baselineAligned="false"
 +        android:clickable="true"
 +        android:orientation="vertical">
 +
 +        <LinearLayout
 +            android:layout_width="match_parent"
 +            android:layout_height="wrap_content"
 +            android:layout_margin="5dp">
 +
 +            <ImageView
 +                android:id="@+id/drawer_userIcon"
 +                android:layout_width="40dp"
 +                android:layout_height="40dp"
-                 android:src="@drawable/abs__ab_solid_dark_holo" />
++                android:src="@drawable/abc_ab_bottom_solid_dark_holo" />
 +
 +            <TextView
 +                android:id="@+id/drawer_username"
 +                android:layout_width="wrap_content"
 +                android:layout_height="wrap_content"
 +                android:layout_gravity="center_vertical"
 +                android:layout_marginLeft="5dp"
 +                android:layout_marginStart="5dp"
 +                android:textAppearance="?android:attr/textAppearanceLarge" />
 +
 +        </LinearLayout>
 +
 +        <TextView
 +            android:layout_width="fill_parent"
 +            android:layout_height="2dip"
 +            android:background="@color/list_item_lastmod_and_filesize_text" />
 +
 +        <ListView
 +            android:id="@+id/drawer_list"
 +            android:layout_width="fill_parent"
 +            android:layout_height="match_parent"
 +            android:background="@color/background_color"
 +            android:choiceMode="singleChoice"
 +            />
 +    </LinearLayout>
 +</android.support.v4.widget.DrawerLayout>
diff --cc res/menu/main_menu.xml
index ab41e4ba,053d84a6..117afdd8
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@@ -34,13 -35,36 +35,36 @@@
          android:title="@string/actionbar_mkdir"
          android:contentDescription="@string/actionbar_mkdir"/>
      <item
+         android:id="@+id/action_sync_account"
+         android:icon="@drawable/ic_action_refresh"
+         android:orderInCategory="2"
+         app:showAsAction="never"
+         android:title="@string/actionbar_sync"
+         android:contentDescription="@string/actionbar_sync"/>
+     <item
+         android:id="@+id/action_settings"
+         android:icon="@drawable/ic_action_settings"
+         android:orderInCategory="2"
+         app:showAsAction="never"
+         android:title="@string/actionbar_settings"
+         android:contentDescription="@string/actionbar_settings"/>
+     <item
+         android:id="@+id/action_logger"
+         android:icon="@drawable/ic_action_settings"
+         android:orderInCategory="2"
+         app:showAsAction="never"
+         android:title="@string/actionbar_logger"
+         android:contentDescription="@string/actionbar_logger"/>
+ 	<item
          android:id="@+id/action_sort"
 -        android:icon="@android:drawable/ic_menu_sort_alphabetically"
 +        android:icon="@android:drawable/ic_menu_sort_by_size"
          android:orderInCategory="2"
-         android:showAsAction="always"
 -        app:showAsAction="never"
++        app:showAsAction="always"
          android:title="@string/actionbar_sort"
-         android:contentDescription="@string/actionbar_sort"/>/>
+         android:contentDescription="@string/actionbar_sort"/>
  
-     <!-- <item android:id="@+id/search" android:title="@string/actionbar_search" android:icon="@drawable/ic_action_search"></item> -->
+     <!-- <item android:id="@+id/search"
+     android:title="@string/actionbar_search"
+     android:icon="@drawable/ic_action_search"></item> -->
  
  </menu>
diff --cc src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index c37d9271,67173d7e..0844dc26
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@@ -53,16 -50,14 +53,22 @@@ import android.support.v4.app.ActionBar
  import android.support.v4.app.Fragment;
  import android.support.v4.app.FragmentManager;
  import android.support.v4.app.FragmentTransaction;
++
 +import android.support.v4.view.GravityCompat;
 +import android.support.v4.widget.DrawerLayout;
+ import android.support.v7.app.ActionBar;
+ import android.view.Menu;
+ import android.view.MenuInflater;
+ import android.view.MenuItem;
  import android.view.View;
  import android.view.ViewGroup;
+ import android.view.Window;
++
 +import android.widget.AdapterView;
- import android.widget.AdapterView.OnItemClickListener;
  import android.widget.ArrayAdapter;
 +import android.widget.ImageView;
 +import android.widget.LinearLayout;
 +import android.widget.ListView;
  import android.widget.TextView;
  import android.widget.Toast;
  
@@@ -222,15 -193,14 +225,17 @@@ public class FileDisplayActivity extend
          }
  
          // Action bar setup
-         mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);
-         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-         getSupportActionBar().setHomeButtonEnabled(true);       // mandatory since Android ICS, according to the official documentation
-         getSupportActionBar().setDisplayShowCustomEnabled(true); // CRUCIAL - for displaying your custom actionbar
-         getSupportActionBar().setDisplayShowTitleEnabled(true);
-         setSupportProgressBarIndeterminateVisibility(mSyncInProgress /*|| mRefreshSharesInProgress*/);    // always AFTER setContentView(...) ; to work around bug in its implementation
+         mDirectories = new CustomArrayAdapter<String>(this,
+                 R.layout.support_simple_spinner_dropdown_item);
+         getSupportActionBar().setHomeButtonEnabled(true);       // mandatory since Android ICS,
+                                                                 // according to the official
+                                                                 // documentation
+         setSupportProgressBarIndeterminateVisibility(mSyncInProgress
+         /*|| mRefreshSharesInProgress*/);
+         // always AFTER setContentView(...) ; to work around bug in its implementation
 +
 +        // TODO Remove??, it is done in onPostCreate
 +        mDrawerToggle.syncState();
          
          setBackgroundText();
  
@@@ -783,7 -687,7 +808,8 @@@
  
          } else {
              Log_OC.d(TAG, "User clicked on 'Update' with no selection");
--            Toast t = Toast.makeText(this, getString(R.string.filedisplay_no_file_selected), Toast.LENGTH_LONG);
++            Toast t = Toast.makeText(this, getString(R.string.filedisplay_no_file_selected),
++                    Toast.LENGTH_LONG);
              t.show();
              return;
          }
@@@ -1047,30 -960,31 +1085,37 @@@
                          if (currentDir == null) {
                              // current folder was removed from the server 
                              Toast.makeText( FileDisplayActivity.this, 
-                                             String.format(getString(R.string.sync_current_folder_was_removed), mDirectories.getItem(0)), 
 -                                            String.format(getString(R.string.sync_current_folder_was_removed),
++                                            String.format(
++                                                    getString(R.string.sync_current_folder_was_removed),
+                                                     mDirectories.getItem(0)),
                                              Toast.LENGTH_LONG)
                                  .show();
                              browseToRoot();
                              
                          } else {
                              if (currentFile == null && !getFile().isFolder()) {
--                                // currently selected file was removed in the server, and now we know it
++                                // currently selected file was removed in the server, and now we
++                                // know it
                                  cleanSecondFragment();
                                  currentFile = currentDir;
                              }
  
-                             if (synchFolderRemotePath != null && currentDir.getRemotePath().equals(synchFolderRemotePath)) {
+                             if (synchFolderRemotePath != null &&
+                                     currentDir.getRemotePath().equals(synchFolderRemotePath)) {
                                  OCFileListFragment fileListFragment = getListOfFilesFragment();
                                  if (fileListFragment != null) {
 -                                    fileListFragment.listDirectory(currentDir);
 +                                    fileListFragment.listDirectory();
 +                                    // TODO Enable when "On Device" is recovered ?
-                                     // fileListFragment.listDirectory(currentDir, MainApp.getOnlyOnDevice());
++                                    // fileListFragment.listDirectory(currentDir,
++                                    // MainApp.getOnlyOnDevice());
                                  }
                              }
                              setFile(currentFile);
                          }
                          
-                         mSyncInProgress = (!FileSyncAdapter.EVENT_FULL_SYNC_END.equals(event) && !RefreshFolderOperation.EVENT_SINGLE_FOLDER_SHARES_SYNCED.equals(event));
+                         mSyncInProgress = (!FileSyncAdapter.EVENT_FULL_SYNC_END.equals(event) &&
 -                                !RefreshFolderOperation.EVENT_SINGLE_FOLDER_SHARES_SYNCED.equals(event));
++                                !RefreshFolderOperation.EVENT_SINGLE_FOLDER_SHARES_SYNCED
++                                        .equals(event));
                                  
                          if (RefreshFolderOperation.EVENT_SINGLE_FOLDER_CONTENTS_SYNCED.
                                      equals(event) &&
@@@ -1374,11 -1289,13 +1426,14 @@@
                  actionBar.setTitle(getString(R.string.default_display_name_for_root_folder));
                  View actionBarTitleView = getWindow().getDecorView().findViewById(actionBarTitleId);
                  if (actionBarTitleView != null) {    // it's null in Android 2.x
--                    actionBarTitleView.setContentDescription(getString(R.string.default_display_name_for_root_folder));
++                    actionBarTitleView.setContentDescription(
++                            getString(R.string.default_display_name_for_root_folder));
                  }
              }
-             actionBar.setNavigationMode(!noRoot ? ActionBar.NAVIGATION_MODE_STANDARD : ActionBar.NAVIGATION_MODE_LIST);
-             actionBar.setListNavigationCallbacks(mDirectories, this);   // assuming mDirectories is updated
+             actionBar.setNavigationMode(!noRoot ? ActionBar.NAVIGATION_MODE_STANDARD :
+                     ActionBar.NAVIGATION_MODE_LIST);
+             actionBar.setListNavigationCallbacks(mDirectories, this);
+             // assuming mDirectories is updated
  
          } else {
              actionBar.setDisplayHomeAsUpEnabled(true);
@@@ -1404,7 -1321,7 +1459,8 @@@
  
          @Override
          public void onServiceConnected(ComponentName component, IBinder service) {
--            if (component.equals(new ComponentName(FileDisplayActivity.this, FileDownloader.class))) {
++            if (component.equals(new ComponentName(
++                    FileDisplayActivity.this, FileDownloader.class))) {
                  Log_OC.d(TAG, "Download service connected");
                  mDownloaderBinder = (FileDownloaderBinder) service;
                  if (mWaitingToPreview != null)
diff --cc src/com/owncloud/android/ui/activity/FolderPickerActivity.java
index f135dcea,5fd2bdf5..a358f79e
--- a/src/com/owncloud/android/ui/activity/FolderPickerActivity.java
+++ b/src/com/owncloud/android/ui/activity/FolderPickerActivity.java
@@@ -258,9 -261,12 +258,9 @@@ public class FolderPickerActivity exten
      
      @Override
      public boolean onCreateOptionsMenu(Menu menu) {
-         MenuInflater inflater = getSherlock().getMenuInflater();
+         MenuInflater inflater = getMenuInflater();
          inflater.inflate(R.menu.main_menu, menu);
          menu.findItem(R.id.action_upload).setVisible(false);
 -        menu.findItem(R.id.action_settings).setVisible(false);
 -        menu.findItem(R.id.action_sync_account).setVisible(false);
 -        menu.findItem(R.id.action_logger).setVisible(false);
          menu.findItem(R.id.action_sort).setVisible(false);
          return true;
      }
diff --cc src/com/owncloud/android/ui/activity/Preferences.java
index 39fc314c,23ab550a..ef8c2226
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@@ -50,11 -54,6 +54,7 @@@ import android.widget.AdapterView.OnIte
  import android.widget.ListAdapter;
  import android.widget.ListView;
  
- import com.actionbarsherlock.app.ActionBar;
- import com.actionbarsherlock.app.SherlockPreferenceActivity;
- import com.actionbarsherlock.view.Menu;
- import com.actionbarsherlock.view.MenuItem;
 +import com.owncloud.android.BuildConfig;
  import com.owncloud.android.MainApp;
  import com.owncloud.android.R;
  import com.owncloud.android.authentication.AccountUtils;
diff --cc src/com/owncloud/android/ui/preview/PreviewImageActivity.java
index 6ff3cb8f,6dc87cbb..a67788a2
--- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
@@@ -139,11 -140,11 +140,14 @@@ public class PreviewImageActivity exten
              // should not be necessary
              parentFolder = getStorageManager().getFileByPath(OCFile.ROOT_PATH);
          }
++
 +        // TODO Enable when "On Device" is recovered ?
          mPreviewImagePagerAdapter = new PreviewImagePagerAdapter(getSupportFragmentManager(),
 -                parentFolder, getAccount(), getStorageManager());
 +                parentFolder, getAccount(), getStorageManager()/*, MainApp.getOnlyOnDevice()*/);
++
          mViewPager = (ExtendedViewPager) findViewById(R.id.fragmentPager);
-         int position = mHasSavedPosition ? mSavedPosition : mPreviewImagePagerAdapter.getFilePosition(getFile());
+         int position = mHasSavedPosition ? mSavedPosition :
+                 mPreviewImagePagerAdapter.getFilePosition(getFile());
          position = (position >= 0) ? position : 0;
          mViewPager.setAdapter(mPreviewImagePagerAdapter); 
          mViewPager.setOnPageChangeListener(this);