OSDN Git Service
Jeff Brown [Tue, 12 Jun 2012 21:52:43 +0000 (14:52 -0700)]
am
77a6080a: am
b5858bbd: Fix NPE in rotation lock content observer.
* commit '
77a6080aebc9754bff2307edc1998bd54657fbb5':
Fix NPE in rotation lock content observer.
Jeff Brown [Tue, 12 Jun 2012 20:16:04 +0000 (13:16 -0700)]
am
b5858bbd: Fix NPE in rotation lock content observer.
* commit '
b5858bbdc363e21bf87ac5643822ec9e57956c52':
Fix NPE in rotation lock content observer.
Eric Fischer [Tue, 12 Jun 2012 20:15:05 +0000 (13:15 -0700)]
am
ecb96401: (-s ours) am
00808b02: Import translations. DO NOT MERGE
* commit '
ecb96401786c784eef8016625db80a7e2d3714f0':
Import translations. DO NOT MERGE
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
Eric Fischer [Tue, 12 Jun 2012 19:42:09 +0000 (12:42 -0700)]
am
00808b02: Import translations. DO NOT MERGE
* commit '
00808b0280d78d0930650e39eaf21a38915da5be':
Import translations. DO NOT MERGE
Eric Fischer [Mon, 11 Jun 2012 20:32:39 +0000 (13:32 -0700)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Mon, 11 Jun 2012 20:27:08 +0000 (13:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3e12fee68296f3fc61306e008f86a09c4d342550
Eric Fischer [Mon, 11 Jun 2012 20:24:05 +0000 (13:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I835b15b3d3081d5d9010ff91eb54b9cd6e6316bb
Jean-Baptiste Queru [Mon, 11 Jun 2012 19:06:30 +0000 (12:06 -0700)]
am
3e8035bc: am
c56b0146: Merge "Fixing pin_too_short text"
* commit '
3e8035bcaff67d395481e3fb70ca2ad1d21cd3b5':
Fixing pin_too_short text
Jean-Baptiste Queru [Mon, 11 Jun 2012 19:03:59 +0000 (12:03 -0700)]
am
c56b0146: Merge "Fixing pin_too_short text"
* commit '
c56b01460e7c83c8a21b02f411572ee69b755892':
Fixing pin_too_short text
Jean-Baptiste Queru [Mon, 11 Jun 2012 18:22:45 +0000 (11:22 -0700)]
Merge "Fixing pin_too_short text"
The Android Open Source Project [Mon, 11 Jun 2012 16:25:47 +0000 (09:25 -0700)]
am
d954de0a: Reconcile with jb-release
* commit '
d954de0a4efe44149fc4304cf44a2704ddc5edac':
Removing head turn and putting blink back
Add back a SYNC_SETTINGS screen
The Android Open Source Project [Mon, 11 Jun 2012 16:22:45 +0000 (09:22 -0700)]
Reconcile with jb-release
Change-Id: I1fcdba335497346381c4b4a7d421698d0f44ba4b
The Android Automerger [Mon, 11 Jun 2012 14:04:18 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Youness Ghanim [Mon, 11 Jun 2012 11:45:20 +0000 (13:45 +0200)]
Fixing pin_too_short text
Made lockpassword_pin_too_short in sync with other pin
text lables.
Change-Id: Ia9295f7b36b29a3b4370e04461446a1428fc2ee2
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
Amith Yamasani [Fri, 8 Jun 2012 22:35:45 +0000 (15:35 -0700)]
am
f595a2b8: am
450c4c86: Merge "Exit to Settings when removing the only account for a type." into jb-dev
* commit '
f595a2b884794f4bfcb8c2d458eb2a4f73615514':
Exit to Settings when removing the only account for a type.
Eric Fischer [Fri, 8 Jun 2012 22:35:44 +0000 (15:35 -0700)]
am
ab45c75a: (-s ours) am
dba0f9f1: Import translations. DO NOT MERGE
* commit '
ab45c75a3a91fae900e17204baf54e16532abf9f':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 8 Jun 2012 22:35:44 +0000 (15:35 -0700)]
am
32f94d01: am
1e7fa779: Add ID to copy translation from to string that is not translated yet.
* commit '
32f94d0160b246978b1201aca8920a926d733ba2':
Add ID to copy translation from to string that is not translated yet.
Amith Yamasani [Fri, 8 Jun 2012 22:30:58 +0000 (15:30 -0700)]
am
450c4c86: Merge "Exit to Settings when removing the only account for a type." into jb-dev
* commit '
450c4c86ca6583abc27520174d0f51b8f171f4a3':
Exit to Settings when removing the only account for a type.
Eric Fischer [Fri, 8 Jun 2012 22:30:51 +0000 (15:30 -0700)]
am
dba0f9f1: Import translations. DO NOT MERGE
* commit '
dba0f9f196ad0498f8068b3696ace312af4b2680':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 8 Jun 2012 22:30:50 +0000 (15:30 -0700)]
am
1e7fa779: Add ID to copy translation from to string that is not translated yet.
* commit '
1e7fa779f95a37cc9f47537afdd05763d253f2ce':
Add ID to copy translation from to string that is not translated yet.
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
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
Eric Fischer [Fri, 8 Jun 2012 22:10:38 +0000 (15:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8964ab48dade7424b2957d1f7ec7f2d8b9fb0ae0
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
Danielle Millett [Fri, 8 Jun 2012 21:21:49 +0000 (14:21 -0700)]
am
59c2ca56: am
acd37771: Merge "Removing head turn and putting blink back" into jb-dev
* commit '
59c2ca56cc0112d89f663337bbec1578a3bb543f':
Removing head turn and putting blink back
Danielle Millett [Fri, 8 Jun 2012 21:20:01 +0000 (14:20 -0700)]
am
acd37771: Merge "Removing head turn and putting blink back" into jb-dev
* commit '
acd377718479fe0d4f093c2f2f5326e59e31ff63':
Removing head turn and putting blink back
Danielle Millett [Fri, 8 Jun 2012 21:18:05 +0000 (14:18 -0700)]
Merge "Removing head turn and putting blink back" into jb-dev
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
Jean-Baptiste Queru [Fri, 8 Jun 2012 15:24:23 +0000 (08:24 -0700)]
am
ce1a3acf: am
5a0b3230: Merge "Add account type check for invisible sync adapters."
* commit '
ce1a3acf15ada0b44f428a7feedf5d25e9086278':
Add account type check for invisible sync adapters.
The Android Automerger [Fri, 8 Jun 2012 15:22:22 +0000 (08:22 -0700)]
merge in jb-release history after reset to jb-dev
Jean-Baptiste Queru [Fri, 8 Jun 2012 15:21:39 +0000 (08:21 -0700)]
am
5a0b3230: Merge "Add account type check for invisible sync adapters."
* commit '
5a0b3230e2a70c5837b35753fdd2ffd7536946f4':
Add account type check for invisible sync adapters.
Jean-Baptiste Queru [Fri, 8 Jun 2012 15:02:36 +0000 (08:02 -0700)]
Merge "Add account type check for invisible sync adapters."
Amith Yamasani [Fri, 8 Jun 2012 07:07:17 +0000 (00:07 -0700)]
am
6b65f138: am
b3a049f5: Merge "Save the auto-sync dialog state for orientation changes" into jb-dev
* commit '
6b65f13862c8f40abcb450127c1ef997a68f1b2c':
Save the auto-sync dialog state for orientation changes
Amith Yamasani [Fri, 8 Jun 2012 07:05:25 +0000 (00:05 -0700)]
am
b3a049f5: Merge "Save the auto-sync dialog state for orientation changes" into jb-dev
* commit '
b3a049f5392da8500befaf2595f5170cf04cc432':
Save the auto-sync dialog state for orientation changes
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
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
Amith Yamasani [Fri, 8 Jun 2012 02:23:09 +0000 (19:23 -0700)]
am
b2f02a91: am
cc993689: Merge "Directly go to account sync screen if there\'s only one account for that type." into jb-dev
* commit '
b2f02a916e5a8fa6e4e42c52eda5dfeb05ba4cc3':
Directly go to account sync screen if there's only one account for that type.
Amith Yamasani [Fri, 8 Jun 2012 02:20:54 +0000 (19:20 -0700)]
am
cc993689: Merge "Directly go to account sync screen if there\'s only one account for that type." into jb-dev
* commit '
cc993689cfc507621aae8abfac6b851e37a5e484':
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
Eric Fischer [Fri, 8 Jun 2012 00:18:00 +0000 (17:18 -0700)]
am
8daa8bdd: (-s ours) am
51863136: Import translations. DO NOT MERGE
* commit '
8daa8bdd236c9094f7a70ce24f7a326e9e2332ba':
Import translations. DO NOT MERGE
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
Eric Fischer [Thu, 7 Jun 2012 23:31:26 +0000 (16:31 -0700)]
am
51863136: Import translations. DO NOT MERGE
* commit '
51863136957a636399b301100600bcfc4a59fb47':
Import translations. DO NOT MERGE
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
Eric Fischer [Thu, 7 Jun 2012 22:14:15 +0000 (15:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7e2f9f4cf85d1217c70388a7b2e9bfc1ab60f53d
Eric Fischer [Thu, 7 Jun 2012 22:12:24 +0000 (15:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5c5f75c4980677fef82c64d83f3d7a37ae604cc3
Amith Yamasani [Thu, 7 Jun 2012 18:11:18 +0000 (11:11 -0700)]
am
6f5fe4d6: am
ffa6f6e3: Merge "Add back a SYNC_SETTINGS screen" into jb-dev
* commit '
6f5fe4d685b796328ec40066aa610c9a4ca72f5e':
Add back a SYNC_SETTINGS screen
Amith Yamasani [Thu, 7 Jun 2012 18:08:59 +0000 (11:08 -0700)]
am
ffa6f6e3: Merge "Add back a SYNC_SETTINGS screen" into jb-dev
* commit '
ffa6f6e3e260dad0e7f75f6e8daa892eeed8df92':
Add back a SYNC_SETTINGS screen
Amith Yamasani [Thu, 7 Jun 2012 18:06:10 +0000 (11:06 -0700)]
Merge "Add back a SYNC_SETTINGS screen" into jb-dev
The Android Open Source Project [Thu, 7 Jun 2012 14:56:01 +0000 (07:56 -0700)]
am
709543b3: Reconcile with jb-release
* commit '
709543b36657adeb03eb9feab6d0acabfd59d8c7':
Update headers when accounts are changed.
The Android Open Source Project [Thu, 7 Jun 2012 14:51:30 +0000 (07:51 -0700)]
Reconcile with jb-release
Change-Id: Iaeb1880d3f388c423e6fa8993fa375ae7c207ecf
The Android Automerger [Thu, 7 Jun 2012 14:04:26 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Zhenguo Fu [Fri, 15 Apr 2011 03:24:31 +0000 (11:24 +0800)]
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
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
Philip Milne [Thu, 7 Jun 2012 00:39:25 +0000 (17:39 -0700)]
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"
Philip Milne [Thu, 7 Jun 2012 00:36:51 +0000 (17:36 -0700)]
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"
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
Eric Fischer [Wed, 6 Jun 2012 23:56:00 +0000 (16:56 -0700)]
am
2f050fd7: (-s ours) am
ec71971c: Import translations. DO NOT MERGE
* commit '
2f050fd71ae79c0e253e8e16b59e64394af02070':
Import translations. DO NOT MERGE
Eric Fischer [Wed, 6 Jun 2012 23:53:53 +0000 (16:53 -0700)]
am
ec71971c: Import translations. DO NOT MERGE
* commit '
ec71971c34c61662ed25a8eaaaf8749e47d5bed5':
Import translations. DO NOT MERGE
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
Eric Fischer [Wed, 6 Jun 2012 20:23:45 +0000 (13:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I981ae5d2c0808645fc9262343b9146f2c67fac67
Eric Fischer [Wed, 6 Jun 2012 20:21:25 +0000 (13:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: If466dfc20ff28bfb26b10214503200452c66ccea
The Android Automerger [Wed, 6 Jun 2012 14:04:27 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Jeff Brown [Wed, 6 Jun 2012 02:24:50 +0000 (19:24 -0700)]
am
ff8c12e5: am
6a5e0252: Merge "Implement new rotation policy." into jb-dev
* commit '
ff8c12e5604660a39a6a656fbb4a17ad798b1937':
Implement new rotation policy.
Jeff Brown [Wed, 6 Jun 2012 02:24:48 +0000 (19:24 -0700)]
am
4eb0bd40: am
de4f8181: Merge "Revert "Settings: "Rotation lock" retains existing orientation."" into jb-dev
* commit '
4eb0bd40d1426b361e6254230d61e81d86d220ca':
Revert "Settings: "Rotation lock" retains existing orientation."
Jeff Brown [Wed, 6 Jun 2012 02:24:47 +0000 (19:24 -0700)]
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."
Jeff Brown [Wed, 6 Jun 2012 02:18:18 +0000 (19:18 -0700)]
am
6a5e0252: Merge "Implement new rotation policy." into jb-dev
* commit '
6a5e0252ce383654e304ffd0bca09ced0cadc0a3':
Implement new rotation policy.
Jeff Brown [Wed, 6 Jun 2012 02:18:15 +0000 (19:18 -0700)]
am
de4f8181: Merge "Revert "Settings: "Rotation lock" retains existing orientation."" into jb-dev
* commit '
de4f8181329441dd57d7402d58de8f314d1757a3':
Revert "Settings: "Rotation lock" retains existing orientation."
Jeff Brown [Wed, 6 Jun 2012 02:18:14 +0000 (19:18 -0700)]
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."
Jeff Brown [Wed, 6 Jun 2012 02:11:42 +0000 (19:11 -0700)]
Merge "Implement new rotation policy." 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
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
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
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.
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.
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
Justin Ho [Tue, 5 Jun 2012 22:08:51 +0000 (15:08 -0700)]
am
f766fa6a: am
f4e1681d: Merge "Update headers when accounts are changed." into jb-dev
* commit '
f766fa6a820e5b0699faa419986fca3234517db5':
Update headers when accounts are changed.
Justin Ho [Tue, 5 Jun 2012 22:06:37 +0000 (15:06 -0700)]
am
f4e1681d: Merge "Update headers when accounts are changed." into jb-dev
* commit '
f4e1681d77c8b6593937be94d6a9c1fdda642957':
Update headers when accounts are changed.
Andrew Flynn [Tue, 5 Jun 2012 22:04:49 +0000 (15:04 -0700)]
am
ab88256f: am
ab049a19: Increase dimens for power control widget for sw600dp
* commit '
ab88256fd2f2c36c4595a5e36d6cc07383ce5935':
Increase dimens for power control widget for sw600dp
Justin Ho [Tue, 5 Jun 2012 22:03:54 +0000 (15:03 -0700)]
Merge "Update headers when accounts are changed." into jb-dev
Andrew Flynn [Tue, 5 Jun 2012 22:02:27 +0000 (15:02 -0700)]
am
ab049a19: Increase dimens for power control widget for sw600dp
* commit '
ab049a196bf6a5ced45467810e38c6e33a1b4a82':
Increase 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
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
Eric Fischer [Tue, 5 Jun 2012 19:26:14 +0000 (12:26 -0700)]
am
8e584490: (-s ours) am
6f10eb7d: Import translations. DO NOT MERGE
* commit '
8e58449072f952e6024f70d988b569f6075e6223':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 5 Jun 2012 19:13:40 +0000 (12:13 -0700)]
am
6f10eb7d: Import translations. DO NOT MERGE
* commit '
6f10eb7db50514bd5530a633ea1ebed571c84582':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 5 Jun 2012 19:05:37 +0000 (12:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I329715293717b472445f15e9c780c19d04bf1bb7
Eric Fischer [Tue, 5 Jun 2012 19:03:44 +0000 (12:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I81581e50f658f628a5d6354c9c8372cc1a98d566
Eric Fischer [Tue, 5 Jun 2012 16:21:53 +0000 (09:21 -0700)]
am
5f366fd3: (-s ours) am
90504516: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
5f366fd3aa06d386a7a8c9b31281eebdcf018045':
Import translations. DO NOT MERGE
Amith Yamasani [Tue, 5 Jun 2012 16:21:32 +0000 (09:21 -0700)]
am
227edcf6: am
03295520: Merge "Account types at toplevel of Settings" into jb-dev
* commit '
227edcf61abaf91001d9061537d66e0aad64a4ee':
Account types at toplevel of Settings
The Android Automerger [Tue, 5 Jun 2012 13:59:36 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Tue, 5 Jun 2012 01:25:39 +0000 (18:25 -0700)]
am
90504516: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
9050451649b920a490117462ec71e87a0aa3ee63':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 5 Jun 2012 01:21:52 +0000 (18:21 -0700)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Tue, 5 Jun 2012 01:21:44 +0000 (18:21 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Tue, 5 Jun 2012 01:21:17 +0000 (18:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5c7237b08abf4857048c808cb3927bd138f7e30d
Eric Fischer [Tue, 5 Jun 2012 01:19:13 +0000 (18:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3347ec085b2a09f654b17c0609522d47a14627b2
Amith Yamasani [Tue, 5 Jun 2012 01:05:35 +0000 (18:05 -0700)]
am
03295520: Merge "Account types at toplevel of Settings" into jb-dev
* commit '
03295520359e06013d77387979a182845a2b1f1b':
Account types at toplevel of Settings
Amith Yamasani [Tue, 5 Jun 2012 01:02:34 +0000 (18:02 -0700)]
Merge "Account types at toplevel of Settings" into jb-dev
Amith Yamasani [Fri, 18 May 2012 16:50:08 +0000 (09:50 -0700)]
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
Dianne Hackborn [Mon, 4 Jun 2012 22:59:06 +0000 (15:59 -0700)]
am
c2543e8f: am
883329ca: Fix issue #
6603152: User-adjustable autobrightness broken?
* commit '
c2543e8f4e6c80ec506a72f96108b672b9fb4049':
Fix issue #
6603152: User-adjustable autobrightness broken?