PagerSlidingTabStrip upgrade

If the adapter's dataset changes, this View does not reflect the changes
before onPageScrolled is called. This causes an NPE because
tabsContainer has no children. With this fix, the view is now synced
with the ViewPager's adapter (the correct tabs are present) and
tabsContainer#getChildAt will no longer throw an NPE.

Fixes #66

Conflicts:
	src/com/android/settings/rascarlo/PagerSlidingTabStrip.java
Remove Duplicate Setting
Add option to reset battery stats (1/2)

Thanks to CyanogenMod and @jruesga
Blacklist: Avoid crash when dialog dismissed via back button.

A user usually presses the back button only
when he/she does not want the changes to be saved.
Hence we need to revert the changes that took place
when the dialog is dismissed with back button.

Change-Id: Ifa3ef41f02f11d1e1627071532d8f915e3b445b6
Input settings: fix empty screen when launching from keyboard

Fixes AOSPA-439

Change-Id: I70a61d82f9cddbc88b8fb803081336bb79a98fa1
Rearranging Navbar Settings
AOSPA Pie Modification (2/2)

Conflicts:
	res/values/psd_arrays.xml
	res/values/psd_strings.xml
	res/xml/system_settings.xml
Settings: Make "Swap volume buttons" optional (2/2)

Credits:LordClockaN