Revert "[1/2] Add battery level around unlock ring"

This reverts commit b736cd6c35e3f81504f65b400ab43441aa3ffe4d.

Conflicts:

	core/java/android/provider/Settings.java
	core/java/com/android/internal/widget/multiwaveview/GlowPadView.java
	packages/Keyguard/src/com/android/keyguard/KeyguardSelectorView.java

(cherry picked from commit 81128da045f236d04709c4f785f0337908f64e27)
Revert "Framework : Lockscreen - Customizable shortcuts"

This reverts commit 469da835aab877a33159cd703f49be7f58bca167.

Conflicts:

	core/java/com/android/internal/widget/multiwaveview/GlowPadView.java
	packages/Keyguard/src/com/android/keyguard/KeyguardSelectorView.java

(cherry picked from commit 1e04740224d9734766e472949d70bbe792d5c829)

Conflicts:
	core/java/android/provider/Settings.java
	core/java/com/android/internal/util/temasek/LockscreenTargetUtils.java
	core/java/com/android/internal/widget/multiwaveview/GlowPadView.java
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_alarm_activated.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_alarm_normal.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_browser_activated.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_browser_normal.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_calendar_activated.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_calendar_normal.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_email2_activated.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_email2_normal.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_email_activated.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_email_normal.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_facebook_activated.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_facebook_normal.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_gallery_activated.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_gallery_normal.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_google_small_activated.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_google_small_normal.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_gplus_activated.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_gplus_normal.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_gtalk_activated.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_gtalk_normal.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_maps_activated.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_maps_normal.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_movie_activated.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_movie_normal.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_music_activated.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_music_normal.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_nav_activated.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_nav_normal.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_phone_activated.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_phone_normal.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_podcast_activated.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_podcast_normal.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_rss_activated.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_rss_normal.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_sms_activated.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_sms_normal.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_twitter_activated.png
	packages/Keyguard/res/drawable-hdpi/ic_lockscreen_twitter_normal.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_alarm_activated.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_alarm_normal.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_browser_activated.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_browser_normal.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_calendar_activated.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_calendar_normal.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_email2_activated.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_email2_normal.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_email_activated.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_email_normal.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_facebook_activated.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_facebook_normal.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_gallery_activated.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_gallery_normal.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_google_small_activated.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_google_small_normal.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_gplus_activated.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_gplus_normal.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_gtalk_activated.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_gtalk_normal.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_maps_activated.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_maps_normal.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_movie_activated.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_movie_normal.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_music_activated.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_music_normal.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_nav_activated.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_nav_normal.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_phone_activated.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_phone_normal.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_podcast_activated.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_podcast_normal.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_rss_activated.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_rss_normal.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_sms_activated.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_sms_normal.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_twitter_activated.png
	packages/Keyguard/res/drawable-mdpi/ic_lockscreen_twitter_normal.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_alarm_activated.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_alarm_normal.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_browser_activated.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_browser_normal.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_calendar_activated.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_calendar_normal.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_email2_activated.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_email2_normal.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_email_activated.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_email_normal.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_facebook_activated.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_facebook_normal.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_gallery_activated.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_gallery_normal.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_google_small_activated.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_google_small_normal.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_gplus_activated.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_gplus_normal.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_gtalk_activated.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_gtalk_normal.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_maps_activated.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_maps_normal.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_movie_activated.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_movie_normal.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_music_activated.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_music_normal.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_nav_activated.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_nav_normal.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_phone_activated.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_phone_normal.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_podcast_activated.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_podcast_normal.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_rss_activated.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_rss_normal.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_sms_activated.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_sms_normal.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_twitter_activated.png
	packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_twitter_normal.png
	packages/Keyguard/src/com/android/keyguard/KeyguardSelectorView.java
[2/3] mediaeditor: Allow custom DOMX source instead of Google DOMX default

Part 2 of 3 patches: To allow omap4 devices to use custom "domx" source
via a new BoardConfig.mk item:
TI_CUSTOM_DOMX_PATH := device/<manufacturer>/<device-name>/domx

This setting provides for 3 changes during the build:
1. In hardware/ti/omap4xxx this settings stops standard Google domx
source from being built and changes the domx reference for tiutils.
2. In frameworks/base it changes the default openmax references for
frameworks/base/media/jni/mediaeditor/Android.mk to the new location
3. In frameworks/av changes the openmax references in 5 places, and adds
new includes in ACodec.cpp, CameraSource.cpp and OMXCodec.cpp

This commit is based on cherry-pick from omapzoom (with a more descriptive
BoardConfig setting name):
http://www.omapzoom.org/?p=platform/frameworks/base.git;a=commit;h=f7f929ff477955333bf7e7413a81a66d683d1f3f

Change-Id: I7ba8052a6144597bf961b78723186c58b7e12e48
(cherry picked from commit f8a68f22904bab5cbda58cbb3a0a1c9580382911)
Frameworks: Port Lockscreen Targets and Shortcuts

    First thanks to PA and CM which gave us partly code and some ideas.
    Still some parts of the original implementation are/were buggy as well
    we needed to ehance it.

    Whatever the new Slim version is now ready and seems to be completly bug
    free.

    - Configurable lockscreen targets...on tablets 8 on phone either 5 or 8
    - configurable lockscreen shortcuts only on phones...up to 5 shortcuts
    - Centralazing some methods....using now then rounded corner on custom
      images systemwide...means on all other shorcut features we have
    - multiDpi compatible
    - new settings logic
    - instance handling of all dialogs like we do on all other places
      way nicer this way
    - tons of fixes

Change-Id: Ie62857beeacceb880efe9aa57246e111d64cd00e
(cherry picked from commit 6e08d0f0c3e803214211237ad54cd701f0f1d384)

Conflicts:
	core/java/android/provider/Settings.java
	core/java/com/android/internal/widget/multiwaveview/GlowPadView.java
	packages/Keyguard/src/com/android/keyguard/KeyguardSelectorView.java