Commit Graph

3273 Commits

Author SHA1 Message Date
Uriel Rodriguez
c9bd848b11 Merge "BUG 5457035 : Anti-spoofing : DO NOT MERGE" into jb-dev 2012-05-31 08:44:09 -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
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
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
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
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
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
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
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
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
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
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
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
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
Vikram Aggarwal
bccd90e6ba am ff78bf72: Merge "Show keyboard selectively, do not listen on MCC/MNC changes, show text to user." into jb-dev
* commit 'ff78bf7280b2f435bf09e0df0f252506b1c6af61':
  Show keyboard selectively, do not listen on MCC/MNC changes, show text to user.
2012-05-22 14:52:40 -07:00
Vikram Aggarwal
ff78bf7280 Merge "Show keyboard selectively, do not listen on MCC/MNC changes, show text to user." into jb-dev 2012-05-22 14:50:48 -07:00
Vikram Aggarwal
f576dd6c9f Show keyboard selectively, do not listen on MCC/MNC changes, show text to user.
Fix b/6531158 (Stop showing the keyboard)

Fix b/6532201 (Stop removing the text view, and prompt the user with a message)

Fix b/6155075 (Stop listening to MCC/MNC changes)

Change-Id: Ibf8414fe57bdd0acf6c20f3194c52b168b9292c6
2012-05-22 14:37:19 -07:00
Andrew Flynn
f89dc7c93a am be4a0325: Merge "Update WPS Dialog" into jb-dev
* commit 'be4a032581ae6dfb41662486085e64052d085314':
  Update WPS Dialog
2012-05-22 11:41:21 -07:00
Andrew Flynn
2e39ebfeaf Update WPS Dialog
- Remove title
- Change description text
- Add WPS icon

Bug: 6457246
Change-Id: Icd37261dd3ce920b3bed359ed5232bdc018916fc
2012-05-22 11:22:02 -07:00
Jean-Baptiste Queru
1a47dff3ce Merge "Remove title bar background drawable from running app detail view" 2012-05-22 07:48:41 -07:00
John Spurlock
523d5a6e04 Settings: "Rotation lock" retains existing orientation.
Enabling "Rotation lock" when in landscape will stay in landscape
instead of forcing to portrait.

Bug: 6481542
Change-Id: Ide6171437a207f97a8fc3123ad8b2fe27323336f
2012-05-22 09:51:02 -04:00
Svetoslav Ganov
fb59d66a4e am 8d43aeae: Merge "Updating the checkbox state to match the title." into jb-dev
* commit '8d43aeae0347435a03e4007eef5fce578ec50184':
  Updating the checkbox state to match the title.
2012-05-21 14:12:43 -07:00
Svetoslav Ganov
8d43aeae03 Merge "Updating the checkbox state to match the title." into jb-dev 2012-05-21 14:09:27 -07:00
Jeff Brown
0ee87ab22a am 766b2861: Add UI to select multiple keyboard layouts.
* commit '766b286187d02b3da6e0142376a4478072f30a16':
  Add UI to select multiple keyboard layouts.
2012-05-20 21:53:26 -07:00
Jeff Brown
766b286187 Add UI to select multiple keyboard layouts.
Bug: 6405203
Change-Id: I27ca4630aebcb39b83298d37d8fb3f4ef0080317
2012-05-20 14:56:42 -07:00
Svetoslav Ganov
2121f097c0 Updating the checkbox state to match the title.
1. Now the the setting is names lock screen rotation
   which is the opposite as it was before so this
   patch reverses the checkbox state.

bug:6507335

Change-Id: Ic0aab21fa70871f64e37ac05f7917d69f9c0a0df
2012-05-18 18:00:31 -07:00
Svetoslav Ganov
c19be29cd7 am fc16237d: Merge "Removed Accessibility tutorial and orphaned resources." into jb-dev
* commit 'fc16237d5debc7375be1d485e510df2156d8da0f':
  Removed Accessibility tutorial and orphaned resources.
2012-05-18 15:59:23 -07:00
Irfan Sheriff
41f88da823 am ee7589c0: Merge "Fix p2p settings crash" into jb-dev
* commit 'ee7589c02ab2cf4a4169531df54595f81f0d88a0':
  Fix p2p settings crash
2012-05-18 15:59:22 -07:00
Svetoslav Ganov
fc16237d5d Merge "Removed Accessibility tutorial and orphaned resources." into jb-dev 2012-05-18 15:21:23 -07:00