Fix the icon size in app lists.

E.g. the "Select app" dialog in the profile group configuration uses
this layout to inflate the list dialog. However app icons can have
non-standard sizes so we enforce a consistent width and height.

Change-Id: I71731a9bb3548c699cc2e0e600a5ff371ceacbc3

Conflicts:

	res/layout/preference_icon.xml
Revert "Single pane for 10" Settings"

This reverts commit 56f51a8927f53bee81145fe29e63af8a87e6fd1b.

Change-Id: If5c7be247caeeb4ec3e0bceed86bc5763d74f927

Conflicts:

	src/com/android/settings/Settings.java
AppOps/Privacy Guard: Fix up misaligned switches.

Change-Id: Ic9e1e09ac911e552599f7bca6fb71b2808548f1d
PrivacyGuard: Specify a default value in Settings.getInt method call

* While privacy guard is enabled by default, the default value specified
  here is returned only when the setting is not defined or not an integer.

Change-Id: Iaedffcc76a23a310aa7915f6a42ccce83ba5d2a6
Fix FC when trying to adjust radio band via *#*#4636#*#* dialer code.

Fixes:

1. Add additional strings to BAND_NAMES array for additional bands from ril.h
2. Fix logic when adding band strings to selection list (for loop ends before entire array is read)

Change-Id: I5ff883a469f757a30c71d7d72c8f6ace19ce7a4d
Signed-off-by: Andrew Xie <andrew.w.xie@gmail.com>
(cherry picked from commit 4845045bb2dfd9b1a67f9f0c62bb44bfc5152284)
fix some derps from previous commit 4f6a15a61de146
Settings: Add double tap to sleep gesture
Option to enable Notification Light when screen is on (2/2)
Separate Android Encryption Password from Lockscreen Password

This permits the use of a different (hopefully longer and more complex!) encryption
password, while using a simpler (and easier to type) lockscreen password.

Change-Id: Ib8c62c8eb4c86cd9e0117444231e8139c08ad1b6

Conflicts:

	res/values/custom_strings.xml