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

89917 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
a3f4bf531f Always layout Keyguard on config change. 
Add Keyguard to list of windows that can't be hidden by keyguard.

Don't assign Configuration to window until layout has had a chance
to compare it to window's existing Configuration.

Bug: 7094175
Change-Id: I99a9fd4af9a31871fe130db7b6bdf49bd51a6092
 2012-10-15 13:45:17 -07:00
Romain Guy
8e63bcc63f Revert "Fix for bug 6050753." 
This reverts commit c29f031598811486d83f418fd08fbfe1fc41788a.
 2012-10-15 13:24:58 -07:00
Romain Guy
edc9005289 Update javadoc 
Some View.post*() methods can be invoked from arbitrary thread
independently of whether the View is attached to a window.

Change-Id: I587b5909ab8b06665978d001548d56c8c22043c1
 2012-10-15 12:31:57 -07:00
Robert Greenwalt
af614e7d3c am 4e579b5a: am a30d9694: Merge "Monitor the right interface re VPN" into jb-mr1-dev 
* commit '4e579b5ac23fc2eda314fb43600c83ebc3eb2cd0':
  Monitor the right interface re VPN
 2012-10-15 11:38:41 -07:00
Daniel Sandler
321e9c562b Allow any user to clear a notification targeted at USER_ALL. 
This also adds the userid to notification_* eventlogs.

Bug: 7325802
Change-Id: I48055caf1344acd58b61607bf0be38cc299fc7be
 2012-10-15 14:38:39 -04:00
Robert Greenwalt
4e579b5ac2 am a30d9694: Merge "Monitor the right interface re VPN" into jb-mr1-dev 
* commit 'a30d969401a8533a5a341664421ba9b1e150bac3':
  Monitor the right interface re VPN
 2012-10-15 11:37:13 -07:00
Robert Greenwalt
a30d969401 Merge "Monitor the right interface re VPN" into jb-mr1-dev 2012-10-15 11:34:13 -07:00
Jeff Sharkey
52801aae89 Protect more service dump() methods. 
Bug: 6406965
Change-Id: Ia45a580c1e6f403308e7e540f18f2c0505af0f29
 2012-10-15 10:59:51 -07:00
Irfan Sheriff
04353e81e6 am 7e08477e: am d86a532c: Merge "Fix handling of lost device" into jb-mr1-dev 
* commit '7e08477ed1589bc7d6488c8bacbdfb407fda20f0':
  Fix handling of lost device
 2012-10-15 10:27:54 -07:00
Irfan Sheriff
7e08477ed1 am d86a532c: Merge "Fix handling of lost device" into jb-mr1-dev 
* commit 'd86a532c5271dfbfe7378ddeb6700fafd92ecbcc':
  Fix handling of lost device
 2012-10-15 10:25:23 -07:00
Irfan Sheriff
d86a532c52 Merge "Fix handling of lost device" into jb-mr1-dev 2012-10-15 10:23:23 -07:00
Marco Nelissen
ac47033ff4 am 6133e92e: am 48df1491: Merge "Rewind buffer before copying into it." into jb-mr1-dev 
* commit '6133e92e6bd6557f5b1324e515b35fd8e6a9cd54':
  Rewind buffer before copying into it.
 2012-10-15 10:04:54 -07:00
Marco Nelissen
6133e92e6b am 48df1491: Merge "Rewind buffer before copying into it." into jb-mr1-dev 
* commit '48df14919602a7aac9ea9d0f0a2a3afe04eb6e0b':
  Rewind buffer before copying into it.
 2012-10-15 10:02:59 -07:00
Marco Nelissen
48df149196 Merge "Rewind buffer before copying into it." into jb-mr1-dev 2012-10-15 10:00:16 -07:00
Chris Wren
33856c19df am 5d0a560c: am 4a01f2b5: Merge "delay onDreamingStarted() to work around asynchrony." into jb-mr1-dev 
* commit '5d0a560ca4e455bfe8f77c2872a479e210b38dcf':
  delay onDreamingStarted() to work around asynchrony.
 2012-10-15 09:10:21 -07:00
Chris Wren
5d0a560ca4 am 4a01f2b5: Merge "delay onDreamingStarted() to work around asynchrony." into jb-mr1-dev 
* commit '4a01f2b5dcb5bcb72358905db402731013195cfd':
  delay onDreamingStarted() to work around asynchrony.
 2012-10-15 09:08:17 -07:00
Chris Wren
4a01f2b5dc Merge "delay onDreamingStarted() to work around asynchrony." into jb-mr1-dev 2012-10-15 09:06:37 -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
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
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
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
Irfan Sheriff
41de240465 Fix handling of lost device 
We did not update a lost device notice to apps properly. This causes incorrect
connection initiation without a discovery which leads to failed invitation
requests to supplicant.

Bug: 7328758
Change-Id: If4b594c737d639d0f553188309319fba4e3ee7b7
 2012-10-14 22:41:30 -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
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
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
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
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
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
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