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

92029 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
272707a2da am 0239d208: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
* commit '0239d208808194991b223b10823a62a0d91c94f3':
 2012-10-15 07:42:54 -07:00
The Android Open Source Project
0239d20880 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
Change-Id: I8cfdea0a54b2a687eff159f9e5cd7706ccdb290e
 2012-10-15 07:38:41 -07:00
The Android Automerger
6cf2a24ece merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-15 06:59:20 -07:00
Fergus Henderson
3794a3cad8 Merge "SynthesisCallback documentation update" 2012-10-15 05:18:06 -07:00
Przemyslaw Szczepaniak
a6e16b86b9 SynthesisCallback documentation update 
Clarification about when android.speech.tts.SynthesisCallback.done()
should be called.

Bug: 2481825
Change-Id: Ic781a6facc2d9acb3f06afb952fbac0b494c56cf
 2012-10-15 13:07:11 +01:00
Jim Miller
41d7372a72 am c866b801: am 1deaf3c7: am 87d57952: Minor layout tweaks and bug fix in keyguard 
* commit 'c866b8013a6dd5e7c95f8a197170904f753033ea':
  Minor layout tweaks and bug fix in keyguard
 2012-10-15 02:35:31 -07:00
Jim Miller
c866b8013a am 1deaf3c7: am 87d57952: Minor layout tweaks and bug fix in keyguard 
* commit '1deaf3c710c54a23ace35e1f5c1718591133b681':
  Minor layout tweaks and bug fix in keyguard
 2012-10-15 02:32:48 -07:00
Jim Miller
1deaf3c710 am 87d57952: Minor layout tweaks and bug fix in keyguard 
* commit '87d57952af662a94637c1519b2189e22456af2db':
  Minor layout tweaks and bug fix in keyguard
 2012-10-15 02:31:04 -07:00
Jim Miller
87d57952af Minor layout tweaks and bug fix in keyguard 
- fix wrong string in SIM PUK unlock
- use buttonBar style for "emergency" and "forgot pattern" buttons

Bug 7341237

Change-Id: Id5593b54c345e3f869b6febc8554da01e7cb319e
 2012-10-15 02:10:57 -07:00
Jim Miller
f2ce7735cb am bd95bd21: am 63b977de: am 14bb25a3: Merge "Fixing issues with pattern recovery / account view (issue 7341237):" into jb-mr1-dev 
* commit 'bd95bd212a69be59f74b9cc5f3c76617a4a21833':
  Fixing issues with pattern recovery / account view (issue 7341237):
 2012-10-15 01:04:41 -07:00
Jim Miller
bd95bd212a am 63b977de: am 14bb25a3: Merge "Fixing issues with pattern recovery / account view (issue 7341237):" into jb-mr1-dev 
* commit '63b977de7e7cba17ba8abd78f7750d4bc56c8c45':
  Fixing issues with pattern recovery / account view (issue 7341237):
 2012-10-15 01:02:39 -07:00
Jim Miller
63b977de7e am 14bb25a3: Merge "Fixing issues with pattern recovery / account view (issue 7341237):" into jb-mr1-dev 
* commit '14bb25a3864d38da8f2b73180db649039558a37b':
  Fixing issues with pattern recovery / account view (issue 7341237):
 2012-10-15 00:59:54 -07:00
Jim Miller
14bb25a386 Merge "Fixing issues with pattern recovery / account view (issue 7341237):" into jb-mr1-dev 2012-10-15 00:57:49 -07:00
Irfan Sheriff
54d706cf32 am a100087c: am 2afe0611: am e6e81004: Merge "Cleanup on async disconnect and finalize" into jb-mr1-dev 
* commit 'a100087c5b803c2dd261598b4fdb9219f49798a2':
  Cleanup on async disconnect and finalize
 2012-10-14 23:06:02 -07:00
Irfan Sheriff
a100087c5b am 2afe0611: am e6e81004: Merge "Cleanup on async disconnect and finalize" into jb-mr1-dev 
* commit '2afe06114c3eaa6aef0a442275392d44a43b64f5':
  Cleanup on async disconnect and finalize
 2012-10-14 23:03:20 -07:00
Irfan Sheriff
2afe06114c am e6e81004: Merge "Cleanup on async disconnect and finalize" into jb-mr1-dev 
* commit 'e6e810048ea85e48ec74f6a9e0b18f5dd3d475e1':
  Cleanup on async disconnect and finalize
 2012-10-14 23:01:09 -07:00
Irfan Sheriff
e6e810048e Merge "Cleanup on async disconnect and finalize" into jb-mr1-dev 2012-10-14 22:58:49 -07:00
Adam Cohen
6f131416ba Fixing issues with pattern recovery / account view (issue 7341237): 
-> Recovery button should only appear if account present
-> Recovery button should appear at bottom
-> Account view should have emergency call button
-> Account view should not show the clock / status area

Change-Id: Id12e8219f3fc6ecb14e82c5ec6ea4b3e28ed772d
 2012-10-14 21:25:08 -07:00
Adam Cohen
fc9a847420 am 401c856f: am 18e9575c: am 6dbf8610: Fix for NPE with pattern recovery (issue 7341237) 
* commit '401c856f9f1b83766d965e778b053becf7f30a1d':
  Fix for NPE with pattern recovery (issue 7341237)
 2012-10-14 17:47:07 -07:00
Adam Cohen
401c856f9f am 18e9575c: am 6dbf8610: Fix for NPE with pattern recovery (issue 7341237) 
* commit '18e9575cad3bfc5c764396a359f9c2f5193e96a9':
  Fix for NPE with pattern recovery (issue 7341237)
 2012-10-14 17:45:05 -07:00
Adam Cohen
18e9575cad am 6dbf8610: Fix for NPE with pattern recovery (issue 7341237) 
* commit '6dbf8610e94c1b41e0124577101d6369fd204ad3':
  Fix for NPE with pattern recovery (issue 7341237)
 2012-10-14 17:43:28 -07:00
Adam Cohen
6dbf8610e9 Fix for NPE with pattern recovery (issue 7341237) 
-> Dealt with this NPE, and guarded against all related NPEs (which probably
   can't happen, but given the stakes of a system crash, this is safer).

Change-Id: I3c207839ae0279033b6f3dad791d710b19415439
 2012-10-14 17:26:31 -07:00
Jim Miller
14a1bcb43d am 0450a949: am 1ea95455: am 66e93076: Merge "Disable security view transitions in keyguard" into jb-mr1-dev 
* commit '0450a9499988ba607f3cd8c55536f60093dfc86e':
  Disable security view transitions in keyguard
 2012-10-14 12:16:06 -07:00
Jim Miller
0450a94999 am 1ea95455: am 66e93076: Merge "Disable security view transitions in keyguard" into jb-mr1-dev 
* commit '1ea9545586d851999e68e823e1d4e5d5e76ee98f':
  Disable security view transitions in keyguard
 2012-10-14 12:13:32 -07:00
Jim Miller
1ea9545586 am 66e93076: Merge "Disable security view transitions in keyguard" into jb-mr1-dev 
* commit '66e9307645449c50a5a53140cc408c114f5b78fe':
  Disable security view transitions in keyguard
 2012-10-14 12:11:37 -07:00
Jim Miller
66e9307645 Merge "Disable security view transitions in keyguard" into jb-mr1-dev 2012-10-14 12:08:45 -07:00
Craig Mautner
b429480c5e am 3db86b6f: am f93afcde: am 27c0773c: Merge "Fix wallpaper not updating on initial boot." into jb-mr1-dev 
* commit '3db86b6ffc927d0f2bc6d4b5fe9d20cafb746361':
  Fix wallpaper not updating on initial boot.
 2012-10-14 11:31:29 -07:00
Craig Mautner
3db86b6ffc am f93afcde: am 27c0773c: Merge "Fix wallpaper not updating on initial boot." into jb-mr1-dev 
* commit 'f93afcde559ac370fcff384527a85e762a26673a':
  Fix wallpaper not updating on initial boot.
 2012-10-14 11:29:43 -07:00
Craig Mautner
f93afcde55 am 27c0773c: Merge "Fix wallpaper not updating on initial boot." into jb-mr1-dev 
* commit '27c0773c34001c02cb7e2a6ae6e085ee3ed150cf':
  Fix wallpaper not updating on initial boot.
 2012-10-14 11:27:40 -07:00
Craig Mautner
27c0773c34 Merge "Fix wallpaper not updating on initial boot." into jb-mr1-dev 2012-10-14 11:25:23 -07:00
The Android Automerger
a2166def3b merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-14 06:59:18 -07:00
Jim Miller
68c2489457 Disable security view transitions in keyguard 
Now that we have a single stage unlock, there's no need for the transition. This
was causing unnecessary flickering to happen in views where we add the security view
just after inflation, which triggers the animation.

Fixes bug 7343632

Change-Id: I5bb8e37df66e4d96f00719e318424d46bf0e2e5a
 2012-10-14 05:07:14 -07:00
Adam Cohen
c7ad01d67c am c9579cec: am 002ab676: am 3b9f9bce: Merge "Fix inability to start pattern outside view bounds (issue 7344325)" into jb-mr1-dev 
* commit 'c9579ceccb45ae0acdf620e2363c229fcabc4169':
  Fix inability to start pattern outside view bounds (issue 7344325)
 2012-10-13 20:47:25 -07:00
Adam Cohen
c9579ceccb am 002ab676: am 3b9f9bce: Merge "Fix inability to start pattern outside view bounds (issue 7344325)" into jb-mr1-dev 
* commit '002ab676ef8287e0135c3deb4a5fe0175b68d460':
  Fix inability to start pattern outside view bounds (issue 7344325)
 2012-10-13 20:44:57 -07:00
Adam Cohen
002ab676ef am 3b9f9bce: Merge "Fix inability to start pattern outside view bounds (issue 7344325)" into jb-mr1-dev 
* commit '3b9f9bceeaff0fe23f68f24d604158f614053dcf':
  Fix inability to start pattern outside view bounds (issue 7344325)
 2012-10-13 20:43:18 -07:00
Adam Cohen
3b9f9bceea Merge "Fix inability to start pattern outside view bounds (issue 7344325)" into jb-mr1-dev 2012-10-13 20:40:33 -07:00
Adam Cohen
258d9fc6c6 Fix inability to start pattern outside view bounds (issue 7344325) 
-> At the same time, disabling the abilit to page the widget region
   and see the overscroll effect

Change-Id: Icd9d9e253404bfbfc411d8958f7c634ca4e37279
 2012-10-13 20:24:26 -07:00
Adam Cohen
7684258b21 am 819a1947: am 48b3e306: am c4c56222: Merge "Fix blank clock (issue 7344512)" into jb-mr1-dev 
* commit '819a19476815a1f1ae719a0412719eb1bbef2aa6':
  Fix blank clock (issue 7344512)
 2012-10-13 19:41:12 -07:00
Adam Cohen
819a194768 am 48b3e306: am c4c56222: Merge "Fix blank clock (issue 7344512)" into jb-mr1-dev 
* commit '48b3e3063b323952f25920856a20483a062a1437':
  Fix blank clock (issue 7344512)
 2012-10-13 19:39:04 -07:00
Adam Cohen
48b3e3063b am c4c56222: Merge "Fix blank clock (issue 7344512)" into jb-mr1-dev 
* commit 'c4c562223b0246d2cbb973d0b0ab63f860798475':
  Fix blank clock (issue 7344512)
 2012-10-13 19:36:58 -07:00
Adam Cohen
c4c562223b Merge "Fix blank clock (issue 7344512)" into jb-mr1-dev 2012-10-13 19:34:45 -07:00
Adam Cohen
9238301695 am c8a8dc40: am 2e71e3f1: am 33387b1b: Merge "Fix edge case with status message (issue 7343848)" into jb-mr1-dev 
* commit 'c8a8dc40cbbd142b26b95ebfd8d34b403dff1ef4':
  Fix edge case with status message (issue 7343848)
 2012-10-13 19:30:32 -07:00
Adam Cohen
c8a8dc40cb am 2e71e3f1: am 33387b1b: Merge "Fix edge case with status message (issue 7343848)" into jb-mr1-dev 
* commit '2e71e3f167ea1bc1016e562f66619843a0743b5e':
  Fix edge case with status message (issue 7343848)
 2012-10-13 19:28:42 -07:00
Adam Cohen
2e71e3f167 am 33387b1b: Merge "Fix edge case with status message (issue 7343848)" into jb-mr1-dev 
* commit '33387b1bee6813ea2f5cf82c7244dc90453a7c2c':
  Fix edge case with status message (issue 7343848)
 2012-10-13 19:26:45 -07:00
Adam Cohen
33387b1bee Merge "Fix edge case with status message (issue 7343848)" into jb-mr1-dev 2012-10-13 19:23:49 -07:00
Adam Cohen
7e39410f95 Fix blank clock (issue 7344512) 
Change-Id: Iad23f049fcc31ad8f08c99e7c3088e1523de1d45
 2012-10-13 19:10:56 -07:00
Craig Mautner
c92f150af0 Fix wallpaper not updating on initial boot. 
Update the wallpaper and redraw it unconditionally when the surface
changes. Previously we were not updating the wallpaper when the
surface changed which meant that it remained at the original surface
dimensions. Also, the indication that it was visible comes in too
late to display it cleanly without jank.

Bug: 7310334 fixed.
Change-Id: Ic2ae95ea0b0704183053da1d7a906818651c62c9
 2012-10-13 17:55:26 -07:00
Adam Cohen
61ccc162a0 Fix edge case with status message (issue 7343848) 
-> When an unimportant message is set, we need to clear the security string
   so that battery / owner info takes precedence at that point.

Change-Id: I3f86b0c2cc8fb2fb0023fce77a7725d8ada96d9e
 2012-10-13 17:04:44 -07:00
Adam Cohen
ae72636b87 am 138ff8dc: am 30621122: am 32f9e8ff: Merge "Only showing important security messages in status area (issue 7341795)" into jb-mr1-dev 
* commit '138ff8dc9be4ed64280add6916f590b8928195b6':
  Only showing important security messages in status area (issue 7341795)
 2012-10-13 16:45:52 -07:00
Adam Cohen
138ff8dc9b am 30621122: am 32f9e8ff: Merge "Only showing important security messages in status area (issue 7341795)" into jb-mr1-dev 
* commit '30621122e57efa8717de58a35ccc21f62fb6637d':
  Only showing important security messages in status area (issue 7341795)
 2012-10-13 16:43:10 -07:00