From 26f9216a8afffd57139d90bc31db2eb55e0e763d Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Sun, 1 Apr 2012 00:46:00 +0200 Subject: [PATCH] Merge accessibility branch + update imports --- OsmAnd/res/layout/alert.xml | 12 + OsmAnd/res/layout/calculate_route.xml | 6 +- OsmAnd/res/layout/notification.xml | 12 + OsmAnd/res/layout/search_address.xml | 8 +- OsmAnd/res/layout/search_main.xml | 1 + OsmAnd/res/layout/searchpoi.xml | 4 +- OsmAnd/res/values-ru/strings.xml | 71 +++- OsmAnd/res/values/strings.xml | 50 +++ OsmAnd/res/xml/settings_pref.xml | 7 + OsmAnd/src/net/osmand/OpenstreetmapPoint.java | 1 - .../net/osmand/OpenstreetmapRemoteUtil.java | 11 +- OsmAnd/src/net/osmand/OsmAndFormatter.java | 2 +- OsmAnd/src/net/osmand/Version.java | 1 - .../osmand/access/AccessibilityDelegate.java | 79 +++++ .../net/osmand/access/AccessibleActivity.java | 45 +++ .../net/osmand/access/AccessibleContent.java | 76 +++++ .../net/osmand/access/AccessibleLayout.java | 115 +++++++ .../net/osmand/access/AccessibleToast.java | 45 +++ .../access/AccessibleTrackedActivity.java | 46 +++ .../net/osmand/access/ExplorableTextView.java | 94 ++++++ OsmAnd/src/net/osmand/access/MapExplorer.java | 172 ++++++++++ .../src/net/osmand/access/NavigationInfo.java | 310 ++++++++++++++++++ .../osmand/access/NotificationTextView.java | 41 +++ .../osmand/access/RelativeDirectionStyle.java | 21 ++ OsmAnd/src/net/osmand/access/TextMessage.java | 42 +++ .../net/osmand/plus/AsyncLoadingThread.java | 11 +- .../net/osmand/plus/FavouritesDbHelper.java | 2 +- .../net/osmand/plus/NavigationService.java | 5 +- .../net/osmand/plus/OsmandApplication.java | 7 +- .../src/net/osmand/plus/OsmandSettings.java | 26 +- OsmAnd/src/net/osmand/plus/PoiFilter.java | 3 +- .../plus/RegionAddressRepositoryBinary.java | 2 +- .../plus/TransportIndexRepositoryBinary.java | 1 + .../ContributionVersionActivity.java | 5 +- .../plus/activities/CustomTitleBar.java | 1 + .../plus/activities/DownloadFileHelper.java | 12 +- .../activities/DownloadIndexActivity.java | 13 +- .../plus/activities/DownloadTilesDialog.java | 7 +- .../activities/EditPOIFilterActivity.java | 5 +- .../plus/activities/EditingPOIActivity.java | 17 +- .../plus/activities/FavouritesActivity.java | 17 +- .../activities/FavouritesListActivity.java | 6 +- .../plus/activities/LocalIndexHelper.java | 4 +- .../plus/activities/LocalIndexesActivity.java | 17 +- .../LocalOpenstreetmapActivity.java | 3 +- .../plus/activities/MainMenuActivity.java | 8 +- .../osmand/plus/activities/MapActivity.java | 20 +- .../plus/activities/MapActivityActions.java | 25 +- .../plus/activities/MapActivityLayers.java | 13 +- .../activities/NavigatePointActivity.java | 4 +- .../OsmandExpandableListActivity.java | 2 +- .../plus/activities/SettingsActivity.java | 37 ++- .../plus/activities/TestVoiceActivity.java | 5 +- .../activities/search/GeoIntentActivity.java | 5 +- .../activities/search/SearchActivity.java | 15 +- .../search/SearchAddressOnlineActivity.java | 3 +- .../search/SearchHistoryActivity.java | 4 +- .../activities/search/SearchPOIActivity.java | 9 +- .../search/SearchPoiFilterActivity.java | 3 +- .../search/SearchRegionByNameActivity.java | 3 +- .../search/SearchStreetByNameActivity.java | 2 +- .../search/SearchTransportActivity.java | 6 +- .../plus/render/MapRenderRepositories.java | 9 +- .../osmand/plus/render/MapVectorLayer.java | 3 +- .../plus/render/NativeOsmandLibrary.java | 4 +- .../osmand/plus/render/OsmandRenderer.java | 4 +- .../osmand/plus/render/RenderingIcons.java | 11 +- .../net/osmand/plus/render/TextRenderer.java | 4 +- .../osmand/plus/routing/RoutingHelper.java | 3 +- .../net/osmand/plus/routing/VoiceRouter.java | 63 +++- .../net/osmand/plus/views/FavoritesLayer.java | 3 +- .../src/net/osmand/plus/views/GPXLayer.java | 6 +- .../osmand/plus/views/MapControlsLayer.java | 13 +- .../net/osmand/plus/views/MapTileLayer.java | 3 +- .../net/osmand/plus/views/MiniMapControl.java | 2 +- .../osmand/plus/views/MultiTouchSupport.java | 5 +- .../plus/views/NextTurnInfoControl.java | 4 +- .../net/osmand/plus/views/OsmBugsLayer.java | 16 +- .../osmand/plus/views/OsmandMapTileView.java | 43 ++- .../net/osmand/plus/views/POIMapLayer.java | 13 +- .../osmand/plus/views/PointLocationLayer.java | 2 +- .../plus/views/PointNavigationLayer.java | 2 +- .../src/net/osmand/plus/views/RouteLayer.java | 8 +- .../osmand/plus/views/TransportInfoLayer.java | 5 +- .../plus/views/TransportStopsLayer.java | 3 +- .../net/osmand/plus/views/TurnPathHelper.java | 4 +- .../plus/views/YandexTrafficAdapter.java | 3 +- 87 files changed, 1610 insertions(+), 226 deletions(-) create mode 100644 OsmAnd/res/layout/alert.xml create mode 100644 OsmAnd/res/layout/notification.xml create mode 100644 OsmAnd/src/net/osmand/access/AccessibilityDelegate.java create mode 100644 OsmAnd/src/net/osmand/access/AccessibleActivity.java create mode 100644 OsmAnd/src/net/osmand/access/AccessibleContent.java create mode 100644 OsmAnd/src/net/osmand/access/AccessibleLayout.java create mode 100644 OsmAnd/src/net/osmand/access/AccessibleToast.java create mode 100644 OsmAnd/src/net/osmand/access/AccessibleTrackedActivity.java create mode 100644 OsmAnd/src/net/osmand/access/ExplorableTextView.java create mode 100644 OsmAnd/src/net/osmand/access/MapExplorer.java create mode 100644 OsmAnd/src/net/osmand/access/NavigationInfo.java create mode 100644 OsmAnd/src/net/osmand/access/NotificationTextView.java create mode 100644 OsmAnd/src/net/osmand/access/RelativeDirectionStyle.java create mode 100644 OsmAnd/src/net/osmand/access/TextMessage.java diff --git a/OsmAnd/res/layout/alert.xml b/OsmAnd/res/layout/alert.xml new file mode 100644 index 0000000000..7b6a9b0666 --- /dev/null +++ b/OsmAnd/res/layout/alert.xml @@ -0,0 +1,12 @@ + + + + + + diff --git a/OsmAnd/res/layout/calculate_route.xml b/OsmAnd/res/layout/calculate_route.xml index 32076285ce..e6c4724581 100644 --- a/OsmAnd/res/layout/calculate_route.xml +++ b/OsmAnd/res/layout/calculate_route.xml @@ -6,9 +6,9 @@ - - - + + + diff --git a/OsmAnd/res/layout/notification.xml b/OsmAnd/res/layout/notification.xml new file mode 100644 index 0000000000..a0d4d08f98 --- /dev/null +++ b/OsmAnd/res/layout/notification.xml @@ -0,0 +1,12 @@ + + + + + + diff --git a/OsmAnd/res/layout/search_address.xml b/OsmAnd/res/layout/search_address.xml index 782978c938..36f867a7df 100644 --- a/OsmAnd/res/layout/search_address.xml +++ b/OsmAnd/res/layout/search_address.xml @@ -17,7 +17,7 @@ - + @@ -25,7 +25,7 @@ - + @@ -33,7 +33,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/OsmAnd/res/layout/search_main.xml b/OsmAnd/res/layout/search_main.xml index 51016d744e..1f3cbd21ba 100644 --- a/OsmAnd/res/layout/search_main.xml +++ b/OsmAnd/res/layout/search_main.xml @@ -10,6 +10,7 @@