Merge "Single volume control when config_useMasterVolume is true"
Merge "Import translations. DO NOT MERGE"
Don't mutate all instances of app icons in Settings

When adding color filters to an app icon in User Settings, don't
modify the original drawable state. Get a mutable drawable.

Bug: 9054675
Change-Id: I6ea374cb801abef3f5b597fda2e84b4e67cfa9d0
Add wake lock app ops to UI.

Change-Id: Id2f23acee08fa2830d3edc30a70abf06226ae4eb
Disable On/OFF switch before action

Bug: 8715336

Change-Id: I3d4b05ae9dfe109af0b9b06340d52004b73ad0f4
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
am f88e6e5a: Don\'t mutate all instances of app icons in Settings

* commit 'f88e6e5ae6a5a31d47677dcbd9be2b26c6615136':
  Don't mutate all instances of app icons in Settings
am 738c373f: am f88e6e5a: Don\'t mutate all instances of app icons in Settings

* commit '738c373f3a27f30d631881c1633cca343e512e8f':
  Don't mutate all instances of app icons in Settings
Merge "Add wake lock app ops to UI."
am 4abe488a: Merge "No back icon in action bar of APN Settings"

* commit '4abe488a5f18d04513b294dce1f7f63d0c9cf3a0':
  No back icon in action bar of APN Settings
Merge "Disable On/OFF switch before action"
am b514a95c: am 4abe488a: Merge "No back icon in action bar of APN Settings"

* commit 'b514a95ce7009a61532f00d4ac5ab73861d2b327':
  No back icon in action bar of APN Settings
am 966c2d3f: am b514a95c: am 4abe488a: Merge "No back icon in action bar of APN Settings"

* commit '966c2d3fc61a1fed5c5e587c6ef29b2b68d01372':
  No back icon in action bar of APN Settings
Make TTS language setting track system language.

TTS engine default locale is set independently from the system locale.
If TTS engine default locale is not set, it defaults to the system locale.
If user decides to set TTS locale, ability to default to the current system
locale is lost (until device is wiped).

This change makes settings wipe the TTS engine default locale value if user
selects language that is system language. This allows TTS to track system
language if user changes it.

If system language is not available in TTS, language field is set to
"language not selected" value.

This change require a small change in framework/base to make previously
private method public (TtsEngines.getDefaultLocale).

+ Selected language is displayed in language preference summary (matches
all other language preferences)
+ Removing and then adding "language" and 'install languages' preferences
looks glitchy, not they are disabled (grayed out) if unavailable.

Bug: 8613986
Change-Id: Ic4bde97ef7406adb64cc03efbe660275360ba3af
merge in master-release history after reset to master
merge in jb-mr2-release history after reset to jb-mr2-dev
Reconcile with jb-mr2-release - do not merge

Change-Id: I6a178af29be7f1d227b667ec84312f5d0c2fdadd
am 7e18ed8c: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '7e18ed8c14ca2047a5f82f2eb8bcab93d673d730':
Write restriction bundle right away for required apps.

User shouldn't have to go tap on the settings icon for an app that is ON by default
in a restricted profile. This way apps can write some defaults to the restricted
profile when it is created.

The app entry is also automatically removed from the list if there are no visible
restrictions.

Bug: 9074051

Also fix an incorrect dialog label. Bug: 9068877

Change-Id: I2a7ddc31fe695f58611d2ba36a8bf541b7817b10
am 0b2781ae: Write restriction bundle right away for required apps.

* commit '0b2781ae537e6d3d27863080eea0a0a5fa6c83b8':
  Write restriction bundle right away for required apps.
am 18d44684: am 0b2781ae: Write restriction bundle right away for required apps.

* commit '18d44684d3d384cc1eed114808c3870c7738e352':
  Write restriction bundle right away for required apps.