please don't die
Change-Id: Id5d1ec1c1646fd72655aa290823fac174a79c76c

Conflicts:
	packages/Keyguard/src/com/android/keyguard/NotificationHostView.java

Conflicts:
	packages/Keyguard/src/com/android/keyguard/NotificationHostView.java
boost hint when waking screen
Change-Id: Icb1eee556506031ca45495e61f9cbdc5d02b65d0

Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
Increase available volume levels

Increase media volume levels from 15 to 30 to have more precise
volume control instead of having only 15 levels from 0-100%

For example, when listening to music it is often the case that one
volume level is too quiet and the next one higher is too loud (especially with Headsets).

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: I7a8750c901967ce3c818fb9c33b082af6b86b8d6

Conflicts:
	media/java/android/media/AudioManager.java
Speed up notification pulldown and a few other things
If your bum is leaking, you need to be seeking: rocka pads

Change-Id: I4843e2274d54f445a0ef755aa0e92329de1deea5
HeadsUp: Fix dismiss on back key press.

Change-Id: Ia213aeba114d153f5561622a2bea884963f3d8a1

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpNotificationView.java
Remove some pointless code.

Unnecessary disk reads for values that are never
used (and cached elsewhere, so that optimization is
rendered pointless).

Change-Id: Ic14a8b53a96908bb03eae28759d7be2c217e8125
frameworks: Make Spinner widget request the itemtype of the adapter

Prior to that change the itemtype is ignored, this prevent Spinner to
work with adapter containing multiple itemtype.

Change-Id: I1554f5bfd04c972f4eddb6da9d611b7f7ef4e0e7
hide "paste" window when ActionBar is already active

Hide "paste" popup window when ActionBar already has a "paste" menu button.
- The "paste" popup window and "paste" ActionBar menu are duplicated.
- Due to "paste" popup window, hard to press the ActionBar menu.

steps to reproduce:
1. launch Browser and go to "google.com" in landscape mode.
2. long press on URL address (make "Select All") and select "Copy"
3. long press on URL address (make "Select All"), again
4. you can see the "paste" window, although actionbar already has a "paste"
   menu button.

Bug: 8080106
Change-Id: I9abe91cb2d39ea10dd28f72932700b810311b443
Fix the bug in replacing a fragment with itself.

Summary:

We are facing a bug that some fragments in our app got removed
randomly. We debugged the app and it seems there is a bug in
the fragment API.

When we we are trying to replace a fragment with itself. We will
try to make the operation a null op, then both `op.fragment` and
`f` will be reset to null.

  op.fragment = f = null;

But since it's inside a loop, if the list `mAdded` still have
items to be visited, the code will continue to the next
iteration. Then it will compare the fragment with null, and
reach the line:

  mManager.removeFragment(old, mTransition, mTransitionStyle);

Eventually it will delete all left fragments in the list `mAdded`.

This diff adds a break to abort the searching after we null
the operation.

Test Plan:

1) Tested with our app. No fragment is randomly removed.

Revert Plan:

Change-Id: I5dc2c07a1bb1d1da1b0fd4e5610d970d55a81e86
Tags:
Signed-off-by: Kang Zhang <kangzhang.cn@gmail.com>
Fix "pm list permissions" crash if resource string missing

The "pm list permissions" command lists detailed information about
each permission on the system, including its label and description,
both of which can be stored as translatable resource strings in APK
files.  However, it is possible that the resource identifiers for
these strings point to non-existent resources.  When this happens, the
loadText() method throws Resources.NotFoundException, causing the "pm"
command to abort prematurely, simply printing "Killed" to stdout and
a stack trace to logcat.

This commit fixes the crash by explicitly catching the
Resources.NotFoundException exception in loadText() and returning null
if it is thrown.  The loadText() method already has the potential to
return null so none of its callers need be modified.  This fixes the
crash and simply shows "label:null" and/or "description:null" in the
output if the string resource is missing.

Change-Id: I92273399e1dac6029163750d004940ee1da67428
Derp