drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,291 Commits 1 Branch 0 Tags
Commit Graph

87291 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
cc5c168e33 am 37238e5a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '37238e5a4e10c5c5439f6864dd19049a5544e01a':
  Import translations. DO NOT MERGE
 2012-11-02 09:12:15 -07:00
Baligh Uddin
37238e5a4e Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-11-02 09:08:57 -07:00
John Spurlock
1ec464679f Block swipe up gesture if challenge non-interactive. 
Change-Id: I0f9ba918c072261614011cd675e417e54296366f
 2012-11-02 11:25:35 -04:00
Baligh Uddin
79417e8912 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 2012-11-02 08:13:23 -07:00
John Spurlock
78a8f126a9 Properly disable challenge handle. 
Bug:7464304
Change-Id: Ib69ccc66bbd348fc3ad17e5097522a0976838daa
 2012-11-02 11:07:00 -04:00
John Spurlock
a9b468248d Disable disable back if using an alternate back icon. 
This enables the IME down chevron even if back would otherwise
be disabled.

Bug:7453424
Change-Id: Ia007df256124c617b86983bfe6958f790bd6a544
 2012-11-02 10:42:39 -04:00
John Spurlock
bb5c941149 Disable security handle when swiping into camera widget. 
Bug:7444313
Change-Id: I3eb268a41bc8b8a4323e55577a775c5ab3cef10d
 2012-11-02 09:00:04 -04:00
Baligh Uddin
e506ae188b Import translations. DO NOT MERGE 
Change-Id: Ib2e0bbc19617066ac205c54676eddb8c71e71ae8
Auto-generated-cl: translation import
 2012-11-02 00:15:43 -07:00
Adam Cohen
dd8ac785e3 Merge "Fix small issue with previous CL" into jb-mr1-lockscreen-dev 2012-11-02 00:15:10 -07:00
Baligh Uddin
d7ad778914 Import translations. DO NOT MERGE 
Change-Id: I663c9a6379eb664e31cdb5984c55cf70a6c99999
Auto-generated-cl: translation import
 2012-11-02 00:14:48 -07:00
Adam Cohen
86006bb8a5 Fix small issue with previous CL 
Change-Id: Id5260413898eef61447f88b3dd82d6181e9bd492
 2012-11-02 00:13:24 -07:00
Adam Cohen
2df294eb39 Merge "Widget size policy, size callbacks" into jb-mr1-lockscreen-dev 2012-11-01 23:49:07 -07:00
Winson Chung
d6fe75af31 am 98b930ce: Cleaning up keyguard persistence threads when the pager is detached. (Bug 7460991) 
* commit '98b930ce4ca4258fe1d6e9df0053f6883517a241':
  Cleaning up keyguard persistence threads when the pager is detached. (Bug 7460991)
 2012-11-01 23:39:06 -07:00
Winson Chung
98b930ce4c Cleaning up keyguard persistence threads when the pager is detached. (Bug 7460991) 
Change-Id: I28ebbd04d90a1ea2a721c28d3bce7ccea31a33e9
 2012-11-01 23:34:47 -07:00
Adam Cohen
4ddcd573dd Widget size policy, size callbacks 
-> vertically resizable widgets behave are sized to fill
-> non-vertically resizable widgets use the small size all the time
-> providing size call-backs. ensuring that we don't send excessive /
   incorrect size callbacks. These are expensive. Had to clean things
   up to ensure we only send the truth, and not bounce around.

Change-Id: I8038de01096906526e2622c6f1cd24c171e3a4ec
 2012-11-01 23:32:55 -07:00
Brian Colonna
e732421a41 Merge "Only suppressing FUL on boot if selected fixes b/7338965" into jb-mr1-lockscreen-dev 2012-11-01 22:24:39 -07:00
Jim Miller
aaf9b11e62 Don't show security method until we actually return from the camera 
This was causing problems because face unlock and the camera app are
competing for the camera.

The solution is to not show the security method until we get back to
keyguard.

Change-Id: I179548e4ee6aa0ab5dad545842ddeb14bc3b58e1
 2012-11-01 22:11:42 -07:00
Daniel Sandler
52070c1a71 Merge "PUK support." into jb-mr1-lockscreen-dev 2012-11-01 21:44:32 -07:00
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
Daniel Sandler
b30ddd99af Merge "SIM PIN support." into jb-mr1-lockscreen-dev 2012-11-01 19:58:23 -07:00
Daniel Sandler
53149e69e9 SIM PIN support. 
Bug: 7413109
Change-Id: Icc4157bd869c3661e7291fe8060c82d3f713445c
Proto-Id: I909ff4fdde82f3dc0c7a61d45c522844efcbe882
 2012-11-01 22:05:48 -04: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
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
62831a7bd0 Merge "Eliminate potential reentrance from unregisterInputChannel." into jb-mr1-dev 2012-11-01 15:42:33 -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
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
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
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
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
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
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
872e3d36ee am b9372de0: Merge "More debugging for issue #7343200 Fails to show wallpaper in the..." into jb-mr1-dev 
* commit 'b9372de07d3329928f28104bb997aab57237504c':
  More debugging for issue #7343200 Fails to show wallpaper in the...
 2012-11-01 15:16:27 -07:00
Scott Main
74474e75e0 new dashboard stats for 11/1, platform version only 
Change-Id: If6e9633170793e45abfdc94ef215f45edd64e547
 2012-11-01 15:15:39 -07:00
Scott Main
465c37533a Merge "docs: misc changes for new manifest attributes, including fix for bug 7443821 bug 7442263" into jb-mr1-dev 2012-11-01 15:14:25 -07:00
Adam Cohen
f19cce180f Merge "Revert "Pushing state persistence to a background thread"" into jb-mr1-lockscreen-dev 2012-11-01 15:12:54 -07:00
Dianne Hackborn
b9372de07d Merge "More debugging for issue #7343200 Fails to show wallpaper in the..." into jb-mr1-dev 2012-11-01 15:12:23 -07:00
Adam Cohen
b6f83374cc Revert "Pushing state persistence to a background thread" 
This reverts commit 039206a9b40d2188eb735f56ee51f131555c9dd3

Change-Id: I30fa07bf55a489562831b6334768b28bed638ef8
 2012-11-01 15:12:07 -07:00
Victoria Lease
64e591934c am 1e701979: Merge "fix NLP for COARSE applications, build FLP with SDK" into jb-mr1-dev 
* commit '1e701979a031f42ee0fa0a07b151f6c61314e2e4':
  fix NLP for COARSE applications, build FLP with SDK
 2012-11-01 15:10:53 -07:00
Dianne Hackborn
529e744d31 More debugging for issue #7343200 Fails to show wallpaper in the... 
...background for lockscreen sometimes and remains black / blank

There was a bunch of state not being put into the dumpsys output.
In particular, the current wallpaper target of the WindowAnimator
was not being included.  I think the problem is that these targets
are not being updated from the main window manager state at some
point where they need to be.

Change-Id: Ic795047f6aea9b6f72d5550bccc9f8d76c6ecb67
 2012-11-01 15:09:10 -07:00