95278 Commits

Author SHA1 Message Date
Jim Miller
d6c48847ba Fix whitespace problem and sync with prototype.
Change-Id: I92b26741b84dcccb75783f0f26e6d84d0083b77b
2012-11-01 21:40:47 -07:00
Daniel Sandler
23d7a6e605 PUK support.
Bug: 7413109
Change-Id: I7ccfe79a17fd9b1273bc0ac821ac0e2884ae7ab2
Proto-Id: Ie49c04cf3d373e57ef0bbfd0c59589fe905c8aae
2012-11-02 00:21:07 -04:00
Daniel Sandler
261b18aaec Fix build.
Change-Id: Id7907dc9ab10e2aab07ba3cb02b4a3a27131f4cd
2012-11-01 23:54:03 -04:00
Raph Levien
f58f1b9d41 Revert partial RTL'ization of Editor.setError()
The conversion of the error indication on Editor to RTL-aware was only
partially completed, and was causing bugs such as an error indication
failing to appear when set (bug 7457897).

This patch reverts these changes and just always sets the error drawable
on the right. This fixes the above bug, and also makes the error
drawable position always consistent with the error popup (before, in an
RTL layout direction, the popup would be on the right and the drawable
on the left).

Making the error display fully RTL-aware should be done as future work.

Change-Id: Icaee91210454ed9056e7200520d9275303de02ca
2012-11-01 20:15:53 -07:00
Daniel Sandler
b30ddd99af Merge "SIM PIN support." into jb-mr1-lockscreen-dev 2012-11-01 19:58:23 -07:00
Ed Heyl
7b16d9b18c am fc3d4dbd: am 6ae7e758: am 39912f7f: Merge commit \'87bb019e57eddcedd4aeca180ac36bdf1d42064a\' into jb-mr1-dev
* commit 'fc3d4dbd091ad91307bbba63892f2cee42f97f5f':
  Keyguard sliding challenge - fix overeager touch interception
  Addressing comments in 74bdd21629681528dbe7f3ea363d99c8514e026b.
  Showing message when max attempts are hit in face unlock fixes b/7306168
  Keyguard tablet/portrait fix for HUGE security views
  Cancel camera launch on screen off.
  Fix launcher flash during secure camera transition.
  Updating isShowing during onResume()
  Suppressing FUL after going to backup fixes b/7449820
  Addressing comments for change c4842c11932ea4f60fe7ae09b0a59660207e1587
  Adding a button for expanding the clock screen challenge.
  Accessibility support for the lockscreen  - phone.
  Stripping dead API related to keyguard widgets
  FUL being unsuppressed when screen turns off fixes b/7453702
  Show the keyboard less aggressively.
2012-11-01 19:18:16 -07:00
Ed Heyl
fc3d4dbd09 am 6ae7e758: am 39912f7f: Merge commit \'87bb019e57eddcedd4aeca180ac36bdf1d42064a\' into jb-mr1-dev
* commit '6ae7e75876bbdf7d11e1c78d784f0eeb346e7215':
  Keyguard sliding challenge - fix overeager touch interception
  Addressing comments in 74bdd21629681528dbe7f3ea363d99c8514e026b.
  Showing message when max attempts are hit in face unlock fixes b/7306168
  Keyguard tablet/portrait fix for HUGE security views
  Cancel camera launch on screen off.
  Fix launcher flash during secure camera transition.
  Updating isShowing during onResume()
  Suppressing FUL after going to backup fixes b/7449820
  Addressing comments for change c4842c11932ea4f60fe7ae09b0a59660207e1587
  Adding a button for expanding the clock screen challenge.
  Accessibility support for the lockscreen  - phone.
  Stripping dead API related to keyguard widgets
  FUL being unsuppressed when screen turns off fixes b/7453702
  Show the keyboard less aggressively.
2012-11-01 19:15:46 -07:00
Ed Heyl
6ae7e75876 am 39912f7f: Merge commit \'87bb019e57eddcedd4aeca180ac36bdf1d42064a\' into jb-mr1-dev
* commit '39912f7fcd5bfc4943bac1746c3ff2a9f1d93043':
  Keyguard sliding challenge - fix overeager touch interception
  Addressing comments in 74bdd21629681528dbe7f3ea363d99c8514e026b.
  Showing message when max attempts are hit in face unlock fixes b/7306168
  Keyguard tablet/portrait fix for HUGE security views
  Cancel camera launch on screen off.
  Fix launcher flash during secure camera transition.
  Updating isShowing during onResume()
  Suppressing FUL after going to backup fixes b/7449820
  Addressing comments for change c4842c11932ea4f60fe7ae09b0a59660207e1587
  Adding a button for expanding the clock screen challenge.
  Accessibility support for the lockscreen  - phone.
  Stripping dead API related to keyguard widgets
  FUL being unsuppressed when screen turns off fixes b/7453702
  Show the keyboard less aggressively.
2012-11-01 19:13:04 -07:00
Daniel Sandler
53149e69e9 SIM PIN support.
Bug: 7413109
Change-Id: Icc4157bd869c3661e7291fe8060c82d3f713445c
Proto-Id: I909ff4fdde82f3dc0c7a61d45c522844efcbe882
2012-11-01 22:05:48 -04:00
The Android Automerger
4b22662d95 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-01 19:05:25 -07:00
Michael Jurka
9de90c1c57 Merge "Use clock's widget as the default keyguard widget" into jb-mr1-lockscreen-dev 2012-11-01 18:59:54 -07:00
Michael Jurka
67a871d857 Use clock's widget as the default keyguard widget
Also, if we have no widgets in lockscreen,
reinflate the default widget. If that fails,
inflate the built-in clock (KeyguardStatusView)

Change-Id: I2e90ab0893c993a755700e075e4a8ac5a685e0f2
2012-11-01 18:50:21 -07:00
Jim Miller
324545d7c8 Merge "Add configurable em-dash separator for all concatenated keyguard strings" into jb-mr1-lockscreen-dev 2012-11-01 18:17:51 -07:00
Jim Miller
e9be140771 Add configurable em-dash separator for all concatenated keyguard strings
Fixes bug 7459426

Change-Id: I2e4944f25f3e4e62b734bc57db628f1b3ce263cd
2012-11-01 18:16:37 -07:00
Winson Chung
b1260af2f5 Merge "Cleaning up keyguard persistence threads when the pager is detached. (Bug 7460991)" into jb-mr1-lockscreen-dev 2012-11-01 18:13:01 -07:00
Ed Heyl
10d29e1550 am 39912f7f: Merge commit \'87bb019e57eddcedd4aeca180ac36bdf1d42064a\' into jb-mr1-dev
* commit '39912f7fcd5bfc4943bac1746c3ff2a9f1d93043':
2012-11-01 18:10:32 -07:00
Daniel Sandler
ebbf5eea2b Merge changes Ib3133583,I0262172d into jb-mr1-lockscreen-dev
* changes:
  Show "wrong password" on password screen, not "wrong PIN"
  Restore incorrect-PIN lockouts.
2012-11-01 18:09:14 -07:00
Ed Heyl
39912f7fcd Merge commit '87bb019e57eddcedd4aeca180ac36bdf1d42064a' into jb-mr1-dev 2012-11-01 18:06:35 -07:00
Winson Chung
e72855e670 Cleaning up keyguard persistence threads when the pager is detached. (Bug 7460991)
Change-Id: I28ebbd04d90a1ea2a721c28d3bce7ccea31a33e9
2012-11-01 18:05:52 -07:00
Svetoslav Ganov
a94c3194ff Cannot click on partially visible views in touch exploration.
1. In touch exploration mode the system clicks in the center of the
   accessibility focus rectangle. However, if this rectangle is only
   partially shown on the window or on the screen the system may not
   be able to perform the click, if the accessibility focus center
   is not on the screen, or click on the wrong window, if the access
   focus center is outside of the window.

   This change clips the rectangle to the window bounds which and the
   display bounds. This will ensure no clicks are sent to the wrong
   window and no clicks are sent outside of the screen.

bug:7453839

Change-Id: I79f98971e7ebcbb391c37284467dc76076172c5f
2012-11-01 16:27:05 -07:00
Marco Nelissen
dd1caa0050 Merge "Remove special case in media scanner" 2012-11-01 16:20:24 -07:00
Marco Nelissen
da8fe0faf5 Remove special case in media scanner
The media provider now takes care of case-sensitivity, so there is
no special handling needed when looking up entries in the database.

Change-Id: I2a23c4f1875a8ffea140281572b1e2c90cce60a7
2012-11-01 16:04:32 -07:00
Scott Main
2681faafae docs: explain implicit permissions applied by sdk versions
bug: 7453055

Change-Id: I59ba2de6108b5209ff0db6b084fc0a887c5f2cce
2012-11-01 15:59:22 -07:00
Jeff Brown
a14fb9c273 am 2c996b4b: am 676adb58: am 62831a7b: Merge "Eliminate potential reentrance from unregisterInputChannel." into jb-mr1-dev
* commit '2c996b4b791e5f18e2c6518e8f27d3bc43aa9bc2':
  Eliminate potential reentrance from unregisterInputChannel.
2012-11-01 15:50:17 -07:00
Jeff Brown
2c996b4b79 am 676adb58: am 62831a7b: Merge "Eliminate potential reentrance from unregisterInputChannel." into jb-mr1-dev
* commit '676adb589103e452f7d441c04b3386f30062b919':
  Eliminate potential reentrance from unregisterInputChannel.
2012-11-01 15:47:55 -07:00
Jeff Brown
d2592635c1 am 62831a7b: Merge "Eliminate potential reentrance from unregisterInputChannel." into jb-mr1-dev
* commit '62831a7bd02868316ad1a16dcf13c98896fdbbdc':
  Eliminate potential reentrance from unregisterInputChannel.
2012-11-01 15:46:10 -07:00
Jeff Brown
676adb5891 am 62831a7b: Merge "Eliminate potential reentrance from unregisterInputChannel." into jb-mr1-dev
* commit '62831a7bd02868316ad1a16dcf13c98896fdbbdc':
  Eliminate potential reentrance from unregisterInputChannel.
2012-11-01 15:45:50 -07:00
Scott Main
b274ea641b am 5384dc65: am 7b076cee: am 30fd78e2: am a47776c9: am 2cff3eea: am f19804b5: Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs
* commit '5384dc65b7fc64341afa42114086368222c0a972':
  new dashboard stats for 11/1, platform version only
2012-11-01 15:44:31 -07:00
Jeff Brown
62831a7bd0 Merge "Eliminate potential reentrance from unregisterInputChannel." into jb-mr1-dev 2012-11-01 15:42:33 -07:00
Scott Main
5384dc65b7 am 7b076cee: am 30fd78e2: am a47776c9: am 2cff3eea: am f19804b5: Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs
* commit '7b076ceec4d62aa8d65696f368f16cbf5dbf60e0':
  new dashboard stats for 11/1, platform version only
2012-11-01 15:42:11 -07:00
Scott Main
7b076ceec4 am 30fd78e2: am a47776c9: am 2cff3eea: am f19804b5: Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs
* commit '30fd78e27294cd7104f6589ab10f3f3dd1e65fcc':
  new dashboard stats for 11/1, platform version only
2012-11-01 15:40:03 -07:00
Scott Main
ed7a026269 am 30fd78e2: am a47776c9: am 2cff3eea: am f19804b5: Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs
* commit '30fd78e27294cd7104f6589ab10f3f3dd1e65fcc':
  new dashboard stats for 11/1, platform version only
2012-11-01 15:39:24 -07:00
Scott Main
30fd78e272 am a47776c9: am 2cff3eea: am f19804b5: Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs
* commit 'a47776c9f889242b3bcff0ff2d113d50da342262':
  new dashboard stats for 11/1, platform version only
2012-11-01 15:37:31 -07:00
Victoria Lease
0021f7badb Merge "Revert "Update the location tracker test app"" 2012-11-01 15:36:34 -07:00
Scott Main
a47776c9f8 am 2cff3eea: am f19804b5: Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs
* commit '2cff3eeaeb419fcdfc7307c2c52a653483c76ddb':
  new dashboard stats for 11/1, platform version only
2012-11-01 15:34:42 -07:00
Laurent Tu
870d738ad7 am 6ad873d4: am e730010e: am 7ab7f538: Hide new location APIs and undeprecate old ones
* commit '6ad873d4a642f823addf519ba252f188424431fa':
  Hide new location APIs and undeprecate old ones
2012-11-01 15:33:20 -07:00
Scott Main
2cff3eeaeb am f19804b5: Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs
* commit 'f19804b5e994d183e6f6eeb512f74f2380ffd533':
  new dashboard stats for 11/1, platform version only
2012-11-01 15:31:53 -07:00
Laurent Tu
6ad873d4a6 am e730010e: am 7ab7f538: Hide new location APIs and undeprecate old ones
* commit 'e730010edc460384298a2833d82c5e4dc1e75756':
  Hide new location APIs and undeprecate old ones
2012-11-01 15:30:08 -07:00
Scott Main
f19804b5e9 Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs 2012-11-01 15:28:34 -07:00
Laurent Tu
e730010edc am 7ab7f538: Hide new location APIs and undeprecate old ones
* commit '7ab7f538924371a9dd4be7a27a6ae3b4c04b301c':
  Hide new location APIs and undeprecate old ones
2012-11-01 15:28:08 -07:00
Laurent Tu
82c292e078 am 7ab7f538: Hide new location APIs and undeprecate old ones
* commit '7ab7f538924371a9dd4be7a27a6ae3b4c04b301c':
  Hide new location APIs and undeprecate old ones
2012-11-01 15:27:23 -07:00
Scott Main
500d05e573 am 02acfc79: am 6a66cfce: am 465c3753: Merge "docs: misc changes for new manifest attributes, including fix for bug 7443821 bug 7442263" into jb-mr1-dev
* commit '02acfc79c18bf5bbe5e6456d8767c53a3b8de6eb':
  docs: misc changes for new manifest attributes, including fix for bug 7443821 bug 7442263
2012-11-01 15:23:58 -07:00
Laurent Tu
7ab7f53892 Hide new location APIs and undeprecate old ones
Hide all new location APIs related to LocationRequest/Geofence and
undeprecate all deprecated APIs consequently to the LocationRequest and
Geofence introduction. Also introduce LocationRequestUnbundled for
LocationProviders to use.

Change-Id: I5b116c7d342041f45b341c88a4b6813571118018
2012-11-01 15:22:22 -07:00
Dianne Hackborn
203a59866a am 8b91e6ba: am f1db87cb: am b9372de0: Merge "More debugging for issue #7343200 Fails to show wallpaper in the..." into jb-mr1-dev
* commit '8b91e6bab8ac21bba17efd0cad3a512790132846':
  More debugging for issue #7343200 Fails to show wallpaper in the...
2012-11-01 15:21:10 -07:00
Scott Main
02acfc79c1 am 6a66cfce: am 465c3753: Merge "docs: misc changes for new manifest attributes, including fix for bug 7443821 bug 7442263" into jb-mr1-dev
* commit '6a66cfce8bd564664ea77d9204df91e98af2a2f1':
  docs: misc changes for new manifest attributes, including fix for bug 7443821 bug 7442263
2012-11-01 15:20:47 -07:00
Victoria Lease
e74c546551 am 1b414c7e: am 07fcfef2: am 1e701979: Merge "fix NLP for COARSE applications, build FLP with SDK" into jb-mr1-dev
* commit '1b414c7e8c64048b46f358a5fb0b43c138f8204c':
  fix NLP for COARSE applications, build FLP with SDK
2012-11-01 15:19:13 -07:00
Svetoslav Ganov
cf8384abfc am 49c2756b: am b3ec0639: am 7e1a45d8: Merge "Fix accessibility API injection." into jb-mr1-dev
* commit '49c2756b1c4996e9ebcc70c89095f436790b5469':
  Fix accessibility API injection.
2012-11-01 15:19:06 -07:00
Scott Main
f3e08f3d2c am 465c3753: Merge "docs: misc changes for new manifest attributes, including fix for bug 7443821 bug 7442263" into jb-mr1-dev
* commit '465c37533ac1fb76d76b062452ae19afb84aab0a':
  docs: misc changes for new manifest attributes, including fix for bug 7443821 bug 7442263
2012-11-01 15:18:06 -07:00
Dianne Hackborn
8b91e6bab8 am f1db87cb: am b9372de0: Merge "More debugging for issue #7343200 Fails to show wallpaper in the..." into jb-mr1-dev
* commit 'f1db87cb163049698e6f336fbf1447714c966443':
  More debugging for issue #7343200 Fails to show wallpaper in the...
2012-11-01 15:17:49 -07:00
Scott Main
6a66cfce8b am 465c3753: Merge "docs: misc changes for new manifest attributes, including fix for bug 7443821 bug 7442263" into jb-mr1-dev
* commit '465c37533ac1fb76d76b062452ae19afb84aab0a':
  docs: misc changes for new manifest attributes, including fix for bug 7443821 bug 7442263
2012-11-01 15:17:44 -07:00