Revert "Settings: Add Advanced reboot (1 of 2)"

This reverts commit 1e3614dc40d319aed692433fdc70d4d532e10013.
Squash all 4.2.2 changes into one

Remove back button entirely when disabled

Bug: 7480506 Encryption screen shows back button
Change-Id: Iba2706fd6b61303178b472071f32d65bdf72e50d

fix dock audio enable dialog

The dock audio enable setting is not saved if the user
dismisses the dialog without checking or unchecking the check box.
The dialog is then displayed each time the device is docked until the
user checks/unchecks the dialog or goes to sound settings to enable
or disable dock audio.

Bug 7518165.

Change-Id: Ifbc6179e78b64b5b7577ac750acf9846525e47c5

Fix a race condition when switching between settings panels

The fragment was removed while the images were being loaded, so the
activity was null. This fix holds on to the Resources object.

Bug: 7490425
Change-Id: Ic2d8dd3c620fc34ce8255104001e17b39f828601

Internationalize bytes and percentages.

Bug: 7545890
Change-Id: I634fafe9d61a2ebbf7a0cc56d8255457ee9fe1b2

Align "Make passwords visible" setting.

Bug: 7545894
Change-Id: I46113676c46055bd7468a0aa7289c9475e714232

Use AlarmManager calls to set date/time, instead of SystemClock.setTime

This way secondary users' settings app can request the system server to
set the time. Alarm driver cannot be opened as a secondary user.

Bug: 7459635
Change-Id: I1ae1630dc448021d35280a297c5d9960f8e8fc2e

Fix Bluetooth enable dialog to match Android style guide.

When an app requests to enable Bluetooth and/or Bluetooth discovery,
we show a dialog for user confirmation. Remove the dialog title,
update the message text and button labels to be more descriptive,
and use the standard dialog layout instead of a custom layout.

Also fixes the button layout on the Bluetooth permission test app so
that the "Discoverable" button doesn't wrap to two lines.

Bug: 6001468
Change-Id: I731e2f31b4c822395fc3f83584a092550d9ae7d3

Removing tutorial for choosing a pattern as part of b/7459863

Removing the tutorial that is shown the first time a user sets up
a pattern as their lock type.

Change-Id: If73c936e41458af729740fe5b178b9452c7dd2c0

Update a few dream setting strings to ease translation.

Clarify that sleep = asleep and charging as we do in the ui.

Bug: 7564443
Change-Id: Id50938d6d4052fd4223e212125d10f4bfd0c6908

Add android.settings.DREAM_SETTINGS for Daydream settings.

Bug: 7480927
Change-Id: I5777f7c4aec9ad7d7eb9f7eeb882d2342cb481c3

Making sure keyguard and homescreen only display eligible widgets (issue 7550090)

Change-Id: Ia1eb902618855e1a86a84c9090cdeefe5a404fd7

Be quiet!

Change-Id: Ifcce5bf4b2fca35fe50a2684983dc726534c3d0c

Avoid split action bar when it only has one item.  DO NOT MERGE.

Bug: 7632944
Change-Id: I055564b4f8d2a3fc97346e13e1d8818196a8f988

Use uniform font size for APNs and timezones. DO NOT MERGE.

Also get rid of some orange highlight!

Bug: 7632945
Change-Id: I6a4b59f4eef81b128d128f5a429fb96f6366843a

Add string resource removed by previous commit.

The "bluetooth_permission_request" string resource was removed in
a previous commit, but is still referenced by a manifest element.
Add the original string resource to strings.xml.

Bug: 7641406
Change-Id: I9a41760c74d8a243ff5e8d2d7938f81207e75173

Fix incorrectly inverted text color.

Bug: 7632947
Change-Id: I2eb8c4c24bda5b08215204330c30431bf6d0fc27

Disable USB debugging checkbox and backup password for secondary users

This prevents secondary users from turning on adb debugging, even if they
find a way to launch developer options. Similarly, don't let them add or
change the adb backup password.

Bug: 7637920
Change-Id: I297f0c515a276ede6a7f12d2add72faec4eeb384

Fix text alignment and simplify layouts.

Fix Apps items to correctly base align text, and to align correctly
in RTL mode.  Use GridLayout to reduce layout complexity.

Bug: 7633350, 7132595
Change-Id: Ic3563cfe408ebcdaef1ed693cc6b01b886d700ea

Push scrollbars to screen edges.

Push scrollbar to screen edges on custom ListView and ScrollViews to
match Preferences framework behavior.

Bug: 7633165
Change-Id: Ideecd0e243c7de7bf977caef2b1585e707a00ca4

Better layouts for security screen setups as part of b/7459863

The major change is that choose pattern and confirm pattern layouts
no longer uses a split screen layout on tablets.  The new layout
closely mimics the layout for portrait.
Other minor changes include:
-Made the header font size for confirm pattern and choose pattern
medium (this matches with face unlock changes).
-Made the buttons on choose pattern for landscape phone side-by-side
rather than above each other (to be consistent with face unlock).
-Removed the black background from phone landscape confirm pattern
since it's inconsistent with all the other layouts.

Change-Id: I4473fe880ac471a3b5bc5399a454b10504589f87

Revised language for notification ringtone picker.

Bug: 7659273
Change-Id: Id2702881d3789447ee18530749897448306d4148

Add latest area info broadcast to Settings status screen.

When the SIM has a Brazilian country code, add an item to the
status screen to show the most recently received area info cell
broadcast, requested from CellBroadcastReceiver, which also
broadcasts any updates to the area info. To read the area info
broadcast or request it from CellBroadcastReceiver requires
READ_PHONE_STATE permission.

Bug: 7445881
Change-Id: I387e23ecd0802b212ecb3e44f900a3a7a4b27e76

Pass the locale code in the help url for help pages.

Otherwise the help will always be shown in English.

Bug: 7564049
Change-Id: I94da36aa1ae5aabd118178866b7e570bb77add34

Fix wifi compareTo

Bug: 7521354
Change-Id: I8d77594dacb56f17126f0e33ff6e47379f615d40

Call back to whom requested to add a word to the user dict

Bug: 7725834
Change-Id: I2537754789f25fa978efd457979ed130806b9fbf

Distinguish adding an already present word / cancelling

Bug: 7725834
Change-Id: Iab3d1818f008a553868fb30e8460ea3f77c2de50

Remove ancient tutorials

Change-Id: I299b126d58ceecc11b1ac697587907d47fce3760

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/com/android/settings/ChooseLockPatternSize.java
	tests/res/layout/bluetooth_request_permission_test.xml
	tests/src/com/android/settings/tests/BluetoothRequestPermissionTest.java
Some post-merge cleanup for automatic brightness adjustment

- Remove some unused strings
- Use (device-dependant) minimum brightness level (as calculated by
  DisplayPowerController) as '0%' instead of the actual value 0.

Change-Id: I79123d2421c9ab35fa0f1808d82d785463e8fbaa

Conflicts:
	res/values/strings.xml
Fix Settings APN FC

Change-Id: I4e060961278bff471c5df6864dd8f8d2593a8630
Fix missed pattern size chooser

Change-Id: I14fab83f458e782eabb92cf1b77327ada42dde0b
Settings: Fix FC on longpress new wifi connection

Change-Id: I926df3c4843262871ca1e0456f85f9d5876fca60