Commit Graph

6757 Commits

Author SHA1 Message Date
Eric Fischer
f776a738fa Import translations. DO NOT MERGE
Change-Id: I8d15ef5cb523bdc7f68216a7d465dcb7b9152477
2012-06-20 21:12:09 -07:00
Amith Yamasani
9938ac8a6e Merge "Fix incorrect updating of headers in Settings" into jb-dev 2012-06-20 15:45:05 -07:00
Ying Wang
679948df3c Import translations. DO NOT MERGE
Change-Id: I7d2055b0cf38cf4b676a599fd0c952b2fdac99b1
2012-06-20 13:54:32 -07:00
Amith Yamasani
ea7b28c2a1 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
2012-06-20 13:51:40 -07:00
The Android Automerger
ce37588080 merge in jb-release history after reset to jb-dev 2012-06-20 07:04:02 -07:00
Christopher Tate
5739d4fe02 Merge "Use string resources instead of literals for backup password confirmations" into jb-dev 2012-06-19 16:31:11 -07:00
Eric Fischer
f4a4119eea Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-19 16:23:23 -07:00
Christopher Tate
2d6497d2d1 Use string resources instead of literals for backup password confirmations
Localizability is good.  Bug 6683158

Change-Id: I205e4a09f5137e18d4085fcc041fae86f26ab188
2012-06-19 16:22:55 -07:00
Eric Fischer
5ad50ac860 Import translations. DO NOT MERGE
Change-Id: I097248fa64ec4f5d75ca4ddda3a17d49c29647a7
2012-06-19 16:01:49 -07:00
Amith Yamasani
8e1981ccd3 Merge "Show full summary for network location sercice even for wifi-only devices" into jb-dev 2012-06-19 15:59:48 -07:00
Amith Yamasani
1270eb5e43 Show full summary for network location sercice even for wifi-only devices
Bug: 6694051
Change-Id: Ic2446aa640bc2688fd74885eeb55f179c51e7691
2012-06-19 10:53:49 -07:00
The Android Automerger
7116f061f6 merge in jb-release history after reset to jb-dev 2012-06-19 07:05:23 -07:00
Ying Wang
fae5978e4a Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-18 14:51:26 -07:00
Ying Wang
be4ac92791 Import translations. DO NOT MERGE
Change-Id: I8ba16c5a7895850d429ae355bf2c27e384bb248e
2012-06-18 14:40:20 -07:00
Jim Miller
284c9872ce Merge "Fix 6663465: remove flagNoEnterAction in favor of actionNext" into jb-dev 2012-06-18 13:19:42 -07:00
The Android Automerger
135eb8bb2b merge in jb-release history after reset to jb-dev 2012-06-16 07:04:45 -07:00
Jim Miller
feeafe2e79 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
2012-06-15 17:56:49 -07:00
Dianne Hackborn
4d8dac0792 Merge "Implement issue #6633077: Improve permissions display for..." into jb-dev 2012-06-15 17:53:40 -07:00
Dianne Hackborn
ed99a81e15 Merge "Fix issue #6664140: Time to lock should work even Stay awake..." into jb-dev 2012-06-15 17:23:55 -07:00
Dianne Hackborn
f34a8d7517 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
2012-06-15 17:07:14 -07:00
Ying Wang
9d6d89ef82 Import translations. DO NOT MERGE
Change-Id: I861590828a57951c72001e0c6c6ab2222be320c8
2012-06-15 14:33:14 -07:00
Dianne Hackborn
e458832c76 Implement issue #6633077: Improve permissions display for...
...inherited permissions from shared UIDs

Bug: 6633077
Change-Id: I91917339e83b79a3dfcfcb70a68d571c9a7f7e14
2012-06-15 11:00:17 -07:00
Eric Fischer
5ea994c552 Import translations. DO NOT MERGE
Change-Id: Ife956408e146ad876b860968dacd8f3095ed84e1
2012-06-14 13:44:39 -07:00
The Android Automerger
2c33bde431 merge in jb-release history after reset to jb-dev 2012-06-14 07:04:26 -07:00
Amith Yamasani
5b7a8204d8 Merge "Show only the language if there's only one locale for the language." into jb-dev 2012-06-13 15:21:29 -07:00
Eric Fischer
612a0c106b Import translations. DO NOT MERGE
Change-Id: I8566dbced26846ce55861b5f57f95034d03604c2
2012-06-13 14:17:44 -07:00
Amith Yamasani
140b6f5234 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
2012-06-13 12:56:21 -07:00
The Android Automerger
08bf66c843 merge in jb-release history after reset to jb-dev 2012-06-13 08:46:49 -07:00
Jeff Sharkey
cd4428ce2c Storage banner when device in low disk state.
Bug: 6576409
Change-Id: I25f71935e312bf6efa832d10c22e3edbdc18f4fb
2012-06-12 18:41:51 -07:00
Ying Wang
292d7e3b81 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-12 15:24:15 -07:00
Ying Wang
db49ee9872 Import translations. DO NOT MERGE
Change-Id: I3f7c3cd191375024cd5613b3d2b8e0c859c96928
2012-06-12 15:21:39 -07:00
Russell Brenner
3f9ec9f1c2 Merge "Disable notification alerts in Settings for SUW" into jb-dev 2012-06-12 13:53:31 -07:00
Jeff Brown
b5858bbdc3 Fix NPE in rotation lock content observer.
Bug: 6647846
Change-Id: Idd17edb78f451807eabdd988017b68ce02b9c75f
2012-06-12 12:57:11 -07:00
The Android Automerger
be8699deaf merge in jb-release history after reset to jb-dev 2012-06-12 11:24:53 -07:00
Russell Brenner
58d6ffc5f5 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
2012-06-11 17:50:44 -07:00
Eric Fischer
00808b0280 Import translations. DO NOT MERGE
Change-Id: I835b15b3d3081d5d9010ff91eb54b9cd6e6316bb
2012-06-11 13:24:05 -07:00
The Android Automerger
e8b6d5bf0e merge in jb-release history after reset to jb-dev 2012-06-11 07:04:18 -07:00
Danielle Millett
d7b5290ed1 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
2012-06-08 15:52:10 -07:00
Amith Yamasani
450c4c86ca Merge "Exit to Settings when removing the only account for a type." into jb-dev 2012-06-08 15:27:32 -07:00
Amith Yamasani
c8a9317649 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
2012-06-08 15:21:05 -07:00
Eric Fischer
dba0f9f196 Import translations. DO NOT MERGE
Change-Id: I8964ab48dade7424b2957d1f7ec7f2d8b9fb0ae0
2012-06-08 15:10:38 -07:00
Eric Fischer
1e7fa779f9 Add ID to copy translation from to string that is not translated yet.
Change-Id: If2fcdeb8ea6fb10a5abb04f3f5e654c03332bd2e
2012-06-08 15:06:30 -07:00
Danielle Millett
acd3777184 Merge "Removing head turn and putting blink back" into jb-dev 2012-06-08 14:18:05 -07:00
Danielle Millett
4a3e40d68e 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
2012-06-08 16:49:29 -04:00
The Android Automerger
235ec865d1 merge in jb-release history after reset to jb-dev 2012-06-08 08:22:22 -07:00
Amith Yamasani
b3a049f539 Merge "Save the auto-sync dialog state for orientation changes" into jb-dev 2012-06-08 00:04:11 -07:00
Amith Yamasani
665235f6ef Save the auto-sync dialog state for orientation changes
Bug: 6630421
Change-Id: I11447173483da499e23c5ce41c566fa988385e6b
2012-06-07 19:58:34 -07:00
Amith Yamasani
cc993689cf Merge "Directly go to account sync screen if there's only one account for that type." into jb-dev 2012-06-07 19:18:50 -07:00
Amith Yamasani
3882c2e215 Directly go to account sync screen if there's only one account for that type.
Bug: 6629330
Change-Id: Ieb2bad131b1580a6b75d970c9a0ea9980580f66d
2012-06-07 17:03:20 -07:00
Amith Yamasani
7154257b23 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
2012-06-07 15:55:49 -07:00