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
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
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
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
15a279231f
Fix crash when accessibility is on
...
Bug: 6600699
Change-Id: I9eb8b9871d1368bd7508873951d5719e1f2ba826
2012-06-04 10:22:43 -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
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
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
Uriel Rodriguez
5c489be89c
BUG 5457035 : Anti-spoofing : DO NOT MERGE
...
Squashed commit of the following:
commit 060b9daf5fe3c45573a13a149bf98f4fa1e6a46f
Author: Danielle Millett <dmillett@google.com >
Date: Wed May 30 15:50:03 2012 -0400
Added head turn option for Face Unlock.
In security settings there is an option for head turn and it shows the current
status (on/off). Clicking on this goes to another screen that describes the
feature and allows the user to it on/off.
Since the head turn option goes to a different screen instead of using a check box,
this change also rips out the rest of the code for the old liveliness checkbox.
Change-Id: I197af51084f3e751081fa159dadd6c2c80840d1e
Change-Id: I67c8acd49316b49771a0bb97b4a5fbd5a1c13262
2012-05-30 19:55:12 -04:00
Jeff Brown
1bfcc398f5
am 6e0902b4
: am caaa850f
: Merge "Fix comparison of device source bits." into jb-dev
...
* commit '6e0902b43e86e7a25fdea1ae1b979ca091fc1a17':
Fix comparison of device source bits.
2012-05-30 15:12:20 -07:00
Jeff Brown
6e0902b43e
am caaa850f
: Merge "Fix comparison of device source bits." into jb-dev
...
* commit 'caaa850ffb143edd827cf2a9b9e49b37e9aa777d':
Fix comparison of device source bits.
2012-05-30 15:07:05 -07:00
Jeff Brown
caaa850ffb
Merge "Fix comparison of device source bits." into jb-dev
2012-05-30 15:00:50 -07:00
Jeff Brown
bf677f48b7
Fix comparison of device source bits.
...
Bug: 6576743
Change-Id: I123307defc32a84a965590fbded95c6997260675
2012-05-30 14:33:16 -07:00
Danielle Millett
d35705f1dd
Added head turn option for Face Unlock.
...
In security settings there is an option for head turn and it shows the current
status (on/off). Clicking on this goes to another screen that describes the
feature and allows the user to it on/off.
Since the head turn option goes to a different screen instead of using a check box,
this change also rips out the rest of the code for the old liveliness checkbox.
Change-Id: I197af51084f3e751081fa159dadd6c2c80840d1e
2012-05-30 16:56:23 -04:00
Svetoslav Ganov
ed312aa199
am d3c16b49
: am a99d1125
: Merge "Lock screen rotation accessibility preference not updated." into jb-dev
...
* commit 'd3c16b49fb08608af6431379513d6605eab32718':
Lock screen rotation accessibility preference not updated.
2012-05-29 20:06:30 -07:00
Svetoslav Ganov
d3c16b49fb
am a99d1125
: Merge "Lock screen rotation accessibility preference not updated." into jb-dev
...
* commit 'a99d1125e2ede99391e8cff6c4bee179fdc81d06':
Lock screen rotation accessibility preference not updated.
2012-05-29 20:04:43 -07:00
Svetoslav Ganov
a99d1125e2
Merge "Lock screen rotation accessibility preference not updated." into jb-dev
2012-05-29 20:02:50 -07:00
Dianne Hackborn
81b15b792a
am a9dab4ff
: am 10be9eaa
: Merge "Fix issue where Manage Apps would not start on correct page." into jb-dev
...
* commit 'a9dab4ff30d08eec08581b93abba997fbd994b84':
Fix issue where Manage Apps would not start on correct page.
2012-05-29 19:16:33 -07:00
Dianne Hackborn
a9dab4ff30
am 10be9eaa
: Merge "Fix issue where Manage Apps would not start on correct page." into jb-dev
...
* commit '10be9eaa812b38d4ad5d40afaeb05dfdf7d448b1':
Fix issue where Manage Apps would not start on correct page.
2012-05-29 19:13:56 -07:00
Svetoslav Ganov
3aa58b0f35
Lock screen rotation accessibility preference not updated.
...
1. If the lock screen rotation preference is changed from the
status bar the checkbox in the accessibility settings was
not updated.
bug:6562028
Change-Id: I353e3ad59374ad207297d2a6682e50ed07df820c
2012-05-29 17:36:51 -07:00
Dianne Hackborn
13ba7e6556
Fix issue where Manage Apps would not start on correct page.
...
We weren't setting the correct initial page in the view
pager.
Change-Id: I68846505a4f23547e9b09e4bc06e3d455ae9556f
2012-05-29 17:21:05 -07:00
Jeff Sharkey
3e87ee0261
am 27143c0b
: am 16bf0e0e
: Merge "Surface metered networks as "Mobile hotspots."" into jb-dev
...
* commit '27143c0b54638f29dd0aa0095ff2505e3adac827':
Surface metered networks as "Mobile hotspots."
2012-05-29 15:04:52 -07:00
Jeff Sharkey
27143c0b54
am 16bf0e0e
: Merge "Surface metered networks as "Mobile hotspots."" into jb-dev
...
* commit '16bf0e0ec7dbd606ea5a5c8a1a9653f1cbb6d9b6':
Surface metered networks as "Mobile hotspots."
2012-05-29 15:03:13 -07:00
Jeff Sharkey
16bf0e0ec7
Merge "Surface metered networks as "Mobile hotspots."" into jb-dev
2012-05-29 15:01:33 -07:00
Amith Yamasani
96449c400e
am baf9b5fb
: am 35ff41b5
: Merge "Retain text in Rename Device dialog." into jb-dev
...
* commit 'baf9b5fb05f046d3dea8f6c9b7334867a0c57fd8':
Retain text in Rename Device dialog.
2012-05-29 14:18:46 -07:00
Amith Yamasani
baf9b5fb05
am 35ff41b5
: Merge "Retain text in Rename Device dialog." into jb-dev
...
* commit '35ff41b5f7928acaa5112051f519e3333106d239':
Retain text in Rename Device dialog.
2012-05-29 14:16:15 -07:00
Amith Yamasani
5864701197
Retain text in Rename Device dialog.
...
Also, show the current device name in the dialog, if available.
Bug: 6508967
Change-Id: I34d420e197796352aeab74121bdee55c2d2854d7
2012-05-29 13:19:26 -07:00
Jeff Sharkey
d878909980
Surface metered networks as "Mobile hotspots."
...
String changes to give clearer definition of metered networks, and
remove metered control for mobile network. Also fix NPE when testing
hasEthernet() before session is ready.
Bug: 6494976
Change-Id: Ia55ca3362a05977b9f21ab41eb10bbc738e29620
2012-05-29 11:03:55 -07:00
Amith Yamasani
0ab861f054
am f007430e
: am a5ac7ce5
: Merge "Don\'t show SIM LOCK settings if there\'s no Icc card." into jb-dev
...
* commit 'f007430ed5aa1e1218caae9de6dded511c5d761f':
Don't show SIM LOCK settings if there's no Icc card.
2012-05-25 10:21:56 -07:00
Amith Yamasani
f007430ed5
am a5ac7ce5
: Merge "Don\'t show SIM LOCK settings if there\'s no Icc card." into jb-dev
...
* commit 'a5ac7ce5149ea3f6f4b27259cd9fd4a23b7ac47a':
Don't show SIM LOCK settings if there's no Icc card.
2012-05-25 10:16:49 -07:00
Amith Yamasani
a5ac7ce514
Merge "Don't show SIM LOCK settings if there's no Icc card." into jb-dev
2012-05-25 10:14:58 -07:00
Amith Yamasani
484aeb5fd7
am 929f04e2
: am 8ad7abbc
: Merge "Corrected return value for updatePreferenceToSpecificActivityOrRemove method"
...
* commit '929f04e28e7910eae04871e8ea3c7126b100b393':
Corrected return value for updatePreferenceToSpecificActivityOrRemove method
2012-05-25 07:35:57 -07:00