OSDN Git Service

android-x86/packages-apps-Settings.git
12 years agomerge in jb-mr0-release history after reset to jb-dev
The Android Automerger [Tue, 17 Jul 2012 19:31:40 +0000 (12:31 -0700)]
merge in jb-mr0-release history after reset to jb-dev

12 years agoImport translations. DO NOT MERGE
Ying Wang [Mon, 16 Jul 2012 19:57:58 +0000 (12:57 -0700)]
Import translations. DO NOT MERGE

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

12 years agoMerge "Implement issue #6819955: Add button to take bug report." into jb-dev
Dianne Hackborn [Sat, 14 Jul 2012 00:03:43 +0000 (17:03 -0700)]
Merge "Implement issue #6819955: Add button to take bug report." into jb-dev

12 years agoImplement issue #6819955: Add button to take bug report.
Dianne Hackborn [Fri, 13 Jul 2012 21:26:23 +0000 (14:26 -0700)]
Implement issue #6819955: Add button to take bug report.

Change-Id: Ic615180121d4db52f92aa8264d95d790de5fff9d

12 years agoImport translations. DO NOT MERGE
Ying Wang [Fri, 13 Jul 2012 20:09:18 +0000 (13:09 -0700)]
Import translations. DO NOT MERGE

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

12 years agoMerge "Import translations. DO NOT MERGE" into jb-dev
Ying Wang [Thu, 12 Jul 2012 21:25:51 +0000 (14:25 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev

12 years agoImport translations. DO NOT MERGE
Ying Wang [Thu, 12 Jul 2012 20:15:15 +0000 (13:15 -0700)]
Import translations. DO NOT MERGE

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

12 years agomerge in jb-mr0-release history after reset to jb-dev
The Android Automerger [Thu, 12 Jul 2012 06:13:32 +0000 (23:13 -0700)]
merge in jb-mr0-release history after reset to jb-dev

12 years agoDisplay FCC id for LTE in Settings.
John Wang [Thu, 30 Jun 2011 21:31:44 +0000 (14:31 -0700)]
Display FCC id for LTE in Settings.

If ro.ril.fccid is set by RIL, display it at Settings -> About Tablet -> FCC Equipment ID.

bug:4965501
Change-Id: I920ab071bf1997c4fbf3ce81f88e24f512d004c3

12 years agoImport translations. DO NOT MERGE
Ying Wang [Tue, 10 Jul 2012 20:42:00 +0000 (13:42 -0700)]
Import translations. DO NOT MERGE

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

12 years agoImport translations. DO NOT MERGE
Ying Wang [Mon, 9 Jul 2012 20:20:45 +0000 (13:20 -0700)]
Import translations. DO NOT MERGE

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

12 years agoImport translations. DO NOT MERGE
Ying Wang [Tue, 3 Jul 2012 20:41:30 +0000 (13:41 -0700)]
Import translations. DO NOT MERGE

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

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Mon, 2 Jul 2012 23:21:14 +0000 (16:21 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Mon, 2 Jul 2012 20:55:16 +0000 (13:55 -0700)]
Import translations. DO NOT MERGE

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

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Mon, 2 Jul 2012 19:57:04 +0000 (12:57 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoMerge "Import translations. DO NOT MERGE" into jb-dev
Ying Wang [Sat, 30 Jun 2012 00:54:50 +0000 (17:54 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev

12 years agoFix issue #6761130: Clearing app data in settings does not clear app's USB storage
Dianne Hackborn [Fri, 29 Jun 2012 22:01:23 +0000 (15:01 -0700)]
Fix issue #6761130: Clearing app data in settings does not clear app's USB storage

The installed app details was not correctly distinguishing between cache and
normal data on external storage.  The cache files on external storage are now
correctly shown in the cache section, since those are what get deleted when
you hit the clear cache button.

Change-Id: Id98bdb7fb5202d6a092fe5a772638eeb6aed2b47

12 years agoImport translations. DO NOT MERGE
Ying Wang [Fri, 29 Jun 2012 20:19:19 +0000 (13:19 -0700)]
Import translations. DO NOT MERGE

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

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Fri, 29 Jun 2012 00:11:24 +0000 (17:11 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoMerge "Fix Settings NPE" into jb-dev
Brian Muramatsu [Thu, 28 Jun 2012 23:53:47 +0000 (16:53 -0700)]
Merge "Fix Settings NPE" into jb-dev

12 years agoFix Settings NPE
Brian Muramatsu [Thu, 28 Jun 2012 21:25:14 +0000 (14:25 -0700)]
Fix Settings NPE

Labels for account types can be null which causes a NPE to occur in
Settings. If the label is null, don't bother adding an account
header. If we don't do this, then it would blow up when trying to
sort the headers anyway, so this change will fix the crash.

Bug 6727947

Change-Id: I284d7204b6d21c8d1b0a36e18ecae2c2361eeb84

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 28 Jun 2012 19:51:19 +0000 (12:51 -0700)]
Import translations. DO NOT MERGE

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

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 28 Jun 2012 14:04:34 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoImport translations. DO NOT MERGE
Ying Wang [Wed, 27 Jun 2012 23:19:29 +0000 (16:19 -0700)]
Import translations. DO NOT MERGE

Change-Id: I5c769ea97c25696684c6818bfb84c95d30689b22

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 26 Jun 2012 18:11:58 +0000 (11:11 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoMerge "Add menu item to Settings to go to Cell Broadcast settings." into jb-dev
Jake Hamby [Mon, 25 Jun 2012 23:19:23 +0000 (16:19 -0700)]
Merge "Add menu item to Settings to go to Cell Broadcast settings." into jb-dev

12 years agoAdd menu item to Settings to go to Cell Broadcast settings.
Jake Hamby [Thu, 21 Jun 2012 17:59:22 +0000 (10:59 -0700)]
Add menu item to Settings to go to Cell Broadcast settings.

Add menu item to Settings when "config_cellBroadcastAppLinks"
config option is set to true to jump to the Cell Broadcast app
settings activity. This enables the Cell Broadcast launcher
icon to be removed, while still allowing access to the app
(by adding a similar menu item to the MMS app) and its settings
activity (this settings link).

The menu item will not be added if the CellBroadcastReceiver
package is disabled or not installed.

Bug: 6709985
Change-Id: If3a3016ceea70704790964c0b712c31cb38f7b62

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Mon, 25 Jun 2012 20:00:04 +0000 (13:00 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ic94e1bba24f847df6b65c46539bb2de12e8ab38b

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Sat, 23 Jun 2012 03:38:33 +0000 (20:38 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoImport translations. DO NOT MERGE
Ying Wang [Fri, 22 Jun 2012 22:07:41 +0000 (15:07 -0700)]
Import translations. DO NOT MERGE

Change-Id: I417b1bbfd809569e110d5534fb2db1dd2c82075e

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Fri, 22 Jun 2012 00:52:47 +0000 (17:52 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 21 Jun 2012 22:04:08 +0000 (15:04 -0700)]
Import translations. DO NOT MERGE

Change-Id: I77226bb57376204d2b55012c3be037a6f05be228

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 21 Jun 2012 14:04:22 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 21 Jun 2012 04:12:09 +0000 (21:12 -0700)]
Import translations. DO NOT MERGE

Change-Id: I8d15ef5cb523bdc7f68216a7d465dcb7b9152477

12 years agoMerge "Fix incorrect updating of headers in Settings" into jb-dev
Amith Yamasani [Wed, 20 Jun 2012 22:45:05 +0000 (15:45 -0700)]
Merge "Fix incorrect updating of headers in Settings" into jb-dev

12 years agoImport translations. DO NOT MERGE
Ying Wang [Wed, 20 Jun 2012 20:54:32 +0000 (13:54 -0700)]
Import translations. DO NOT MERGE

Change-Id: I7d2055b0cf38cf4b676a599fd0c952b2fdac99b1

12 years agoFix incorrect updating of headers in Settings
Amith Yamasani [Wed, 20 Jun 2012 20:51:40 +0000 (13:51 -0700)]
Fix incorrect updating of headers in Settings

Settings was overriding the header list in PreferenceActivity and
maintaining its own. In the case where Settings activity is restored
from saved state, the header lists went out of sync and couldn't
be updated anymore.

This makes use of a new private method in PreferenceActivity to
retrieve the header list object so that they stay in sync and can
be updated.

Also make sure to invalidate headers on resume, so that the latest
account types are loaded.

Bug: 6685701
Change-Id: I76ed1e1579a70fb5abfcea417d7e981907bdc02c

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 20 Jun 2012 14:04:02 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoMerge "Use string resources instead of literals for backup password confirmations...
Christopher Tate [Tue, 19 Jun 2012 23:31:11 +0000 (16:31 -0700)]
Merge "Use string resources instead of literals for backup password confirmations" into jb-dev

12 years agoMerge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Tue, 19 Jun 2012 23:23:23 +0000 (16:23 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev

12 years agoUse string resources instead of literals for backup password confirmations
Christopher Tate [Tue, 19 Jun 2012 22:44:15 +0000 (15:44 -0700)]
Use string resources instead of literals for backup password confirmations

Localizability is good.  Bug 6683158

Change-Id: I205e4a09f5137e18d4085fcc041fae86f26ab188

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Tue, 19 Jun 2012 23:01:49 +0000 (16:01 -0700)]
Import translations. DO NOT MERGE

Change-Id: I097248fa64ec4f5d75ca4ddda3a17d49c29647a7

12 years agoMerge "Show full summary for network location sercice even for wifi-only devices...
Amith Yamasani [Tue, 19 Jun 2012 22:59:48 +0000 (15:59 -0700)]
Merge "Show full summary for network location sercice even for wifi-only devices" into jb-dev

12 years agoShow full summary for network location sercice even for wifi-only devices
Amith Yamasani [Tue, 19 Jun 2012 17:53:49 +0000 (10:53 -0700)]
Show full summary for network location sercice even for wifi-only devices

Bug: 6694051
Change-Id: Ic2446aa640bc2688fd74885eeb55f179c51e7691

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 19 Jun 2012 14:05:23 +0000 (07:05 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoMerge "Import translations. DO NOT MERGE" into jb-dev
Ying Wang [Mon, 18 Jun 2012 21:51:26 +0000 (14:51 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev

12 years agoImport translations. DO NOT MERGE
Ying Wang [Mon, 18 Jun 2012 21:40:20 +0000 (14:40 -0700)]
Import translations. DO NOT MERGE

Change-Id: I8ba16c5a7895850d429ae355bf2c27e384bb248e

12 years agoMerge "Fix 6663465: remove flagNoEnterAction in favor of actionNext" into jb-dev
Jim Miller [Mon, 18 Jun 2012 20:19:42 +0000 (13:19 -0700)]
Merge "Fix 6663465: remove flagNoEnterAction in favor of actionNext" into jb-dev

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Sat, 16 Jun 2012 14:04:45 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoFix 6663465: remove flagNoEnterAction in favor of actionNext
Jim Miller [Sat, 16 Jun 2012 00:56:49 +0000 (17:56 -0700)]
Fix 6663465: remove flagNoEnterAction in favor of actionNext

This fixes a bug where the return key was showing in some layouts
for choose/confirm password screens in Settings.  Now we just use
"actionNext" which ensures we see consistent behavior across
devices.

Change-Id: I4bf3033654b85f14c55de6f418caaf1ce563c33a

12 years agoMerge "Implement issue #6633077: Improve permissions display for..." into jb-dev
Dianne Hackborn [Sat, 16 Jun 2012 00:53:40 +0000 (17:53 -0700)]
Merge "Implement issue #6633077: Improve permissions display for..." into jb-dev

12 years agoMerge "Fix issue #6664140: Time to lock should work even Stay awake..." into jb-dev
Dianne Hackborn [Sat, 16 Jun 2012 00:23:55 +0000 (17:23 -0700)]
Merge "Fix issue #6664140: Time to lock should work even Stay awake..." into jb-dev

12 years agoFix issue #6664140: Time to lock should work even Stay awake...
Dianne Hackborn [Sat, 16 Jun 2012 00:07:14 +0000 (17:07 -0700)]
Fix issue #6664140: Time to lock should work even Stay awake...

...in Developer options is on

Disable the stay awake while on option in settings if a lock limit
is being enforced.

Bug: 6664140
Change-Id: I8da1b8c734ceef10662d33392609c35e645315c3

12 years agoImport translations. DO NOT MERGE
Ying Wang [Fri, 15 Jun 2012 21:33:14 +0000 (14:33 -0700)]
Import translations. DO NOT MERGE

Change-Id: I861590828a57951c72001e0c6c6ab2222be320c8

12 years agoImplement issue #6633077: Improve permissions display for...
Dianne Hackborn [Fri, 15 Jun 2012 18:00:17 +0000 (11:00 -0700)]
Implement issue #6633077: Improve permissions display for...

...inherited permissions from shared UIDs

Bug: 6633077
Change-Id: I91917339e83b79a3dfcfcb70a68d571c9a7f7e14

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 14 Jun 2012 20:44:39 +0000 (13:44 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ife956408e146ad876b860968dacd8f3095ed84e1

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 14 Jun 2012 14:04:26 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoMerge "Show only the language if there's only one locale for the language." into...
Amith Yamasani [Wed, 13 Jun 2012 22:21:29 +0000 (15:21 -0700)]
Merge "Show only the language if there's only one locale for the language." into jb-dev

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Wed, 13 Jun 2012 21:17:44 +0000 (14:17 -0700)]
Import translations. DO NOT MERGE

Change-Id: I8566dbced26846ce55861b5f57f95034d03604c2

12 years agoShow only the language if there's only one locale for the language.
Amith Yamasani [Wed, 13 Jun 2012 03:06:55 +0000 (20:06 -0700)]
Show only the language if there's only one locale for the language.

If the system has only one instance of that language, then only show the language
without the country name.

Bug: 6522572
Change-Id: I1e99182b1c669b200090f6c360bb902376b63ab0

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 13 Jun 2012 15:46:49 +0000 (08:46 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoStorage banner when device in low disk state.
Jeff Sharkey [Wed, 13 Jun 2012 00:13:12 +0000 (17:13 -0700)]
Storage banner when device in low disk state.

Bug: 6576409
Change-Id: I25f71935e312bf6efa832d10c22e3edbdc18f4fb

12 years agoMerge "Import translations. DO NOT MERGE" into jb-dev
Ying Wang [Tue, 12 Jun 2012 22:24:15 +0000 (15:24 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev

12 years agoImport translations. DO NOT MERGE
Ying Wang [Tue, 12 Jun 2012 22:21:39 +0000 (15:21 -0700)]
Import translations. DO NOT MERGE

Change-Id: I3f7c3cd191375024cd5613b3d2b8e0c859c96928

12 years agoMerge "Disable notification alerts in Settings for SUW" into jb-dev
Russell Brenner [Tue, 12 Jun 2012 20:53:31 +0000 (13:53 -0700)]
Merge "Disable notification alerts in Settings for SUW" into jb-dev

12 years agoFix NPE in rotation lock content observer.
Jeff Brown [Tue, 12 Jun 2012 19:57:11 +0000 (12:57 -0700)]
Fix NPE in rotation lock content observer.

Bug: 6647846
Change-Id: Idd17edb78f451807eabdd988017b68ce02b9c75f

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 12 Jun 2012 18:24:53 +0000 (11:24 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoDisable notification alerts in Settings for SUW
Russell Brenner [Thu, 7 Jun 2012 22:37:04 +0000 (15:37 -0700)]
Disable notification alerts in Settings for SUW

When activated by Setup Wizard, disable notification alerts and other
status bar flags as also done by Setup Wizard and GSF.

Bug: 6645469
Change-Id: I43ef5c2a5fa3f53434a1aaa968de50d91b0d78ce

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Mon, 11 Jun 2012 20:24:05 +0000 (13:24 -0700)]
Import translations. DO NOT MERGE

Change-Id: I835b15b3d3081d5d9010ff91eb54b9cd6e6316bb

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Mon, 11 Jun 2012 14:04:18 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoRemoving head turn and putting blink back
Danielle Millett [Wed, 6 Jun 2012 17:54:11 +0000 (13:54 -0400)]
Removing head turn and putting blink back

Changing the strings and workflow in settings to be blink again
instead of the new head turn.  This basically undoes the following
two cls: I67c8acd4 and Ifc7b6e18.

Change-Id: I8694b1d82efac9d2f97c29128da6698b6ac2a4ce

12 years agoMerge "Exit to Settings when removing the only account for a type." into jb-dev
Amith Yamasani [Fri, 8 Jun 2012 22:27:32 +0000 (15:27 -0700)]
Merge "Exit to Settings when removing the only account for a type." into jb-dev

12 years agoExit to Settings when removing the only account for a type.
Amith Yamasani [Fri, 8 Jun 2012 20:35:47 +0000 (13:35 -0700)]
Exit to Settings when removing the only account for a type.

Skip over the ManageAccounts screen which shows the list of accounts
for a particular type, if there are no accounts there.

Bug: 6630827

Also fix text alignment in top-level of settings.

Change-Id: Icd446babc131e7052fc9e95514214fffe6e6e113

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Fri, 8 Jun 2012 22:10:38 +0000 (15:10 -0700)]
Import translations. DO NOT MERGE

Change-Id: I8964ab48dade7424b2957d1f7ec7f2d8b9fb0ae0

12 years agoAdd ID to copy translation from to string that is not translated yet.
Eric Fischer [Fri, 8 Jun 2012 22:06:30 +0000 (15:06 -0700)]
Add ID to copy translation from to string that is not translated yet.

Change-Id: If2fcdeb8ea6fb10a5abb04f3f5e654c03332bd2e

12 years agoMerge "Removing head turn and putting blink back" into jb-dev
Danielle Millett [Fri, 8 Jun 2012 21:18:05 +0000 (14:18 -0700)]
Merge "Removing head turn and putting blink back" into jb-dev

12 years agoRemoving head turn and putting blink back
Danielle Millett [Wed, 6 Jun 2012 17:54:11 +0000 (13:54 -0400)]
Removing head turn and putting blink back

Changing the strings and workflow in settings to be blink again
instead of the new head turn.  This basically undoes the following
two cls: I67c8acd4 and Ifc7b6e18.

Change-Id: I8694b1d82efac9d2f97c29128da6698b6ac2a4ce

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Fri, 8 Jun 2012 15:22:22 +0000 (08:22 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoMerge "Save the auto-sync dialog state for orientation changes" into jb-dev
Amith Yamasani [Fri, 8 Jun 2012 07:04:11 +0000 (00:04 -0700)]
Merge "Save the auto-sync dialog state for orientation changes" into jb-dev

12 years agoSave the auto-sync dialog state for orientation changes
Amith Yamasani [Fri, 8 Jun 2012 02:58:34 +0000 (19:58 -0700)]
Save the auto-sync dialog state for orientation changes

Bug: 6630421
Change-Id: I11447173483da499e23c5ce41c566fa988385e6b

12 years agoMerge "Directly go to account sync screen if there's only one account for that type...
Amith Yamasani [Fri, 8 Jun 2012 02:18:50 +0000 (19:18 -0700)]
Merge "Directly go to account sync screen if there's only one account for that type." into jb-dev

12 years agoDirectly go to account sync screen if there's only one account for that type.
Amith Yamasani [Fri, 8 Jun 2012 00:03:20 +0000 (17:03 -0700)]
Directly go to account sync screen if there's only one account for that type.

Bug: 6629330
Change-Id: Ieb2bad131b1580a6b75d970c9a0ea9980580f66d

12 years agoAdd back a SYNC_SETTINGS screen
Amith Yamasani [Thu, 7 Jun 2012 03:23:08 +0000 (20:23 -0700)]
Add back a SYNC_SETTINGS screen

Revive the old Accounts&Sync screen as a dialog with the auto-sync
checkbox and a list of accounts. This will be launched when Apps
request a SYNC_SETTINGS page for controlling account and master sync.

Auto-sync data checkbox will also continue to exist in Data Usage.

Minor fixes to account list and account update monitoring.

Bug: 6614013
Bug: 6622995
Bug: 6610247
Change-Id: I35c0919a29c6bc7e5edf64f2734a3ef4f5ae5e7a

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 7 Jun 2012 22:12:24 +0000 (15:12 -0700)]
Import translations. DO NOT MERGE

Change-Id: I5c5f75c4980677fef82c64d83f3d7a37ae604cc3

12 years agoMerge "Add back a SYNC_SETTINGS screen" into jb-dev
Amith Yamasani [Thu, 7 Jun 2012 18:06:10 +0000 (11:06 -0700)]
Merge "Add back a SYNC_SETTINGS screen" into jb-dev

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 7 Jun 2012 14:04:26 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoAdd back a SYNC_SETTINGS screen
Amith Yamasani [Thu, 7 Jun 2012 03:23:08 +0000 (20:23 -0700)]
Add back a SYNC_SETTINGS screen

Revive the old Accounts&Sync screen as a dialog with the auto-sync
checkbox and a list of accounts. This will be launched when Apps
request a SYNC_SETTINGS page for controlling account and master sync.

Auto-sync data checkbox will also continue to exist in Data Usage.

Minor fixes to account list and account update monitoring.

Bug: 6614013
Bug: 6622995
Bug: 6610247
Change-Id: I35c0919a29c6bc7e5edf64f2734a3ef4f5ae5e7a

12 years agoMerge "Fix 6622557: Developer options "Show layout bounds" summary should say "margin...
Philip Milne [Thu, 7 Jun 2012 00:34:39 +0000 (17:34 -0700)]
Merge "Fix 6622557: Developer options "Show layout bounds" summary should say "margins" instead of "padding"" into jb-dev

12 years agoFix 6622557: Developer options "Show layout bounds" summary should say "margins"...
Philip Milne [Wed, 6 Jun 2012 21:41:28 +0000 (14:41 -0700)]
Fix 6622557: Developer options "Show layout bounds" summary should say "margins" instead of "padding"

Change-Id: I702b0d86c33b49854df5a65b398891183c3212cf

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Wed, 6 Jun 2012 20:21:25 +0000 (13:21 -0700)]
Import translations. DO NOT MERGE

Change-Id: If466dfc20ff28bfb26b10214503200452c66ccea

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 6 Jun 2012 14:04:27 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoMerge "Implement new rotation policy." into jb-dev
Jeff Brown [Wed, 6 Jun 2012 02:11:42 +0000 (19:11 -0700)]
Merge "Implement new rotation policy." into jb-dev

12 years agoMerge "Revert "Settings: "Rotation lock" retains existing orientation."" into jb-dev
Jeff Brown [Wed, 6 Jun 2012 02:11:37 +0000 (19:11 -0700)]
Merge "Revert "Settings: "Rotation lock" retains existing orientation."" into jb-dev

12 years agoMerge "Revert "Rename and flip meaning of auto-rotate to rotation lock."" into jb-dev
Jeff Brown [Wed, 6 Jun 2012 02:11:32 +0000 (19:11 -0700)]
Merge "Revert "Rename and flip meaning of auto-rotate to rotation lock."" into jb-dev

12 years agoImplement new rotation policy.
Jeff Brown [Wed, 6 Jun 2012 00:49:24 +0000 (17:49 -0700)]
Implement new rotation policy.

Show "auto-rotate screen" option in Display only if the Rotation Lock
feature is not available on the device.

When the "auto-rotate screen" option is disabled in Accessibility or
Display settings, hide the Rotation Lock feature.

Use new RotationPolicy class to adjust rotation settings.

Bug: 6523269
Change-Id: Ifa89ff055e5ad0a00888e10720dd76b0054fe290

12 years agoRevert "Settings: "Rotation lock" retains existing orientation."
Jeff Brown [Mon, 4 Jun 2012 22:40:31 +0000 (15:40 -0700)]
Revert "Settings: "Rotation lock" retains existing orientation."

Bug: 6523269
This reverts commit 523d5a6e0495580206ee38e5072e5aef8063e806.

12 years agoRevert "Rename and flip meaning of auto-rotate to rotation lock."
Jeff Brown [Mon, 4 Jun 2012 22:37:57 +0000 (15:37 -0700)]
Revert "Rename and flip meaning of auto-rotate to rotation lock."

Bug: 6523269
This reverts commit b94417109279fb7d27f0b27c97e76860ed6446ba.

12 years agoUpdate headers when accounts are changed.
Amith Yamasani [Tue, 5 Jun 2012 20:20:45 +0000 (13:20 -0700)]
Update headers when accounts are changed.

Also pass an account to authenticator settings to avoid Email settings crash.

Bug: 6610990
Change-Id: I42884619728dd97446de65cc77e1729f3e143efa

12 years agoMerge "Update headers when accounts are changed." into jb-dev
Justin Ho [Tue, 5 Jun 2012 22:03:54 +0000 (15:03 -0700)]
Merge "Update headers when accounts are changed." into jb-dev

12 years agoIncrease dimens for power control widget for sw600dp
Andrew Flynn [Tue, 29 May 2012 19:36:50 +0000 (12:36 -0700)]
Increase dimens for power control widget for sw600dp

Bug: 6527125
Change-Id: If4c3dad24e8fc70ca76bb551cfd9e32be96a6337