AppCircleSideBar : Custom TriggerWidth (2/2)

Conflicts:

	res/values/bk_arrays.xml
	res/values/bk_strings.xml
	res/xml/circle_app_sidebar.xml
	src/com/android/settings/mahdi/omni/AppCircleSidebar.java
Settings: Make settings searchable.

Signed-off-by: Adnan Begovic <adnan@cyngn.com>
Signed-off-by: Danesh Mondegarian <danesh@cyngn.com>
Change-Id: Ic06dca33bf8fd0ef8f63f51e131b70fe730cb7c5

Conflicts:

	AndroidManifest.xml
	res/values/attrs.xml
	res/values/cm_strings.xml
	res/xml/lockscreen_interface_settings.xml
	res/xml/notification_drawer.xml
	res/xml/settings_headers.xml
	res/xml/wireless_settings.xml
	src/com/android/settings/Settings.java
Settings: Check to see if menu items are null onPause.

Change-Id: I5463b1eab1017840ec1ec204090c9c61603377a3
Clean up search code.

Fix up coding style and add a few missing TypedArray.recycle() calls.
Also make filtering code more efficient.

Change-Id: Ie3824b41ae40010686ff3cb6cab7f12d19843834

Conflicts:

	res/layout/settings_search_complete_view.xml
	src/com/android/settings/Settings.java
	src/com/android/settings/search/SearchPopulator.java
	src/com/android/settings/search/SettingsAutoCompleteTextView.java
Settings : Make search locale friendly

Change-Id: I3ae4b074af7a0ab4105f35d3ee8d6e5ef004af3d
Settings : Get actionbar post extra retrieval

Fetching the actionbar before the extras are utilized causes the parentActivityName
to be null and no home as up enabled.

Change-Id: Ic3395c4a2e0c04aee4efab5345cb604475691016
Show parent fragment name in option search.

For doing that, parent titles were missing for options placed in
fragments which are directly invoked by a settings header. Fixit.

Change-Id: Iad9340fa76eb6f2f38f4b0d7b84f2c7fa357b162
Revert "Minor UI fixes"

This reverts commit 4b6bc337af6cfdf04afc1d54d061c1279423fc64.
Settings : Preserve title id

Change-Id: Ieea43e5ebe955ae31190daa0db635611c4ec7f49