summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/appmenu
diff options
context:
space:
mode:
authorEnrico Ros <eros@codeaurora.org>2014-11-18 20:15:48 -0800
committerWebTech Code Review <code-review@localhost>2014-12-01 09:53:43 -0800
commit1f5a0952599285350be6b1351110518086047fd1 (patch)
tree6af2ffdb24ad21ad6cb567efb415e635de937daf /src/com/android/browser/appmenu
parent49b7925ec66faf5015fdd1862eada2978ddd5fde (diff)
downloadandroid_packages_apps_Gello-1f5a0952599285350be6b1351110518086047fd1.tar.gz
android_packages_apps_Gello-1f5a0952599285350be6b1351110518086047fd1.tar.bz2
android_packages_apps_Gello-1f5a0952599285350be6b1351110518086047fd1.zip
Clean visual style: move to Light, add Material support, change Drawables (progress, icons).
This code alters the visual style moving the APP to a Light theme. Parents of the theme are either Theme.Holo.Light or Theme.Material.Light depending on which API we start the APK from. Needs SDK 21 to build. Other than the visual changes, this commit changes: - name of the APP to 'Browser' - animations and sequencing of the Tab switcher in {nav/anim}_screen - removal of the warning icon from the Exit dialog - change of the favicon appearance (removal of the double border) Vast amount of unused resources are removed from the APK. Just XHDPI drawables have been synthesized for now, and the Primary color was used for the icons and is accessible in R.color.Primary. Change-Id: If75cc051c5d4015383e96066cdb6507484e625d8
Diffstat (limited to 'src/com/android/browser/appmenu')
-rw-r--r--src/com/android/browser/appmenu/AppMenu.java3
-rw-r--r--src/com/android/browser/appmenu/AppMenuAdapter.java7
2 files changed, 4 insertions, 6 deletions
diff --git a/src/com/android/browser/appmenu/AppMenu.java b/src/com/android/browser/appmenu/AppMenu.java
index a0ff7107..66ddc9f3 100644
--- a/src/com/android/browser/appmenu/AppMenu.java
+++ b/src/com/android/browser/appmenu/AppMenu.java
@@ -235,6 +235,9 @@ public class AppMenu implements OnItemClickListener, OnKeyListener {
// The menu is displayed above the anchored view, so shift the menu up by the bottom
// padding of the background.
int verticalOffset = appRect.height() - popup.getHeight() + padding.bottom;
+ if (anchorLocation[1] > 0) {
+ verticalOffset -= anchorHeight;
+ }
popup.setVerticalOffset(verticalOffset);
} else {
// The menu is displayed over and below the anchored view, so shift the menu up by the
diff --git a/src/com/android/browser/appmenu/AppMenuAdapter.java b/src/com/android/browser/appmenu/AppMenuAdapter.java
index 6a8cdb4c..425e91c9 100644
--- a/src/com/android/browser/appmenu/AppMenuAdapter.java
+++ b/src/com/android/browser/appmenu/AppMenuAdapter.java
@@ -292,7 +292,6 @@ class AppMenuAdapter extends BaseAdapter {
} else {
holder = (FourButtonMenuItemViewHolder) convertView.getTag();
}
-
setupImageButton(holder.buttons[0], item.getSubMenu().getItem(0));
setupImageButton(holder.buttons[1], item.getSubMenu().getItem(1));
setupImageButton(holder.buttons[2], item.getSubMenu().getItem(2));
@@ -391,17 +390,13 @@ class AppMenuAdapter extends BaseAdapter {
}
private void setupMenuButton(ImageButton button) {
- button.setImageResource(R.drawable.ic_menu_overflow);
- button.setEnabled(true);
- button.setFocusable(true);
+ button.setSelected(true);
button.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
mAppMenu.dismiss();
}
});
-
- button.setScaleType(ScaleType.CENTER);
}
/**