frameworks: fix setting default ringtone for multi sim

The defualt value for the ringtone expects a "_" between the setting and
the requested sim subscription. This was not being respected in the
mediascanner when it set the default ringtones, resulting in the setting
value being "ringtone2" instead of "ringtone_2".

Change-Id: I4a9147d579183229cc3300e71194e6f5ab74fbc6
Signed-off-by: Roman Birg <roman@cyngn.com>
linearlayout: fix measurement of childrens when parent and childrens have exactly the same pixels

When children measure exactly the same width/height than the parent, any child with
width/height == 0 and with weight > 0 must be reset. Otherwise, the view will retains
the same width/height between measurements calls (that is not valid if the view changed
its orientation).

This explain the bug in CYAN-5471 when in hpdi devices the spacer view has the same
width after rotate from landscape to portrait when language is german and date beewteen
September 10-30. Steps to repro in i9100 (hdpi):

1.- Set language to german and date to September, 10.
2.- First run, the expanded bar has the same width that its children (480px the current
screen size), but spacer has 0px (because it isn't being measured by linearlayout).
3.- Rotate to landscape, spacer gains space and all buttons are displayed correctly.
4.- Rotate to portrait, spacer has the same width that in step 3, because it isn't measured
again and delta == 0;

This patch forces this views to be re-measured to 0 to match the current delta (the views doesn't
need to be expanded or shrinked).

JIRA: CYAN-5471
https://jira.cyanogenmod.org/browse/CYAN-5471
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

Change-Id: Iab60337eca6ded7b2b4d57fdcc95863be461db34
WIFI: Fix wimax teardown when wifi connected

Due to patch:
https://github.com/CyanogenMod/android_frameworks_base/commit/f769f4cbc2aaac8d9d49f9ff79a6fe0affc4ff6e

Change-Id: I18e5ced62c8e4976f7a6835ba8c593930dac0586
Global Settings (MSIM): Add global settings for naming sim cards

Change-Id: Ibbd0d48042a92f82241a4ccaee12a81ca13ccdb4
SystemUI: Fix crash during notification/theme change

Fixes crashing that could occur when a notification is created
during a theme change. Entries were attempting to be added
to views which did not have a layout pass yet, causing it to fail.

When a theme change occurs, the fix is to halt the ticker and command queue
until a layout occurs.

BUGDUMP-151925

Change-Id: Ic19d26178df673a1d52981a8617415e6fbcb219d
Add support for single color notification LED (1/2)

Change-Id: I367af77036da9e87c6dd0df552ce4c56d945a44d
MultiSim: move getFormattedSimName() to frameworks (2/2)

Move this into one location any app can call.

Change-Id: I02a96f72be1e41783faeb5862cb26b96ca776672
Signed-off-by: Roman Birg <roman@cyngn.com>

Conflicts:
	core/res/res/values/cm_strings.xml
	core/res/res/values/symbols.xml
Call recording encoder/format choice 3/3

PS1: Adds a user option between WB AMR (the default) or HE-AAC for the encoding
 of call recording audio. Also changes the output format of the file
 appropriately (WB AMR now uses the WB_AMR output format and HE_AAC chooses the
 MPEG_4 output. File extensions are adjust accordingly as well).

This was in reponse to people complaining the quality of call recording audio
 is poor. It's noticibly better using HE-AAC, but filesizes are larger.

PS2: Removed Whitespace

Change-Id: Iffcdd3ba6f9aa80e238bbcc5db51809a4721711e
MultiSim: Add missing strings from previous change

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>
Merge branch 'kitkat' of https://github.com/AOSPA-legacy/android_frameworks_base into AOSPA-legacy-kitkat

Conflicts:
	core/java/android/provider/Settings.java

	modified:   core/java/android/provider/Settings.java
	modified:   core/java/android/widget/LinearLayout.java
	modified:   core/res/res/values/config.xml
	modified:   core/res/res/values/pa_strings.xml
	modified:   core/res/res/values/symbols.xml
	modified:   media/java/android/media/MediaScanner.java
	modified:   packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
	modified:   packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	modified:   telephony/java/android/telephony/MSimTelephonyManager.java
	modified:   wifi/java/android/net/wifi/WifiConfigStore.java
Merge branch 'AOSPA-legacy-kitkat' into kitkat