The Android Open Source Project
709543b366
Reconcile with jb-release
...
Change-Id: Iaeb1880d3f388c423e6fa8993fa375ae7c207ecf
2012-06-07 07:51:30 -07:00
The Android Automerger
44d9b0f47b
merge in jb-release history after reset to jb-dev
2012-06-07 07:04:26 -07:00
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
9b059a10c7
am 0884f403
: am ceb1ff2a
: Merge "Fix 6622557
: Developer options "Show layout bounds" summary should say "margins" instead of "padding"" into jb-dev
...
* commit '0884f4030367eaad14cbd8114c88624286cb4cfe':
Fix 6622557
: Developer options "Show layout bounds" summary should say "margins" instead of "padding"
2012-06-06 17:39:25 -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
0c629dfbb5
am 2f050fd7
: (-s ours) am ec71971c
: Import translations. DO NOT MERGE
...
* commit '2f050fd71ae79c0e253e8e16b59e64394af02070':
Import translations. DO NOT MERGE
2012-06-06 16:56:00 -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
0991f0ff20
Import translations. DO NOT MERGE
...
Change-Id: I981ae5d2c0808645fc9262343b9146f2c67fac67
2012-06-06 13:23:45 -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
67aa924aae
am ff8c12e5
: am 6a5e0252
: Merge "Implement new rotation policy." into jb-dev
...
* commit 'ff8c12e5604660a39a6a656fbb4a17ad798b1937':
Implement new rotation policy.
2012-06-05 19:24:50 -07:00
Jeff Brown
189f88b022
am 4eb0bd40
: am de4f8181
: Merge "Revert "Settings: "Rotation lock" retains existing orientation."" into jb-dev
...
* commit '4eb0bd40d1426b361e6254230d61e81d86d220ca':
Revert "Settings: "Rotation lock" retains existing orientation."
2012-06-05 19:24:48 -07:00
Jeff Brown
a95fd26fe3
am ebd1a3c5
: am 977ff542
: Merge "Revert "Rename and flip meaning of auto-rotate to rotation lock."" into jb-dev
...
* commit 'ebd1a3c5deca5953f4a7b31f325ab7888f88d620':
Revert "Rename and flip meaning of auto-rotate to rotation lock."
2012-06-05 19:24:47 -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
5aae4667d4
am f766fa6a
: am f4e1681d
: Merge "Update headers when accounts are changed." into jb-dev
...
* commit 'f766fa6a820e5b0699faa419986fca3234517db5':
Update headers when accounts are changed.
2012-06-05 15:08:51 -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
Andrew Flynn
758ce006e5
am ab88256f
: am ab049a19
: Increase dimens for power control widget for sw600dp
...
* commit 'ab88256fd2f2c36c4595a5e36d6cc07383ce5935':
Increase dimens for power control widget for sw600dp
2012-06-05 15:04:49 -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
d17f2cf1fa
am 8e584490
: (-s ours) am 6f10eb7d
: Import translations. DO NOT MERGE
...
* commit '8e58449072f952e6024f70d988b569f6075e6223':
Import translations. DO NOT MERGE
2012-06-05 12:26:14 -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
16b91d3f2f
Import translations. DO NOT MERGE
...
Change-Id: I329715293717b472445f15e9c780c19d04bf1bb7
2012-06-05 12:05:37 -07:00
Eric Fischer
6f10eb7db5
Import translations. DO NOT MERGE
...
Change-Id: I81581e50f658f628a5d6354c9c8372cc1a98d566
2012-06-05 12:03:44 -07:00
Eric Fischer
659d47ed22
am 5f366fd3
: (-s ours) am 90504516
: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '5f366fd3aa06d386a7a8c9b31281eebdcf018045':
Import translations. DO NOT MERGE
2012-06-05 09:21:53 -07:00
Amith Yamasani
495c46b4ce
am 227edcf6
: am 03295520
: Merge "Account types at toplevel of Settings" into jb-dev
...
* commit '227edcf61abaf91001d9061537d66e0aad64a4ee':
Account types at toplevel of Settings
2012-06-05 09:21:32 -07:00
The Android Automerger
bdd876deb7
merge in jb-release history after reset to jb-dev
2012-06-05 06:59:36 -07:00
Kenneth Westin
e3f7f68dfa
Limit length of SSID input string to 32
...
Limits the UI text box of the SSID field to 32 characters (which is
standard) from previously being unlimited in the UI but constrained
in the driver implementation.
See IEEE 802.11-1999 7.3.2.1 Service Set Identity (SSID) element.
Change-Id: I17573ee338ed744a2bc0258ee2c0f382c1a5c931
2012-06-05 12:40:05 +02: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
a0a10a8576
Merge "Import translations. DO NOT MERGE"
2012-06-04 18:21:52 -07:00
Eric Fischer
9050451649
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-06-04 18:21:44 -07:00
Eric Fischer
d19c7360fb
Import translations. DO NOT MERGE
...
Change-Id: I5c7237b08abf4857048c808cb3927bd138f7e30d
2012-06-04 18:21:17 -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
21c5536fff
am c2543e8f
: am 883329ca
: Fix issue #6603152 : User-adjustable autobrightness broken?
...
* commit 'c2543e8f4e6c80ec506a72f96108b672b9fb4049':
Fix issue #6603152 : User-adjustable autobrightness broken?
2012-06-04 15:59:06 -07:00