GitLab

* commit 'a53807dd':

Change-Id: Ie31f29c0b7587e4567140530b6f8bd199b0e5a79

* commit '9217185d':
  Don't show developer options to secondary users

* commit 'c39dcc1c':
  Don't show developer options to secondary users

Show just a message that developer options are not available for the user.

Also fix silent exit of AddAccount operation by showing a toast that user
cannot add accounts.

Bug: 7409523
Bug: 8519646
Bug: 7304007

Change-Id: Id3f430d568d6b7151ac55f86dbc0ef91803fa10c

am c36b3969: am 34a62601: Merge "Disable apps that require an account on a limited user" into jb-mr2-dev

* commit 'c36b3969':
  Disable apps that require an account on a limited user

* commit '34a62601':
  Disable apps that require an account on a limited user

If an app is marked as requiring an account to work, disable that app
and show a message in the summary.

Also, implement graying out of icons for deselected apps.

Bug: 8600261
Change-Id: I9cf48832675c24257e09addad4316249082c30fb

* commit '6b634ceb':
  Import translations. DO NOT MERGE

* commit '8054254a':
  Import translations. DO NOT MERGE

am 5cc298c8: am 8c32c28f: Merge "Implement Settings app UX for when a user has wifi config locked down." into jb-mr2-dev

* commit '5cc298c8':
  Implement Settings app UX for when a user has wifi config locked down.

am 8c32c28f: Merge "Implement Settings app UX for when a user has wifi config locked down." into jb-mr2-dev

* commit '8c32c28f':
  Implement Settings app UX for when a user has wifi config locked down.

am 0e34529c: am 91d40b7d: Merge "User restrictions for creds storage & user removal" into jb-mr2-dev

* commit '0e34529c':
  User restrictions for creds storage & user removal

* commit '91d40b7d':
  User restrictions for creds storage & user removal

am a01f625f: am 35f02378: Merge "Embed the app restrictions fragment in the dual-pane settings." into jb-mr2-dev

* commit 'a01f625f':
  Embed the app restrictions fragment in the dual-pane settings.

* commit '35f02378':
  Embed the app restrictions fragment in the dual-pane settings.

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

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

* commit '2cc2b0f2':
  Limit device name length

* commit 'a2e64ac8':
  Limit device name length

Bug: 8599677
Change-Id: Ifce5579c0a65c98a4faaad286a7255b2e63d2a76

Change the limited user creation flow to show the usual message before
actually adding the user. Might need to customize the message for limited
users.

Removed the old activity wrapper and moved the logic to UserSettings.

Removed the finish button.

Bug: 8566751
Change-Id: Ie9e1a03736c41758b0bb6e79d004ad662a5af7f4

Change-Id: I423e729f73ece6209875d2f8d194d0d11c975c20

am 2bd65910: am b0746763: Merge "Forcing the settings apk to be built with the zz_ZZ pseudolocale. This will enable Settings to show the effects of the zz_ZZ pseudolocale when selected in the LocalePicker." into jb-mr2-dev

* commit '2bd65910':
  Forcing the settings apk to be built with the zz_ZZ pseudolocale. This will enable Settings to show the effects of the zz_ZZ pseudolocale when selected in the LocalePicker.

am b0746763: Merge "Forcing the settings apk to be built with the zz_ZZ pseudolocale. This will enable Settings to show the effects of the zz_ZZ pseudolocale when selected in the LocalePicker." into jb-mr2-dev

* commit 'b0746763':
  Forcing the settings apk to be built with the zz_ZZ pseudolocale. This will enable Settings to show the effects of the zz_ZZ pseudolocale when selected in the LocalePicker.

Merge "Forcing the settings apk to be built with the zz_ZZ pseudolocale. This will enable Settings to show the effects of the zz_ZZ pseudolocale when selected in the LocalePicker." into jb-mr2-dev

* commit 'c077cd8d':
  Make sure Settings app restrictions show up

* commit 'd8b0d0ed':
  Make sure Settings app restrictions show up

This will enable Settings to show the effects of the zz_ZZ pseudolocale when selected in the LocalePicker.

Bug #8556677

Change-Id: I68ffc81454865dec94a3c1460019d1efce00ea49

When the user is restricted from configuring wifi:
- Leave the on/off button enabled
- Hide all menu options
- Hide all networks, and display a message saying:
 "This user is not allowed to configure wireless networks."

Change-Id: I20193b552ea071740686bd9091637459e9b668b5

Inadvertently disabled that in the previous change where we would
skip apps that were required but had no restrictions entries.

Bug: 8520185
Change-Id: Idc1808e489f7b6da267f68a2c7cef81cc351d2d0

* commit 'd8a4eed4':