OSDN Git Service
Ying Wang [Mon, 18 Jun 2012 21:44:02 +0000 (14:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I899bf73fbcdeb84593fafd2b29953577034458e5
Nick Pelly [Fri, 15 Jun 2012 23:56:06 +0000 (16:56 -0700)]
Merge "Include WIFI scan time in per-application power usage summary."
Nick Pelly [Mon, 11 Jun 2012 19:38:11 +0000 (12:38 -0700)]
Include WIFI scan time in per-application power usage summary.
Also, improve logging to more easily show power break-down for
each UID.
Bug:
6642581
Change-Id: Ib36f4bf9c8c579797225cf887e5b2d323cca61b0
Ying Wang [Fri, 15 Jun 2012 21:36:14 +0000 (14:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3311d40c77570583a5c1d26acf89dc9e544300ff
Eric Fischer [Thu, 14 Jun 2012 21:49:07 +0000 (14:49 -0700)]
am
aac5d9f6: (-s ours) am
5ea994c5: Import translations. DO NOT MERGE
* commit '
aac5d9f60e71a0bf60b1de3efaa12ae27320629b':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 14 Jun 2012 21:46:18 +0000 (14:46 -0700)]
am
5ea994c5: Import translations. DO NOT MERGE
* commit '
5ea994c552ea72385022c0c81b8b69acbe30a113':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 14 Jun 2012 20:58:24 +0000 (13:58 -0700)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Thu, 14 Jun 2012 20:47:54 +0000 (13:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib3f37708c28402968d799deb4d918204457638d5
Eric Fischer [Thu, 14 Jun 2012 20:44:39 +0000 (13:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ife956408e146ad876b860968dacd8f3095ed84e1
Jean-Baptiste Queru [Thu, 14 Jun 2012 17:33:22 +0000 (10:33 -0700)]
am
5cca2411: am
60ec22d1: (-s ours) Merge "Settings: Fixed German translation for turning WLAN/Bluetooth on"
* commit '
5cca2411fd83f59417be7792800d2f69bdc23a63':
Settings: Fixed German translation for turning WLAN/Bluetooth on
Amith Yamasani [Thu, 14 Jun 2012 17:33:05 +0000 (10:33 -0700)]
am
e5147e49: am
5b7a8204: Merge "Show only the language if there\'s only one locale for the language." into jb-dev
* commit '
e5147e4933e61c762f63b115e41c5aa8a2e37bd4':
Show only the language if there's only one locale for the language.
Eric Fischer [Thu, 14 Jun 2012 17:32:59 +0000 (10:32 -0700)]
am
5b97798c: (-s ours) am
612a0c10: Import translations. DO NOT MERGE
* commit '
5b97798cbd2cad3448a9adec8f4cc249e95e5de7':
Import translations. DO NOT MERGE
Danielle Millett [Thu, 14 Jun 2012 15:59:10 +0000 (11:59 -0400)]
Fix
6654057: Fixing crash if device is rotated during confirm password
In onActivityResult, mBiometricWeakLiveliness can be null if the device was rotated
during confirm password. To fix this, the line accessing mBiometricWeakLiveliness can
safely be removed. It's unnecessary because when onActivityResult finishes, onResume is
always called when it displays the security settings again. Since onResume sets the
checkmark value based on the stored value in lockPatternUtils, the check mark will always
show the correct value when settings is displayed.
Change-Id: Idba9ae1d829911a9581bb6678c4d1f3b44784c63
Jean-Baptiste Queru [Thu, 14 Jun 2012 00:39:33 +0000 (17:39 -0700)]
am
60ec22d1: (-s ours) Merge "Settings: Fixed German translation for turning WLAN/Bluetooth on"
* commit '
60ec22d1bdaa6124311a720717e3c522f839441e':
Settings: Fixed German translation for turning WLAN/Bluetooth on
Jean-Baptiste Queru [Thu, 14 Jun 2012 00:05:38 +0000 (17:05 -0700)]
Merge "Settings: Fixed German translation for turning WLAN/Bluetooth on"
Amith Yamasani [Wed, 13 Jun 2012 22:24:12 +0000 (15:24 -0700)]
am
5b7a8204: Merge "Show only the language if there\'s only one locale for the language." into jb-dev
* commit '
5b7a8204d875c901782ff482b68fde8da7a0081f':
Show only the language if there's only one locale for the language.
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
Eric Fischer [Wed, 13 Jun 2012 21:32:38 +0000 (14:32 -0700)]
am
612a0c10: Import translations. DO NOT MERGE
* commit '
612a0c106bc3991a074f6f15361b357494e70e62':
Import translations. DO NOT MERGE
Eric Fischer [Wed, 13 Jun 2012 21:20:54 +0000 (14:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie64ad1c03c6f55e1e55adbf95fb87d39f03c90f8
Eric Fischer [Wed, 13 Jun 2012 21:17:44 +0000 (14:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8566dbced26846ce55861b5f57f95034d03604c2
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
Jeff Sharkey [Wed, 13 Jun 2012 01:57:04 +0000 (18:57 -0700)]
am
c35b51f3: am
cd4428ce: Storage banner when device in low disk state.
* commit '
c35b51f3c7746c29672d15e1564b04103c8d32bf':
Storage banner when device in low disk state.
Jeff Sharkey [Wed, 13 Jun 2012 01:54:49 +0000 (18:54 -0700)]
am
cd4428ce: Storage banner when device in low disk state.
* commit '
cd4428ce2c03fd355a3093fad6553636da9cef9b':
Storage 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
Amith Yamasani [Wed, 18 Apr 2012 00:12:01 +0000 (17:12 -0700)]
UI to add a photo to a user's profile.
Photo will be shown in user management screen and switcher.
Change-Id: Icc0a39487daae13530fc1741780fb42fee0dada4
Jean-Baptiste Queru [Tue, 12 Jun 2012 23:00:33 +0000 (16:00 -0700)]
am
99f27dc5: Merge "Swap start/stop of SettingsObserver and InputDeviceListener" into jb-dev-plus-aosp
* commit '
99f27dc554c7937bc1afbcae0c40e364d025ca2d':
Swap start/stop of SettingsObserver and InputDeviceListener
Jean-Baptiste Queru [Tue, 12 Jun 2012 22:58:42 +0000 (15:58 -0700)]
Merge "Swap start/stop of SettingsObserver and InputDeviceListener" into jb-dev-plus-aosp
Jean-Baptiste Queru [Tue, 12 Jun 2012 22:43:17 +0000 (15:43 -0700)]
Swap start/stop of SettingsObserver and InputDeviceListener
Change-Id: Ic6b7bab860f71889a6ec476ccab1e83d2efd0e64
Jean-Baptiste Queru [Tue, 12 Jun 2012 22:32:52 +0000 (15:32 -0700)]
am
a6589134: Merge "resolved conflicts for merge of
051f46d7 to jb-dev-plus-aosp" into jb-dev-plus-aosp
* commit '
a65891347556b4d14f6dad829017513b984d20c1':
Unregister ContentObserver in InputMethodAndLanguageSettings class
Jean-Baptiste Queru [Tue, 12 Jun 2012 22:30:36 +0000 (15:30 -0700)]
Merge "resolved conflicts for merge of
051f46d7 to jb-dev-plus-aosp" into jb-dev-plus-aosp
Ying Wang [Tue, 12 Jun 2012 22:28:40 +0000 (15:28 -0700)]
am
45e86987: (-s ours) am
292d7e3b: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
45e869874aaf90091be2f2fac5fcf9c73c36baee':
Import translations. DO NOT MERGE
Ying Wang [Tue, 12 Jun 2012 22:28:32 +0000 (15:28 -0700)]
Merge "Import translations. DO NOT MERGE"
Ying Wang [Tue, 12 Jun 2012 22:26:38 +0000 (15:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: If59e97f6923cdfb445c233a5eb0a1c352a9fe93f
Ying Wang [Tue, 12 Jun 2012 22:26:30 +0000 (15:26 -0700)]
am
292d7e3b: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
292d7e3b8135c93b2f71bb05be81ca71dd03add1':
Import translations. DO NOT MERGE
Ying Wang [Tue, 12 Jun 2012 22:24:15 +0000 (15:24 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Jean-Baptiste Queru [Tue, 12 Jun 2012 22:22:22 +0000 (15:22 -0700)]
resolved conflicts for merge of
051f46d7 to jb-dev-plus-aosp
Change-Id: I73165a3d77318cbb0271e0d5c64cc49caad8f693
Ying Wang [Tue, 12 Jun 2012 22:21:39 +0000 (15:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3f7c3cd191375024cd5613b3d2b8e0c859c96928
Russell Brenner [Tue, 12 Jun 2012 21:53:05 +0000 (14:53 -0700)]
am
8b16c219: am
3f9ec9f1: Merge "Disable notification alerts in Settings for SUW" into jb-dev
* commit '
8b16c219f08521996a393c46a386185bb96903c6':
Disable notification alerts in Settings for SUW
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.
Russell Brenner [Tue, 12 Jun 2012 20:56:38 +0000 (13:56 -0700)]
am
3f9ec9f1: Merge "Disable notification alerts in Settings for SUW" into jb-dev
* commit '
3f9ec9f1c2744664ae637b9fbce99c115c60a429':
Disable notification alerts in Settings for SUW
Russell Brenner [Tue, 12 Jun 2012 20:53:31 +0000 (13:53 -0700)]
Merge "Disable notification alerts in Settings for SUW" into jb-dev
Jean-Baptiste Queru [Tue, 12 Jun 2012 20:50:36 +0000 (13:50 -0700)]
Merge "Unregister ContentObserver in InputMethodAndLanguageSettings class"
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
Shuhrat Dehkanov [Sat, 19 May 2012 14:13:33 +0000 (23:13 +0900)]
Unregister ContentObserver in InputMethodAndLanguageSettings class
A content observer (SettingsObserver) is registered when
InputMethodAndLanguageSettings is created, but it is never unregistered.
Added resume() and pause() methods to SettingsObserver inner class
to register/unregister the content observer when InputMethodAndLanguageSettings
is resumed/paused.
Change-Id: I6d4cc2625a5fd8435967d930f46e8fe86eda4714
Signed-off-by: Shuhrat Dehkanov <uzbmaster@gmail.com>
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
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"
OSDN Git Service
