Zhenguo Fu
193821e6e8
Add account type check for invisible sync adapters.
...
The invisible sync adapters array is modified to
store the sync adapters instead of their authorities,
so that "Sync now" function will only synchronize
those with the same account type as the current
account.
Change-Id: If9b0b32db9828d8671f57a0d7a2f64712a7ebabf
2012-06-07 14:42:28 +02:00
Amith Yamasani
86708a8a6d
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-06 20:55:40 -07:00
Philip Milne
0884f40303
am ceb1ff2a
: Merge "Fix 6622557
: Developer options "Show layout bounds" summary should say "margins" instead of "padding"" into jb-dev
...
* commit 'ceb1ff2a5530ce921930b728fb6c4f5c0a8a08bf':
Fix 6622557
: Developer options "Show layout bounds" summary should say "margins" instead of "padding"
2012-06-06 17:36:51 -07:00
Philip Milne
ceb1ff2a55
Merge "Fix 6622557
: Developer options "Show layout bounds" summary should say "margins" instead of "padding"" into jb-dev
2012-06-06 17:34:39 -07:00
Eric Fischer
2f050fd71a
am ec71971c
: Import translations. DO NOT MERGE
...
* commit 'ec71971c34c61662ed25a8eaaaf8749e47d5bed5':
Import translations. DO NOT MERGE
2012-06-06 16:53:53 -07:00
Philip Milne
c00b4f29de
Fix 6622557
: Developer options "Show layout bounds" summary should say "margins" instead of "padding"
...
Change-Id: I702b0d86c33b49854df5a65b398891183c3212cf
2012-06-06 14:41:28 -07:00
Eric Fischer
ec71971c34
Import translations. DO NOT MERGE
...
Change-Id: If466dfc20ff28bfb26b10214503200452c66ccea
2012-06-06 13:21:25 -07:00
The Android Automerger
41dfcbd34b
merge in jb-release history after reset to jb-dev
2012-06-06 07:04:27 -07:00
Jeff Brown
ff8c12e560
am 6a5e0252
: Merge "Implement new rotation policy." into jb-dev
...
* commit '6a5e0252ce383654e304ffd0bca09ced0cadc0a3':
Implement new rotation policy.
2012-06-05 19:18:18 -07:00
Jeff Brown
4eb0bd40d1
am de4f8181
: Merge "Revert "Settings: "Rotation lock" retains existing orientation."" into jb-dev
...
* commit 'de4f8181329441dd57d7402d58de8f314d1757a3':
Revert "Settings: "Rotation lock" retains existing orientation."
2012-06-05 19:18:15 -07:00
Jeff Brown
ebd1a3c5de
am 977ff542
: Merge "Revert "Rename and flip meaning of auto-rotate to rotation lock."" into jb-dev
...
* commit '977ff5426d4941c3a190cc55388c89edbd7a1e60':
Revert "Rename and flip meaning of auto-rotate to rotation lock."
2012-06-05 19:18:14 -07:00
Jeff Brown
6a5e0252ce
Merge "Implement new rotation policy." into jb-dev
2012-06-05 19:11:42 -07:00
Jeff Brown
de4f818132
Merge "Revert "Settings: "Rotation lock" retains existing orientation."" into jb-dev
2012-06-05 19:11:37 -07:00
Jeff Brown
977ff5426d
Merge "Revert "Rename and flip meaning of auto-rotate to rotation lock."" into jb-dev
2012-06-05 19:11:32 -07:00
Jeff Brown
10fbf52ccb
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
2012-06-05 17:53:35 -07:00
Jeff Brown
62a6f626da
Revert "Settings: "Rotation lock" retains existing orientation."
...
Bug: 6523269
This reverts commit 523d5a6e04
.
2012-06-05 17:45:35 -07:00
Jeff Brown
56c58d5aef
Revert "Rename and flip meaning of auto-rotate to rotation lock."
...
Bug: 6523269
This reverts commit b944171092
.
2012-06-05 17:45:07 -07:00
Amith Yamasani
9d5cd89c49
Update headers when accounts are changed.
...
Also pass an account to authenticator settings to avoid Email settings crash.
Bug: 6610990
Change-Id: I42884619728dd97446de65cc77e1729f3e143efa
2012-06-05 16:24:55 -07:00
Justin Ho
f766fa6a82
am f4e1681d
: Merge "Update headers when accounts are changed." into jb-dev
...
* commit 'f4e1681d77c8b6593937be94d6a9c1fdda642957':
Update headers when accounts are changed.
2012-06-05 15:06:37 -07:00
Justin Ho
f4e1681d77
Merge "Update headers when accounts are changed." into jb-dev
2012-06-05 15:03:54 -07:00
Andrew Flynn
ab88256fd2
am ab049a19
: Increase dimens for power control widget for sw600dp
...
* commit 'ab049a196bf6a5ced45467810e38c6e33a1b4a82':
Increase dimens for power control widget for sw600dp
2012-06-05 15:02:27 -07:00
Andrew Flynn
ab049a196b
Increase dimens for power control widget for sw600dp
...
Bug: 6527125
Change-Id: If4c3dad24e8fc70ca76bb551cfd9e32be96a6337
2012-06-05 14:58:24 -07:00
Amith Yamasani
56821dbeaa
Update headers when accounts are changed.
...
Also pass an account to authenticator settings to avoid Email settings crash.
Bug: 6610990
Change-Id: I42884619728dd97446de65cc77e1729f3e143efa
2012-06-05 14:28:17 -07:00
Eric Fischer
8e58449072
am 6f10eb7d
: Import translations. DO NOT MERGE
...
* commit '6f10eb7db50514bd5530a633ea1ebed571c84582':
Import translations. DO NOT MERGE
2012-06-05 12:13:40 -07:00
Eric Fischer
6f10eb7db5
Import translations. DO NOT MERGE
...
Change-Id: I81581e50f658f628a5d6354c9c8372cc1a98d566
2012-06-05 12:03:44 -07:00
The Android Automerger
bdd876deb7
merge in jb-release history after reset to jb-dev
2012-06-05 06:59:36 -07:00
Eric Fischer
5f366fd3aa
am 90504516
: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '9050451649b920a490117462ec71e87a0aa3ee63':
Import translations. DO NOT MERGE
2012-06-04 18:25:39 -07:00
Eric Fischer
9050451649
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-06-04 18:21:44 -07:00
Eric Fischer
99929802f5
Import translations. DO NOT MERGE
...
Change-Id: I3347ec085b2a09f654b17c0609522d47a14627b2
2012-06-04 18:19:13 -07:00
Amith Yamasani
227edcf61a
am 03295520
: Merge "Account types at toplevel of Settings" into jb-dev
...
* commit '03295520359e06013d77387979a182845a2b1f1b':
Account types at toplevel of Settings
2012-06-04 18:05:35 -07:00
Amith Yamasani
0329552035
Merge "Account types at toplevel of Settings" into jb-dev
2012-06-04 18:02:34 -07:00
Amith Yamasani
d1ab82807a
Account types at toplevel of Settings
...
Reorganized Account settings to show account types at the top-level
of Settings. Only account types that have accounts added are visible
here. There is an Add account button to add a new account.
Master sync toggle has moved to Data Usage screen in the overflow menu.
It shows additional detail of the function of the auto-sync toggle when
it is toggled by the user.
Account type screen (ManageAccountsSettings) shows list of accounts of
that type and any available authenticator settings. It additionally
verifies any Intents can be resolved before showing the corresponding
entry. This screen now shows last synced time for each account.
You can now sync all accounts of a type by selecting Sync now in the
Account type screen.
Account Sync screen that shows the list of syncable items has minor
tweaks:
- "Last synced...", "Sync is OFF"
- Doesn't show the authenticator settings here anymore.
Bug: 6579937
Change-Id: I8139a4c992b525a3e1efc24d2d223c3f5caddc76
2012-06-04 17:01:22 -07:00
Dianne Hackborn
c2543e8f4e
am 883329ca
: Fix issue #6603152 : User-adjustable autobrightness broken?
...
* commit '883329ca1376054228ff67a923252121b5531265':
Fix issue #6603152 : User-adjustable autobrightness broken?
2012-06-04 15:53:06 -07:00
Dianne Hackborn
883329ca13
Fix issue #6603152 : User-adjustable autobrightness broken?
...
Two issues:
- The new brightness was not being applied when switching out
of auto-brightness mode.
- We were resetting to the last brightness level when switching
modes. This is because at that point we read the current
brightness setting, but that isn't changed as the user adjusts
only when the final value is committed. To fix this, we have
a new local variable keeping track of the last brightness value
we have shown and use that when we haven't committed the
brightness to settings.
Change-Id: I7cc02c9f90128eacec427587a3f6b8f25ede4bd3
2012-06-04 15:32:54 -07:00
Irfan Sheriff
80497db444
am 98894ed4
: Merge "Fix crash when accessibility is on" into jb-dev
...
* commit '98894ed4106222b79c7ca67d5b3995878e8ae98d':
Fix crash when accessibility is on
2012-06-04 12:00:35 -07:00
Irfan Sheriff
98894ed410
Merge "Fix crash when accessibility is on" into jb-dev
2012-06-04 11:55:45 -07:00
Irfan Sheriff
15a279231f
Fix crash when accessibility is on
...
Bug: 6600699
Change-Id: I9eb8b9871d1368bd7508873951d5719e1f2ba826
2012-06-04 10:22:43 -07:00
The Android Automerger
2d7010c962
merge in jb-release history after reset to jb-dev
2012-06-03 06:05:17 -07:00
Eric Fischer
635d8610d7
am 13b2f06d
: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '13b2f06d2e5a74a52bc00b21f91d720407f5a98d':
Import translations. DO NOT MERGE
2012-06-02 08:34:51 -07:00
Brian Colonna
900922773a
am af197847
: Merge "Bug 5457035: Changed strings in FUL anti-spoofing setup" into jb-dev
...
* commit 'af197847164bd0229e7ef51114cd17fc43b35a15':
Bug 5457035: Changed strings in FUL anti-spoofing setup
2012-06-01 19:02:04 -07:00
Eric Fischer
13b2f06d2e
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-06-01 18:10:52 -07:00
Brian Colonna
af19784716
Merge "Bug 5457035: Changed strings in FUL anti-spoofing setup" into jb-dev
2012-06-01 14:45:56 -07:00
Brian Colonna
e06fb708f0
Bug 5457035: Changed strings in FUL anti-spoofing setup
...
Added latest string changes requested for Face Unlock
liveness/head-turn anti-spoofing option.
Change-Id: Ic703bda6b449756bdf05d7de843e9aab6b939446
2012-06-01 16:37:06 -04:00
Eric Fischer
360f219816
Import translations. DO NOT MERGE
...
Change-Id: Id95cfc21f742d95cdb4b8ca7530c4410faaaba63
2012-06-01 12:28:50 -07:00
Eric Fischer
9512935e21
am 96e2a62a
: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '96e2a62a464c1c1d9866c6ab515ed2f78ab11a62':
Import translations. DO NOT MERGE
2012-05-31 15:52:02 -07:00
Eric Fischer
96e2a62a46
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-05-31 15:48:12 -07:00
Amith Yamasani
31d868b37c
am 040029af
: Merge "Reword the summary text for Unknown sources in Security Settings" into jb-dev
...
* commit '040029af27276317a009440ec93872e134c98216':
Reword the summary text for Unknown sources in Security Settings
2012-05-31 15:31:11 -07:00
Amith Yamasani
040029af27
Merge "Reword the summary text for Unknown sources in Security Settings" into jb-dev
2012-05-31 15:27:19 -07:00
Irfan Sheriff
078f1325aa
am c26c2f22
: Merge "Fetch peers after preferenceScreen is ready" into jb-dev
...
* commit 'c26c2f22042b676539f664002ec51ce78d276b62':
Fetch peers after preferenceScreen is ready
2012-05-31 15:08:44 -07:00
Irfan Sheriff
c26c2f2204
Merge "Fetch peers after preferenceScreen is ready" into jb-dev
2012-05-31 15:04:53 -07:00