diff --git a/doc/allclasses-frame.html b/doc/allclasses-frame.html index c23dc77aa..70fe23340 100644 --- a/doc/allclasses-frame.html +++ b/doc/allclasses-frame.html @@ -2,10 +2,10 @@ - + All Classes (Ariadne 0.1-dev API) - + @@ -13,7 +13,6 @@

All Classes

- -
- -
@@ -326,37 +334,98 @@

onCreateOptionsMenu

  • onOptionsItemSelected

    public final boolean onOptionsItemSelected(android.view.MenuItem item)
    -
    -
    Overrides:
    -
    onOptionsItemSelected in class AbstractAriadneActivity
    -
    • - +
    • -

      displayDetails

      -
      public final void displayDetails(android.view.MenuItem item)
      -
      Called when the user clicks the About menu item.
      -
      Parameters:
      item - MenuItem object that was clicked
      +

      onPrepareOptionsMenu

      +
      public boolean onPrepareOptionsMenu(android.view.Menu menu)
    -
      +

      • refreshDisplay

        protected final void refreshDisplay()
        Refresh display : refresh the values of Location Provider, Location, ...
        +
        • +
      + + + + + + + +
        +
      • +

        onStop

        +
        protected final void onStop()
        +
        +
        Overrides:
        +
        onStop in class android.app.Activity
        +
        +
        • +
      + + + +
        +
      • +

        onDestroy

        +
        protected final void onDestroy()
        +
        +
        Overrides:
        +
        onDestroy in class android.app.Activity
        +
        +
        • +
      + + + +
        +
      • +

        refreshCrouton

        +
        protected final void refreshCrouton()
        +
        Update which crouton should be displayed.
        +
        • +
      + + + +
        +
      • +

        isBound

        +
        protected final boolean isBound()
        +
        Returns bound state to Location Service.
        +
        Returns:
        boolean Bound State
        +
        • +
      + + + +
        +
      • +

        getService

        +
        protected final LocationService getService()
        +
        Returns Location Service.
        +
        Returns:
        LocationService
        +
        • +
    diff --git a/doc/org/ruleant/ariadne/NavigationView.html b/doc/org/ruleant/ariadne/NavigationView.html index 5c30448b0..078d22465 100644 --- a/doc/org/ruleant/ariadne/NavigationView.html +++ b/doc/org/ruleant/ariadne/NavigationView.html @@ -2,10 +2,10 @@ - + NavigationView (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/ariadne/SettingsActivity.DebugPreferenceFragment.html b/doc/org/ruleant/ariadne/SettingsActivity.DebugPreferenceFragment.html index f0df22a7b..062b5b46d 100644 --- a/doc/org/ruleant/ariadne/SettingsActivity.DebugPreferenceFragment.html +++ b/doc/org/ruleant/ariadne/SettingsActivity.DebugPreferenceFragment.html @@ -2,10 +2,10 @@ - + SettingsActivity.DebugPreferenceFragment (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/ariadne/SettingsActivity.GeneralPreferenceFragment.html b/doc/org/ruleant/ariadne/SettingsActivity.GeneralPreferenceFragment.html index f04f3d6f2..c7bd746c4 100644 --- a/doc/org/ruleant/ariadne/SettingsActivity.GeneralPreferenceFragment.html +++ b/doc/org/ruleant/ariadne/SettingsActivity.GeneralPreferenceFragment.html @@ -2,10 +2,10 @@ - + SettingsActivity.GeneralPreferenceFragment (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/ariadne/SettingsActivity.html b/doc/org/ruleant/ariadne/SettingsActivity.html index 636b78657..1df4f7d7b 100644 --- a/doc/org/ruleant/ariadne/SettingsActivity.html +++ b/doc/org/ruleant/ariadne/SettingsActivity.html @@ -2,10 +2,10 @@ - + SettingsActivity (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/ariadne/class-use/AboutActivity.html b/doc/org/ruleant/ariadne/class-use/AboutActivity.html index 6ba41ac68..cfc0560ed 100644 --- a/doc/org/ruleant/ariadne/class-use/AboutActivity.html +++ b/doc/org/ruleant/ariadne/class-use/AboutActivity.html @@ -2,10 +2,10 @@ - + Uses of Class org.ruleant.ariadne.AboutActivity (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/ariadne/class-use/AbstractAriadneActivity.html b/doc/org/ruleant/ariadne/class-use/AbstractAriadneActivity.html deleted file mode 100644 index 891a2daf0..000000000 --- a/doc/org/ruleant/ariadne/class-use/AbstractAriadneActivity.html +++ /dev/null @@ -1,168 +0,0 @@ - - - - - - -Uses of Class org.ruleant.ariadne.AbstractAriadneActivity (Ariadne 0.1-dev API) - - - - - - - -
    - - - - - -
    -
    -
      -
    • Prev
      • -
    • Next
      • -
    - - -
    - -
    - - -
    - -
    -

    Uses of Class
    org.ruleant.ariadne.AbstractAriadneActivity

    -
    -
    - -
    - -
    - - - - - -
    -
    -
      -
    • Prev
      • -
    • Next
      • -
    - - -
    - -
    - - -
    - -

    Copyright © 2013. All Rights Reserved.

    - - diff --git a/doc/org/ruleant/ariadne/class-use/DetailsActivity.html b/doc/org/ruleant/ariadne/class-use/DetailsActivity.html index 7ee7ea708..a9c61f8cf 100644 --- a/doc/org/ruleant/ariadne/class-use/DetailsActivity.html +++ b/doc/org/ruleant/ariadne/class-use/DetailsActivity.html @@ -2,10 +2,10 @@ - + Uses of Class org.ruleant.ariadne.DetailsActivity (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/ariadne/class-use/LocationService.LocationBinder.html b/doc/org/ruleant/ariadne/class-use/LocationService.LocationBinder.html index a1d134bf5..35119812c 100644 --- a/doc/org/ruleant/ariadne/class-use/LocationService.LocationBinder.html +++ b/doc/org/ruleant/ariadne/class-use/LocationService.LocationBinder.html @@ -2,10 +2,10 @@ - + Uses of Class org.ruleant.ariadne.LocationService.LocationBinder (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/ariadne/class-use/LocationService.html b/doc/org/ruleant/ariadne/class-use/LocationService.html index 36e128b65..7674866f8 100644 --- a/doc/org/ruleant/ariadne/class-use/LocationService.html +++ b/doc/org/ruleant/ariadne/class-use/LocationService.html @@ -2,10 +2,10 @@ - + Uses of Class org.ruleant.ariadne.LocationService (Ariadne 0.1-dev API) - + @@ -66,52 +66,7 @@

    Uses of Class
    org.ruleant.ariadne.LocationService

    -
    - -
    +
    No usage of org.ruleant.ariadne.LocationService
    diff --git a/doc/org/ruleant/ariadne/class-use/MainActivity.html b/doc/org/ruleant/ariadne/class-use/MainActivity.html index 3955ea6e2..6845dbb8f 100644 --- a/doc/org/ruleant/ariadne/class-use/MainActivity.html +++ b/doc/org/ruleant/ariadne/class-use/MainActivity.html @@ -2,10 +2,10 @@ - + Uses of Class org.ruleant.ariadne.MainActivity (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/ariadne/class-use/NavigationView.html b/doc/org/ruleant/ariadne/class-use/NavigationView.html index 8b3ee9abb..a47e25016 100644 --- a/doc/org/ruleant/ariadne/class-use/NavigationView.html +++ b/doc/org/ruleant/ariadne/class-use/NavigationView.html @@ -2,10 +2,10 @@ - + Uses of Class org.ruleant.ariadne.NavigationView (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/ariadne/class-use/SettingsActivity.DebugPreferenceFragment.html b/doc/org/ruleant/ariadne/class-use/SettingsActivity.DebugPreferenceFragment.html index 14af4fdce..990e2edb4 100644 --- a/doc/org/ruleant/ariadne/class-use/SettingsActivity.DebugPreferenceFragment.html +++ b/doc/org/ruleant/ariadne/class-use/SettingsActivity.DebugPreferenceFragment.html @@ -2,10 +2,10 @@ - + Uses of Class org.ruleant.ariadne.SettingsActivity.DebugPreferenceFragment (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/ariadne/class-use/SettingsActivity.GeneralPreferenceFragment.html b/doc/org/ruleant/ariadne/class-use/SettingsActivity.GeneralPreferenceFragment.html index ac5182a76..a2d887fc8 100644 --- a/doc/org/ruleant/ariadne/class-use/SettingsActivity.GeneralPreferenceFragment.html +++ b/doc/org/ruleant/ariadne/class-use/SettingsActivity.GeneralPreferenceFragment.html @@ -2,10 +2,10 @@ - + Uses of Class org.ruleant.ariadne.SettingsActivity.GeneralPreferenceFragment (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/ariadne/class-use/SettingsActivity.html b/doc/org/ruleant/ariadne/class-use/SettingsActivity.html index 4aef58214..22392c969 100644 --- a/doc/org/ruleant/ariadne/class-use/SettingsActivity.html +++ b/doc/org/ruleant/ariadne/class-use/SettingsActivity.html @@ -2,10 +2,10 @@ - + Uses of Class org.ruleant.ariadne.SettingsActivity (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/ariadne/lib/AbstractGeoCoordinate.html b/doc/org/ruleant/ariadne/lib/AbstractGeoCoordinate.html index 80eda95c3..cac2e4b67 100644 --- a/doc/org/ruleant/ariadne/lib/AbstractGeoCoordinate.html +++ b/doc/org/ruleant/ariadne/lib/AbstractGeoCoordinate.html @@ -2,10 +2,10 @@ - + AbstractGeoCoordinate (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/ariadne/lib/AriadneLocation.html b/doc/org/ruleant/ariadne/lib/AriadneLocation.html index 06c9438f8..e085d7357 100644 --- a/doc/org/ruleant/ariadne/lib/AriadneLocation.html +++ b/doc/org/ruleant/ariadne/lib/AriadneLocation.html @@ -2,10 +2,10 @@ - + AriadneLocation (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/ariadne/lib/DebugLevel.html b/doc/org/ruleant/ariadne/lib/DebugLevel.html index 99c7acb93..371256b25 100644 --- a/doc/org/ruleant/ariadne/lib/DebugLevel.html +++ b/doc/org/ruleant/ariadne/lib/DebugLevel.html @@ -2,10 +2,10 @@ - + DebugLevel (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/ariadne/lib/FormatUtils.html b/doc/org/ruleant/ariadne/lib/FormatUtils.html index 40aca9783..5315ca083 100644 --- a/doc/org/ruleant/ariadne/lib/FormatUtils.html +++ b/doc/org/ruleant/ariadne/lib/FormatUtils.html @@ -2,10 +2,10 @@ - + FormatUtils (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/ariadne/lib/Latitude.html b/doc/org/ruleant/ariadne/lib/Latitude.html index a1edfb757..d5c7b327c 100644 --- a/doc/org/ruleant/ariadne/lib/Latitude.html +++ b/doc/org/ruleant/ariadne/lib/Latitude.html @@ -2,10 +2,10 @@ - + Latitude (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/ariadne/lib/Longitude.html b/doc/org/ruleant/ariadne/lib/Longitude.html index ea1e9fd71..415821c24 100644 --- a/doc/org/ruleant/ariadne/lib/Longitude.html +++ b/doc/org/ruleant/ariadne/lib/Longitude.html @@ -2,10 +2,10 @@ - + Longitude (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/ariadne/lib/Navigator.html b/doc/org/ruleant/ariadne/lib/Navigator.html index 1fa134124..1ad57f430 100644 --- a/doc/org/ruleant/ariadne/lib/Navigator.html +++ b/doc/org/ruleant/ariadne/lib/Navigator.html @@ -2,10 +2,10 @@ - + Navigator (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/ariadne/lib/StoredDestination.html b/doc/org/ruleant/ariadne/lib/StoredDestination.html index c6457bd5f..3e0e1134d 100644 --- a/doc/org/ruleant/ariadne/lib/StoredDestination.html +++ b/doc/org/ruleant/ariadne/lib/StoredDestination.html @@ -2,10 +2,10 @@ - + StoredDestination (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/ariadne/lib/StoredLocation.html b/doc/org/ruleant/ariadne/lib/StoredLocation.html index 2bd7ed8a8..4b2d6d4ee 100644 --- a/doc/org/ruleant/ariadne/lib/StoredLocation.html +++ b/doc/org/ruleant/ariadne/lib/StoredLocation.html @@ -2,10 +2,10 @@ - + StoredLocation (Ariadne 0.1-dev API) - + @@ -173,7 +173,7 @@

    Method Summary

    -android.location.Location +void     restore()
    Restore stored location from Shared Preferences.
    @@ -308,9 +308,8 @@

    save

    • restore

      -
      public final android.location.Location restore()
      +
      public final void restore()
      Restore stored location from Shared Preferences.
      -
      Returns:
      location retrieved from Preferences
    diff --git a/doc/org/ruleant/ariadne/lib/class-use/AbstractGeoCoordinate.html b/doc/org/ruleant/ariadne/lib/class-use/AbstractGeoCoordinate.html index feed806d7..249cd3a67 100644 --- a/doc/org/ruleant/ariadne/lib/class-use/AbstractGeoCoordinate.html +++ b/doc/org/ruleant/ariadne/lib/class-use/AbstractGeoCoordinate.html @@ -2,10 +2,10 @@ - + Uses of Class org.ruleant.ariadne.lib.AbstractGeoCoordinate (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/ariadne/lib/class-use/AriadneLocation.html b/doc/org/ruleant/ariadne/lib/class-use/AriadneLocation.html index 4c40a99ad..84d0e97d6 100644 --- a/doc/org/ruleant/ariadne/lib/class-use/AriadneLocation.html +++ b/doc/org/ruleant/ariadne/lib/class-use/AriadneLocation.html @@ -2,10 +2,10 @@ - + Uses of Class org.ruleant.ariadne.lib.AriadneLocation (Ariadne 0.1-dev API) - + @@ -112,12 +112,6 @@

    Uses of Retrieve Location.

    - -AriadneLocation -LocationService.updateLocation() -
    Update Location.
    - - diff --git a/doc/org/ruleant/ariadne/lib/class-use/DebugLevel.html b/doc/org/ruleant/ariadne/lib/class-use/DebugLevel.html index 835279087..7a064f67e 100644 --- a/doc/org/ruleant/ariadne/lib/class-use/DebugLevel.html +++ b/doc/org/ruleant/ariadne/lib/class-use/DebugLevel.html @@ -2,10 +2,10 @@ - +Uses of Class org.ruleant.ariadne.lib.DebugLevel (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/ariadne/lib/class-use/FormatUtils.html b/doc/org/ruleant/ariadne/lib/class-use/FormatUtils.html index 9a066109d..3af468aa8 100644 --- a/doc/org/ruleant/ariadne/lib/class-use/FormatUtils.html +++ b/doc/org/ruleant/ariadne/lib/class-use/FormatUtils.html @@ -2,10 +2,10 @@ - +Uses of Class org.ruleant.ariadne.lib.FormatUtils (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/ariadne/lib/class-use/Latitude.html b/doc/org/ruleant/ariadne/lib/class-use/Latitude.html index c684403aa..f3869c978 100644 --- a/doc/org/ruleant/ariadne/lib/class-use/Latitude.html +++ b/doc/org/ruleant/ariadne/lib/class-use/Latitude.html @@ -2,10 +2,10 @@ - +Uses of Class org.ruleant.ariadne.lib.Latitude (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/ariadne/lib/class-use/Longitude.html b/doc/org/ruleant/ariadne/lib/class-use/Longitude.html index fe88f6799..c116944df 100644 --- a/doc/org/ruleant/ariadne/lib/class-use/Longitude.html +++ b/doc/org/ruleant/ariadne/lib/class-use/Longitude.html @@ -2,10 +2,10 @@ - +Uses of Class org.ruleant.ariadne.lib.Longitude (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/ariadne/lib/class-use/Navigator.html b/doc/org/ruleant/ariadne/lib/class-use/Navigator.html index aee8e5509..0009947b1 100644 --- a/doc/org/ruleant/ariadne/lib/class-use/Navigator.html +++ b/doc/org/ruleant/ariadne/lib/class-use/Navigator.html @@ -2,10 +2,10 @@ - +Uses of Class org.ruleant.ariadne.lib.Navigator (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/ariadne/lib/class-use/StoredDestination.html b/doc/org/ruleant/ariadne/lib/class-use/StoredDestination.html index ab7d5a24b..6441d7bd0 100644 --- a/doc/org/ruleant/ariadne/lib/class-use/StoredDestination.html +++ b/doc/org/ruleant/ariadne/lib/class-use/StoredDestination.html @@ -2,10 +2,10 @@ - +Uses of Class org.ruleant.ariadne.lib.StoredDestination (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/ariadne/lib/class-use/StoredLocation.html b/doc/org/ruleant/ariadne/lib/class-use/StoredLocation.html index b926c7384..5ed8dd233 100644 --- a/doc/org/ruleant/ariadne/lib/class-use/StoredLocation.html +++ b/doc/org/ruleant/ariadne/lib/class-use/StoredLocation.html @@ -2,10 +2,10 @@ - +Uses of Class org.ruleant.ariadne.lib.StoredLocation (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/ariadne/lib/package-frame.html b/doc/org/ruleant/ariadne/lib/package-frame.html index 06f4269b1..714b295ae 100644 --- a/doc/org/ruleant/ariadne/lib/package-frame.html +++ b/doc/org/ruleant/ariadne/lib/package-frame.html @@ -2,10 +2,10 @@ - +org.ruleant.ariadne.lib (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/ariadne/lib/package-summary.html b/doc/org/ruleant/ariadne/lib/package-summary.html index d991c0d4f..b8c93ceeb 100644 --- a/doc/org/ruleant/ariadne/lib/package-summary.html +++ b/doc/org/ruleant/ariadne/lib/package-summary.html @@ -2,10 +2,10 @@ - +org.ruleant.ariadne.lib (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/ariadne/lib/package-tree.html b/doc/org/ruleant/ariadne/lib/package-tree.html index 336f199fe..787246b8f 100644 --- a/doc/org/ruleant/ariadne/lib/package-tree.html +++ b/doc/org/ruleant/ariadne/lib/package-tree.html @@ -2,10 +2,10 @@ - +org.ruleant.ariadne.lib Class Hierarchy (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/ariadne/lib/package-use.html b/doc/org/ruleant/ariadne/lib/package-use.html index b00cd682b..50b131055 100644 --- a/doc/org/ruleant/ariadne/lib/package-use.html +++ b/doc/org/ruleant/ariadne/lib/package-use.html @@ -2,10 +2,10 @@ - +Uses of Package org.ruleant.ariadne.lib (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/ariadne/package-frame.html b/doc/org/ruleant/ariadne/package-frame.html index 4832b8eaf..e76fa1418 100644 --- a/doc/org/ruleant/ariadne/package-frame.html +++ b/doc/org/ruleant/ariadne/package-frame.html @@ -2,10 +2,10 @@ - +org.ruleant.ariadne (Ariadne 0.1-dev API) - + @@ -14,7 +14,6 @@

    Classes

    • AboutActivity
      • -
    • AbstractAriadneActivity
    • DetailsActivity
    • LocationService
    • MainActivity
      • diff --git a/doc/org/ruleant/ariadne/package-summary.html b/doc/org/ruleant/ariadne/package-summary.html index 55029eac7..5358787d0 100644 --- a/doc/org/ruleant/ariadne/package-summary.html +++ b/doc/org/ruleant/ariadne/package-summary.html @@ -2,10 +2,10 @@ - + org.ruleant.ariadne (Ariadne 0.1-dev API) - + @@ -89,49 +89,42 @@

      Package org.ruleant.ariadne

    - - - - - + - + - + - + - + - +
    AbstractAriadneActivity -
    Abstract Ariadne Activity class, contains the common methods - to connect to LocationService.
    -
    DetailsActivity
    Main Activity class.
    LocationService
    Location Service provides the current location.
    MainActivity
    Main Activity class.
    NavigationView
    Navigation view is used to indicate the direction to the destination.
    SettingsActivity
    A PreferenceActivity that presents a set of application settings.
    SettingsActivity.DebugPreferenceFragment
    This fragment shows general preferences only.
    SettingsActivity.GeneralPreferenceFragment
    This fragment shows general preferences only.
    diff --git a/doc/org/ruleant/ariadne/package-tree.html b/doc/org/ruleant/ariadne/package-tree.html index 846f44648..141bce66a 100644 --- a/doc/org/ruleant/ariadne/package-tree.html +++ b/doc/org/ruleant/ariadne/package-tree.html @@ -2,10 +2,10 @@ - + org.ruleant.ariadne Class Hierarchy (Ariadne 0.1-dev API) - + @@ -89,12 +89,7 @@

    Class Hierarchy

  • android.app.Activity (implements android.content.ComponentCallbacks2, android.view.KeyEvent.Callback, android.view.LayoutInflater.Factory2, android.view.View.OnCreateContextMenuListener, android.view.Window.Callback)
    • diff --git a/doc/org/ruleant/ariadne/package-use.html b/doc/org/ruleant/ariadne/package-use.html index 758d4df4b..f8f857a21 100644 --- a/doc/org/ruleant/ariadne/package-use.html +++ b/doc/org/ruleant/ariadne/package-use.html @@ -2,10 +2,10 @@ - + Uses of Package org.ruleant.ariadne (Ariadne 0.1-dev API) - + @@ -66,51 +66,7 @@

    Uses of Package
    org.ruleant.ariadne

    -
    - -
    +
    No usage of org.ruleant.ariadne
    diff --git a/doc/org/ruleant/unitconversion/UnitConversionInterface.html b/doc/org/ruleant/unitconversion/UnitConversionInterface.html index b13a60653..b5acd528d 100644 --- a/doc/org/ruleant/unitconversion/UnitConversionInterface.html +++ b/doc/org/ruleant/unitconversion/UnitConversionInterface.html @@ -2,10 +2,10 @@ - + UnitConversionInterface (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/unitconversion/class-use/UnitConversionInterface.html b/doc/org/ruleant/unitconversion/class-use/UnitConversionInterface.html index e9fe5b604..c7da13310 100644 --- a/doc/org/ruleant/unitconversion/class-use/UnitConversionInterface.html +++ b/doc/org/ruleant/unitconversion/class-use/UnitConversionInterface.html @@ -2,10 +2,10 @@ - + Uses of Interface org.ruleant.unitconversion.UnitConversionInterface (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/unitconversion/package-frame.html b/doc/org/ruleant/unitconversion/package-frame.html index 1c80d1b6b..5fa994758 100644 --- a/doc/org/ruleant/unitconversion/package-frame.html +++ b/doc/org/ruleant/unitconversion/package-frame.html @@ -2,10 +2,10 @@ - + org.ruleant.unitconversion (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/unitconversion/package-summary.html b/doc/org/ruleant/unitconversion/package-summary.html index dd32a66d9..7e6dcff42 100644 --- a/doc/org/ruleant/unitconversion/package-summary.html +++ b/doc/org/ruleant/unitconversion/package-summary.html @@ -2,10 +2,10 @@ - + org.ruleant.unitconversion (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/unitconversion/package-tree.html b/doc/org/ruleant/unitconversion/package-tree.html index 712d44ff8..ba548361b 100644 --- a/doc/org/ruleant/unitconversion/package-tree.html +++ b/doc/org/ruleant/unitconversion/package-tree.html @@ -2,10 +2,10 @@ - + org.ruleant.unitconversion Class Hierarchy (Ariadne 0.1-dev API) - + diff --git a/doc/org/ruleant/unitconversion/package-use.html b/doc/org/ruleant/unitconversion/package-use.html index 77fde4abd..6fab849a4 100644 --- a/doc/org/ruleant/unitconversion/package-use.html +++ b/doc/org/ruleant/unitconversion/package-use.html @@ -2,10 +2,10 @@ - + Uses of Package org.ruleant.unitconversion (Ariadne 0.1-dev API) - + diff --git a/doc/overview-frame.html b/doc/overview-frame.html index b3f7bbc54..ae2466054 100644 --- a/doc/overview-frame.html +++ b/doc/overview-frame.html @@ -2,10 +2,10 @@ - + Overview List (Ariadne 0.1-dev API) - + diff --git a/doc/overview-summary.html b/doc/overview-summary.html index c8d737473..94e640e7d 100644 --- a/doc/overview-summary.html +++ b/doc/overview-summary.html @@ -2,10 +2,10 @@ - + Overview (Ariadne 0.1-dev API) - + diff --git a/doc/overview-tree.html b/doc/overview-tree.html index f4ef1cedb..c2437c371 100644 --- a/doc/overview-tree.html +++ b/doc/overview-tree.html @@ -2,10 +2,10 @@ - + Class Hierarchy (Ariadne 0.1-dev API) - + @@ -97,12 +97,7 @@

    Class Hierarchy

  • android.app.Activity (implements android.content.ComponentCallbacks2, android.view.KeyEvent.Callback, android.view.LayoutInflater.Factory2, android.view.View.OnCreateContextMenuListener, android.view.Window.Callback)
    • diff --git a/res/layout-land/activity_main.xml b/res/layout-land/activity_main.xml index fb4b0fb9b..5965b4337 100644 --- a/res/layout-land/activity_main.xml +++ b/res/layout-land/activity_main.xml @@ -1,35 +1,30 @@ - - + android:layout_centerVertical="true" + android:layout_toLeftOf="@+id/navigationView_ToDest" /> - + - - - + - - \ No newline at end of file + diff --git a/src/org/ruleant/ariadne/NavigationView.java b/src/org/ruleant/ariadne/NavigationView.java index 23e998c3d..93ca7ceb1 100644 --- a/src/org/ruleant/ariadne/NavigationView.java +++ b/src/org/ruleant/ariadne/NavigationView.java @@ -22,6 +22,7 @@ package org.ruleant.ariadne; import android.content.Context; +import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; @@ -54,6 +55,16 @@ public class NavigationView extends ImageView { */ private int mMode = 0; + /** + * Attribute layout_width. + */ + private int mAttributeLayoutWidth = ViewGroup.LayoutParams.MATCH_PARENT; + + /** + * Attribute layout_height. + */ + private int mAttributeLayoutHeight = ViewGroup.LayoutParams.WRAP_CONTENT; + /** * X coordinate. */ @@ -120,6 +131,25 @@ public NavigationView(final Context context, final AttributeSet attributes) { super(context, attributes); + int[] lookForAttributes = new int[] {android.R.attr.layout_width, + android.R.attr.layout_height}; + + TypedArray foundAttributes = context.getTheme().obtainStyledAttributes( + attributes, + lookForAttributes, + 0, 0); + + try { + mAttributeLayoutWidth = foundAttributes.getInteger( + 0, ViewGroup.LayoutParams.MATCH_PARENT); + mAttributeLayoutHeight = foundAttributes.getInteger( + 1, ViewGroup.LayoutParams.WRAP_CONTENT); + } catch (ArrayIndexOutOfBoundsException e) { + e.printStackTrace(); + } finally { + foundAttributes.recycle(); + } + init(); } @@ -183,7 +213,15 @@ public final void onDraw(final Canvas canvas) { if (getWidth() != getHeight()) { ViewGroup.LayoutParams layoutParams = getLayoutParams(); - layoutParams.height = getWidth(); + // adjust height/width according to attribute setting + if (mAttributeLayoutHeight + == ViewGroup.LayoutParams.WRAP_CONTENT) { + layoutParams.height = getWidth(); + } else if (mAttributeLayoutWidth + == ViewGroup.LayoutParams.WRAP_CONTENT) { + layoutParams.width = getHeight(); + } + setLayoutParams(layoutParams); }