Fix NullPointerException at RunningState

getServiceInfo returns null if you have a service defined in the
manifest as: <service android:name=".Xxx" android:exported="false" />
or and in an <application> with no label or icon.
Dont crash the Settings application because of that.

Change-Id: I6f9f69c130e610b7e4ab66426177b7bade1e1515
Reset app preferences now resets all app ops.

Change-Id: I7966245b5f322f55e139b2da661c02cd58530f11
Fix issue #10190597: "Any permission restrictions" is displayed after a...

...newline in "Reset app preferences" dialog

Change-Id: I3125155d992af0654175659294bfb2fb325ccb57
Import translations. DO NOT MERGE

Change-Id: I29d9c2b04800f28cd880e1470dca0d25ae74470f
Auto-generated-cl: translation import

Conflicts:
	res/values-nl/strings.xml
	res/values-sw/strings.xml
Re-order toolbar settings

Now in a more logical order

Change-Id: Ieabf06e4d46fc8358e19eb7ad9ea0f7a0ee3bca5
Signed-off-by: Evan Anderson <evan1124@gmail.com>
Settings Update
  * Give HALO and PIE Controls their own category
  * Volume rocker controls moved from lock screen to sound
  * Re-order settings layout
tabui crash fix, gaps & re-order

Change-Id: I6e577b5b4c5cdf4156a1aa95653dad22dfd66c97
Add Themes category

Under Personal category

Change-Id: I0eb669956d9e89bb92cd43487b14b4246454a400
Signed-off-by: ayysir <dresadd09691@gmail.com>

Conflicts:
	res/values/strings.xml
	res/xml/settings_headers.xml
Fix one NPE in tethering setting

Once we not declare BT feature, go Setting->more->tethering
will trigger this NPE.

Change-Id: I4736e7bade261475acda74e26250a81452018ffa
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
Merge tag 'android-4.3_r1.1' into jb43

Android 4.3 release 1.1

Signed-off-by: Evan Anderson <evan1124@gmail.com>

Conflicts:
	res/values-es/strings.xml
	res/values-it/strings.xml
	res/values-nl/strings.xml
	res/values-pt/strings.xml
	res/values-sw/strings.xml

Change-Id: I585e205382fbfd9815bed43f7faea7e754129c10
Add option for switching between UMS and MTP/PTP mode. (2/2)

Change-Id: I6cf50a41a9a82e40e702f5231ce663636c149613

This adds support for switching between UMS and MTP/PTP.
Settings part (this part) adds option in USB settings (statusbar/notification drawer) for enabling UMS,
and adds setting in Storage menu to enable / disable UMS, this since the USB settings page disappears when enabling UMS.

It's only porting this http://review.cyanogenmod.org/#/c/21115/
fix UMS port
Merge pull request #63 from alteredlikeness/jb43-legacy-alt0

Add option for switching between UMS and MTP/PTP mode. (2/2)
Merge branch 'jb43' of https://github.com/ParanoidAndroid/android_packages_apps_Settings into jb43-legacy

Conflicts:
	AndroidManifest.xml
	res/xml/tool_bar_settings.xml
	src/com/android/settings/SoundSettings.java

Change-Id: I00ea6dca2854b142b8f2746151ad82e4a73164cc
Merge branch 'offpa/ThemeEngine'
Merge branch 'offpa/ThemeEngine'

Signed-off-by: ayysir <dresadd09691@gmail.com>

Conflicts:
	res/values/strings.xml
Reorder Theme header
Merge branch 'offpa/jb43'
Revert "Reorder Theme header"

This reverts commit 58568783c7bd62da010022ed9787dec105731ab0.
Revert "Add Themes category"

This reverts commit 84ef8f614a5c35c0fdb13de0c9c54a1674a8e719.