reverting merge...
Merge branch 'jb-greg' of github.com:greg17477/frameworks_base into jb-greg

Conflicts:
	services/java/com/android/server/am/ActivityStack.java
cleanup
FW: Hiding NavBar

PS8:
New Structure for Hiding NavBar

ps9 : Fix a few derps.
ps10 : more derps/Try/catch/ etc.
ps11 : Hiding NavBar now Marginall works.
       There are a lot of things that can break this right now.
       it doesn't recover well from toggling itself on/off and
       if you 'hide/show' the NavBar, it doesn't take to that kindly
       either.  One thing the seems have an effect is to change the
       height of the NavBar.  there is something that gets reset in
       PhoneWindowManager by doing the height change that helps.

ps 12 :  Reworked some of the logic.  Added visual hints to indicate where
the swipes should occur.  Also completed landscape (phone) orientation shift
for swipe.  Made several changes in the window layout formulas in
PhoneWindowManager so that NavBar is treated like a real overlay when
in AutoHide Mode.  Otherwise, certain windows and elements were
resizing when the NavBar was shown/hidden.

ps 13:  Add images (button/drag) from NitrozK

ps14:  Start implementation of longpress on handle to launch
       NavRing.  Fix press navbar resets hide timer.

ps 15: add timeout to settings observer
       make searchlight visile on lockscreen even if navbar hide enabled.
Mike and I think there no point in wasting a swipe on the lockscreen lets
just show it all the time since its our version of lockscreen targets. Only
thing thats weird is after unlock the navbar should auto time out and its not.
It wait until you touch outside then acts as it should.

ps 16: Fix hdpi image
ps 17: switched to 9patch's from nitroz
       added options for stretching draghandle/swipe area width (on tested on
              grouper might need tweaking of values)
       added option to make draghandle.invisible (right now if invisible wont
              register clicks, needs fix)

ps 18: moved constants to demins for overlays

ps 19:  Redo some of the weight calcs.  This basically works if you
	keep weight at 100.  not working otherwise
ps 20: Abandoned Weights, now setting Width of handle based on pixel
	calc.  Fixed 'Invisible' setting on Handle.

ps 21: Add quick tile ( needs images), fix crash when phones rotate,
       swap a division for a multiplication. Come on now Mike. ;-)

ps 22: change screenheight to screen width for landscape... still need something for tabs.
ps 23: added logic for phabs and tabs landscape width, set default width to 5
ps 24: add padding to the SlidingChallengeLayout if we hide the navbar
PS 25:  Fixed NavBar staying visible after unlock.
	Fixed IME Offset in Landscape Mode.
ps 26: This *should* fix QS Tile toggle & provide an Opacity control for
	the drag handle.
ps 27: try to reset screen size on Autohide change.
ps 28: Change QS icon to match 'Hide NavBar' icon

Change-Id: Ic4ad3d9dec139ebeee2ee1e81d97ec603116f5f9
Framework:  Menu UI Overflow Toggle

Allows the in-app menu buttons (three dots) to be shown
With or without a NavBar being present
PS2: Rebase
PS5: Correctly Utilize Booleans
PS7: Fix Misplased Line Because I'm A Moron

Change-Id: I32171dbe8dbcb65bcbd8cc112068047dbc85067c
Bring Back CarHome *Removed in AOSP*

This brings back the ability to go to a CarHome rather than Launcher
Google Removed This Ability Here:
Change: I8234ebf066798071517b4a586b06708b6ec0bc71
http://bit.ly/WuZ2dW

PS2:Remove Whitespace.  Thanks Google.

ps 3:  tracked the actual change to here:
https://github.com/android/platform_frameworks_base/commit/7c135205f2f4c192299ad0215276e9e481bccaa5
Fixed placement of IUiModeManager Logic.

Change-Id: I85f63792d57db39bfcfd02592d85a65154fa7010
keyguard: fix layout for 320dp devices

800x480px dpi devices have less screen space than the xhdpi devices
Google designed the layout for and the layout needs adjustment.

- Reduce the lockscreen security container size such that the clock
  widget has enough space to display its content.
- In the SIM PIN/PUK view, Google put an empty widget on top, but
  we don't have space for that, increase its size such that the
  widget practically disappears.

This should not have any effect on devices with larger screens.

Change-Id: I9e811cfd312abae24a9cad189d19e73848f6c4c1
implement 1% battery on select devices

via ro.product.use_charge_counter=1
Change-Id: Iaed07e682463a6467b1903ab40cf41440334b64b

Conflicts:

	services/jni/com_android_server_BatteryService.cpp
DefaultContainerService: implement additional methods

For usage in Settings->Storage

Change-Id: I2d45198cc6ea3b84af1547873380eae2c04c0b93