Use PopupWindow for settings popup

Bug:10261902
Change-Id: Ia77cff276615db8c3fbb9e859bf099249b4021cf
diff --git a/.gitignore b/.gitignore
index 871a664..a41c59e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,11 @@
-# Eclipse project files and paths.
+# Project files and paths.
 .classpath
 .project
+*.iml
+**/*.iml
 .settings/
 bin/
 libs/
+gen/
+.idea/
+.gitignore