Updated simplified Chinese translations

Change-Id: I2b22478aaa730e3a88e7caa4fb6d21b0a928743a
ril: avoid sending null aid string in getIMSI

Change-Id: Ia68671ee368a91391b54b1c840d0f752e7dc8731
Merge "ril: avoid sending null aid string in getIMSI" into jb
Debug RILJ wakelocks on Smdk4210Ril:

Original author's commit message:
------------------------------------
There is a battery drain due to a wakelock being held for an unspecified
length of time. BetterBatteryStats shows it to be RILJ holding the wakelock.
I've narrowed it down to a RIL request named RIL_REQUEST_SET_TTY_MODE. I
dumped out RILJ.mRequestsList during the held wakelock and I see this request
staying around and waiting for a response from the RIL. It's as if the RIL
is not responding to this request and I don't see RILReceiver processing a
response to this request.

One thing to note is that RIL_REQUEST_SET_TTY_MODE is generated when we see
EVENT_TTY_PREFERRED_MODE_CHANGED from PhoneApp. This happens when the phone
boots up and also when you plug in a pair of headphones. Thus this wakelock
can be reproduced by plugging in a pair of headphones.

To work around this, I've added logic to perform a lazy removal of RILRequests
that haven't received a response in the existing wake lock timeout
(60 seconds.)  The removal itself is done as part of
findAndRemoveRequestFromList().  Since new RIL requests are appended to this
list, we're guaranteed that the stale TTY requests will eventually be removed
either when the existing timeout fires, or through this new lazy removal
------------------------------------
Additional comments from Andrew Dodd:

There seem to be all sorts of things that can cause similar behavior.

Rather than purge requests known to have issues, we just print them
so we can fix root cause.

Change-Id: I0a80ba8fb5a1811ab1d8f78e3b8d1bcbfc627377
Merge "Updated simplified Chinese translations" into jb
Menu UI Overflow Toggle (2/2)

Adds the ability to show the Menu UI Overflow (3-dots) within apps, regardless of navbar being present or not

Signed-off-by: BMc08GT <bmc08gt.teamb00sted@gmail.com>
Smdk4210RIL: block unsupported requests to avoid RIL wakelocks

Change-Id: I54fa04be9389b6a2a5843ffcd074c64d24dfc03a
ime switcher notification: remove reboot requirement (1/2)

patch set 2: fix uri, remove old comment, add handler

Change-Id: Ie21fed15c2cc865ae2d164fa485cc44d69ef5452

Conflicts:

	services/java/com/android/server/InputMethodManagerService.java
Merge "Menu UI Overflow Toggle (2/2)" into jb
Merge "ime switcher notification: remove reboot requirement (1/2)" into jb
SystemUI: CustomNav bar for Tablets / TabletUI

Embeds the same NavBar object used for phones into the
Tablet status bar.  This will make it easier to extend functionality
to both types of devices in the future, since using same basic code set.

Patchsets:
1) Initial commit
2) General clean up. I left the stuff I commented out in so Mike
can see what I did so far.
3) Addresses a lot of sizing issues, lightsout/menu functionality, etc.
4) Left menu sizing derp
5) Moar tweaking for tablet menu buttons
6) even Moar tweaking for menu buttons (tablets & phones too)
7) Adds ability to change weights based on # of buttons used,
   useful for phones in "Hybrid" lets not waste space. Also
   adds the ablity to hide the compatablity mode button. (requires
   RC part.)

Change-Id: I591d3fae925ed5e9d983c98a108ded5aad67355b
Framework: Custom targets WIP!

Based on CM10.
Added options for 3-8 targets and our old octo layout for 6 and 8.
Added AOKP icons pack. Icons by Kwes1020

functional but not ready for merge quite yet.

patch set 2: rebase
patch set 3: fix camera when reseting targets and clean out some
fields we aren't using anymore.
patch set 4: Octo layout inline with Sethyx
patch set 5: Fixes some theming fcs issues
Patch set 6/7: rebase and add octo layouts for tabs

patchset 10: fix the icon sizes when using the apps png
Patch set 11: Add method to round edges of custom icons

Change-Id: I1a0290eeaf7236a7be7da831176f718134f971e4
Fixed 2GToggle longpress action

Long press on 2G Toggle now open right settings dialog.

Change-Id: I5b7040b1ca33d59365b4e8fe5e5a3fdda052a55e
Signed-off-by: Petr Reznicek <kecinzer@gmail.com>
PWM: Fix launch of home button when screen times out

Signed-off-by: BMc08GT <bmc08gt.teamb00sted@gmail.com>
Alt Signal Layouts

This creates a second set of Data Type, Traffic & Strength icons
for the Alt Signal Layout.  This will allow themers to build options
for either layout without corrupting one or the other.
I also tweaked the layouts a bit for better alignment with various Text/icon combinations.

I also addressed the 'Blue/Grey' DataType icon.  the 3g/4g/H, etc icons should
now properly show blue or grey depending on connectivity, just like the signal bars do.

I also suggest a fair amount of testing since I've redone quite a bit of the logic regarding signal/icon displays.  Don't want this going out the door broken.

Patchset 2:  Layout Tweak
Patchset 3:  Honor theme setting for Alt Signal (or userpref)
Patchset 4:  mdpi/hdpi icons.
Patchset 5:  Force icon update on change & whitespace cleanup
Patchset 6:  Adjust/fix Layout when using SignalText
Patchset 6:  Tweak layout
Change-Id: I11696c95dae3bdafd0380e3210e64b9529eeeac6
Signed-off-by: Zaphod <mwilson@acesappraisal.com>
Un-hard-code default toggles and remove vibrate from default.
Add a string-array with the default toggles and read the
array to populate default toggles.
Signed-off-by: gdanko <gdanko@gmail.com>

Change-Id: I65516acb22f6880dffb7f2d5d7d52a89381c2123
adding PA stuff to aokp base still wip

Change-Id: If9bfcdd7366a3de7f7a5c8a134ccc1a53322d037
Update core/java/android/app/ResultInfo.java

 Proguard couldnt see ResultInfo

because it was declared invisible to droiddoc, which creates the api-stubs for it
fix weather panel in landscape

Change-Id: I6392ef5ee96bf8784b49b107d05c0994cd665eef
more weather panel fix

Change-Id: I912b30379398ed85b9155bb43b108db271d4902f