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
Amith Yamasani
929f04e28e
am 8ad7abbc
: Merge "Corrected return value for updatePreferenceToSpecificActivityOrRemove method"
...
* commit '8ad7abbcf64076b4df8ff3e724815c2e7940be8e':
Corrected return value for updatePreferenceToSpecificActivityOrRemove method
2012-05-25 07:19:56 -07:00
Fabrice Di Meglio
beebce5b57
am 4e8150c4
: am 22af594c
: Merge "Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)" into jb-dev
...
* commit '4e8150c42c08d144faa1ade09282f7f45be9636f':
Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)
2012-05-24 11:42:55 -07:00
Fabrice Di Meglio
4e8150c42c
am 22af594c
: Merge "Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)" into jb-dev
...
* commit '22af594c04045adbb9fe6a2cb7a69e40afd655b2':
Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)
2012-05-24 11:40:30 -07:00
Fabrice Di Meglio
22af594c04
Merge "Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)" into jb-dev
2012-05-24 11:37:07 -07:00
Fabrice Di Meglio
c18cc43b28
Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)
...
- use an ID instead of a String for StorageVolume description
- use this ID for getting the correct localized version of the description string
Change-Id: If66868ecc84297322cb9a3f0b2d834f79dd019ca
2012-05-24 11:35:09 -07:00
Jeff Sharkey
1f0c0516d2
am a3a40f72
: am a655a2f4
: Merge "Only show ethernet when traffic has occurred." into jb-dev
...
* commit 'a3a40f724e0e291edc9d18d1d5e9fdfcb8e2a469':
Only show ethernet when traffic has occurred.
2012-05-24 11:31:13 -07:00
Jeff Sharkey
a3a40f724e
am a655a2f4
: Merge "Only show ethernet when traffic has occurred." into jb-dev
...
* commit 'a655a2f48e61dd44ee9f14585e0ee89202412158':
Only show ethernet when traffic has occurred.
2012-05-24 11:28:17 -07:00
Jeff Sharkey
a655a2f48e
Merge "Only show ethernet when traffic has occurred." into jb-dev
2012-05-24 11:25:55 -07:00
Jeff Sharkey
b67c4a8e73
Only show ethernet when traffic has occurred.
...
Bug: 6231172
Change-Id: I24dfd5f998b4e96681813c9fd7ce1ed74cf30eb5
2012-05-24 11:01:29 -07:00
Amith Yamasani
8ad7abbcf6
Merge "Corrected return value for updatePreferenceToSpecificActivityOrRemove method"
2012-05-24 09:48:21 -07:00
Amith Yamasani
5c68e12493
Don't show SIM LOCK settings if there's no Icc card.
...
Bug: 6525359
Change-Id: I7bf2a1799ca3032a5dbfa15320d862195b9659f7
2012-05-23 17:20:01 -07:00
Amith Yamasani
b809fbf61d
am 9e184326
: am 6e9e5195
: Merge "Fix crash when removing an account." into jb-dev
...
* commit '9e184326640c448b48b31799d1d55d8d3b160483':
Fix crash when removing an account.
2012-05-23 14:39:10 -07:00
Amith Yamasani
9e18432664
am 6e9e5195
: Merge "Fix crash when removing an account." into jb-dev
...
* commit '6e9e519560a50d735ea3c2ddd01d9b7a9cc1d89b':
Fix crash when removing an account.
2012-05-23 14:36:50 -07:00
Amith Yamasani
6e9e519560
Merge "Fix crash when removing an account." into jb-dev
2012-05-23 14:34:15 -07:00
Amith Yamasani
e88be4f620
Fix crash when removing an account.
...
Bug: 6494527
Change-Id: I9ab3b54ac4e4d679fd9ec22ab438b9e1ea0be2b1
2012-05-23 14:13:13 -07:00
Michael Kolb
068d1fcdbd
am 34382357
: am 9d5a6eb4
: Match setup wizard wifi settings with new wireframes
...
* commit '34382357f5fa69e5ce09dce4fec44a2c220e269b':
Match setup wizard wifi settings with new wireframes
2012-05-23 11:34:23 -07:00
Michael Kolb
34382357f5
am 9d5a6eb4
: Match setup wizard wifi settings with new wireframes
...
* commit '9d5a6eb4d7ec662e666dc5dfe1506616d5b59341':
Match setup wizard wifi settings with new wireframes
2012-05-23 11:31:51 -07:00
Michael Kolb
9d5a6eb4d7
Match setup wizard wifi settings with new wireframes
...
Bug: 6521472
Change-Id: I159d8a98327ad775b2c5ccfc7380d60d62b54dad
2012-05-23 11:19:47 -07:00
John Spurlock
be378a76b2
am 4c63ec42
: am 3a821e86
: Merge "Settings: "Rotation lock" retains existing orientation." into jb-dev
...
* commit '4c63ec42c156645bc67172180b7fc8b4c75182bd':
Settings: "Rotation lock" retains existing orientation.
2012-05-23 05:41:29 -07:00
John Spurlock
4c63ec42c1
am 3a821e86
: Merge "Settings: "Rotation lock" retains existing orientation." into jb-dev
...
* commit '3a821e86f5851cbce1185a481acb88a0f33c98ae':
Settings: "Rotation lock" retains existing orientation.
2012-05-23 05:39:01 -07:00
John Spurlock
3a821e86f5
Merge "Settings: "Rotation lock" retains existing orientation." into jb-dev
2012-05-23 05:29:56 -07:00