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
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
54e599f3ce
am 80497db4
: am 98894ed4
: Merge "Fix crash when accessibility is on" into jb-dev
...
* commit '80497db44479936391c8cc8e885240407a0ba372':
Fix crash when accessibility is on
2012-06-04 12:05:37 -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
c429d49e54
am 635d8610
: (-s ours) am 13b2f06d
: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '635d8610d7b66072aca8874a953e7fb97bcb2a61':
Import translations. DO NOT MERGE
2012-06-02 08:39:56 -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
44cc9bf82d
am 90092277
: am af197847
: Merge "Bug 5457035: Changed strings in FUL anti-spoofing setup" into jb-dev
...
* commit '900922773a70b73d93a55da52f0b974ac89677a1':
Bug 5457035: Changed strings in FUL anti-spoofing setup
2012-06-02 08:19:44 -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
b90bef63e4
Import translations. DO NOT MERGE
...
Change-Id: If23b7efd7868dedab4db9b0384ca7a2760bb6a7b
2012-06-01 12:30:44 -07:00
Eric Fischer
360f219816
Import translations. DO NOT MERGE
...
Change-Id: Id95cfc21f742d95cdb4b8ca7530c4410faaaba63
2012-06-01 12:28:50 -07:00
Eric Fischer
e3fb2ae20c
am 9512935e
: (-s ours) am 96e2a62a
: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '9512935e21d2b29933b5e5282b038ca36ffcf1e0':
Import translations. DO NOT MERGE
2012-05-31 15:54:44 -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
10cdaf9e87
Merge "Import translations. DO NOT MERGE"
2012-05-31 15:48:42 -07:00
Eric Fischer
96e2a62a46
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-05-31 15:48:12 -07:00
Amith Yamasani
68f03e9ede
am 31d868b3
: am 040029af
: Merge "Reword the summary text for Unknown sources in Security Settings" into jb-dev
...
* commit '31d868b37c5c48b469fdf890d8021887461c2f36':
Reword the summary text for Unknown sources in Security Settings
2012-05-31 15:33:45 -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
5afc87c6ba
am 078f1325
: am c26c2f22
: Merge "Fetch peers after preferenceScreen is ready" into jb-dev
...
* commit '078f1325aa10de073112bdc38a2d78267318b5eb':
Fetch peers after preferenceScreen is ready
2012-05-31 15:11:25 -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
Björn Lundén
e7c53b1c9e
Settings: Use ICS alert drawable
...
Point to the correct holo alert drawable.
Change-Id: Ia15aaa028c8371cb2478baeecd2da31520c43a5d
2012-05-31 23:35:24 +02:00
Eric Fischer
0cd2d04f2d
Import translations. DO NOT MERGE
...
Change-Id: I2b3d8deb06e253d4b1149abe371d7e4144b781d2
2012-05-31 14:29:54 -07:00
Eric Fischer
b9b70aa734
Import translations. DO NOT MERGE
...
Change-Id: I508ef274b0aa63d2505a2db40534697b6b266666
2012-05-31 14:28:01 -07:00
Amith Yamasani
8f98771c5c
Reword the summary text for Unknown sources in Security Settings
...
Don't use "non-Market" to describe unknown sources.
Bug: 6586626
Change-Id: I2ab440e9db1592ea8b398bd9466ff2f05ca5f6ce
2012-05-31 13:12:13 -07:00
Irfan Sheriff
a9d76b3bcc
Fetch peers after preferenceScreen is ready
...
Bug: 6450152
Change-Id: Ic95c7fdba5fa7cb54b0c54ed9a423e0e0683ad2f
2012-05-31 12:44:03 -07:00
Irfan Sheriff
f05811949f
am 945a36f6
: am 5388bc88
: Merge "Fix poor network detection setting" into jb-dev
...
* commit '945a36f621a5406b20602dd4080fcd59f8a9950f':
Fix poor network detection setting
2012-05-31 12:27:02 -07:00
Irfan Sheriff
945a36f621
am 5388bc88
: Merge "Fix poor network detection setting" into jb-dev
...
* commit '5388bc88bdf045a461c52856e9bc2de9f1664acf':
Fix poor network detection setting
2012-05-31 12:25:04 -07:00
Irfan Sheriff
5388bc88bd
Merge "Fix poor network detection setting" into jb-dev
2012-05-31 12:22:30 -07:00
Irfan Sheriff
f0780a7cad
Fix poor network detection setting
...
We used to base this on watchdog being turned on, but it should
be based on whether device is wifi only
Bug: 6576101
Change-Id: Ib5221287e6713c625d39ef986ceb278825fb4895
2012-05-31 11:15:41 -07:00
Uriel Rodriguez
4ccff69e52
am 3ddef8a7
: (-s ours) am c9bd848b
: Merge "BUG 5457035 : Anti-spoofing : DO NOT MERGE" into jb-dev
...
* commit '3ddef8a7f208aa3d2ed889568b3bcb4673dbcdbf':
BUG 5457035 : Anti-spoofing : DO NOT MERGE
2012-05-31 08:49:36 -07:00
Uriel Rodriguez
3ddef8a7f2
am c9bd848b
: Merge "BUG 5457035 : Anti-spoofing : DO NOT MERGE" into jb-dev
...
* commit 'c9bd848b11c126642ec20c67cc03908f1f445bec':
BUG 5457035 : Anti-spoofing : DO NOT MERGE
2012-05-31 08:46:45 -07:00
Uriel Rodriguez
c9bd848b11
Merge "BUG 5457035 : Anti-spoofing : DO NOT MERGE" into jb-dev
2012-05-31 08:44:09 -07:00
satok
f79571a202
am 04b85275
: am 15065213
: Do not show security warning for the system IMEs
...
* commit '04b85275707b5171cd45ce4d7ba1a5cfac084ea8':
Do not show security warning for the system IMEs
2012-05-31 08:05:53 -07:00
satok
04b8527570
am 15065213
: Do not show security warning for the system IMEs
...
* commit '15065213620da656c210f356c1111e7382f5be73':
Do not show security warning for the system IMEs
2012-05-31 08:03:48 -07:00
satok
1506521362
Do not show security warning for the system IMEs
...
Bug: 6587127
Change-Id: I00584fb81cf5b39806c30a801b215a0e9a1e9399
2012-05-31 23:43:37 +09:00
The Android Automerger
0652ff0ce3
merge in jb-release history after reset to jb-dev
2012-05-31 07:05:00 -07:00