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

76040 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
0e693b249d am 3421f9fd: Merge "Add temporary functor lifetime logging" into jb-dev 
* commit '3421f9fd6847faa0bbf3f1d8e1c8424bce52a9a4':
  Add temporary functor lifetime logging
 2012-05-02 17:30:36 -07:00
Chris Craik
3421f9fd68 Merge "Add temporary functor lifetime logging" into jb-dev 2012-05-02 17:26:57 -07:00
Craig Mautner
84cf8e9cee am 232301b0: Merge "Fix flashy transition in QuickContacts" into jb-dev 
* commit '232301b027e54c270adad30541d248e6b7b62f4a':
  Fix flashy transition in QuickContacts
 2012-05-02 17:25:44 -07:00
Craig Mautner
232301b027 Merge "Fix flashy transition in QuickContacts" into jb-dev 2012-05-02 17:23:44 -07:00
Craig Mautner
94ef9df22c Fix flashy transition in QuickContacts 
Calls to relayout were forcing outgoing app reported visibility to
false. Because there was a DummyAnimation in the outgoing app the
stepAnimation was forcing the app Transformation alpha value to 0
based on the most recent reportedVisibile value. This was causing the
outgoing app to disappear for an instant.  Moving the visibility test
to the time at which the DummyAnimation is set fixes this problem.

Fixes bug 5908102.

Change-Id: Ib574728a007a0af759990816db42e23ba315b468
 2012-05-02 17:08:39 -07:00
Ruei-sung Lin
9091162542 am 1c823452: Merge "Fix b/5974247" into jb-dev 
* commit '1c823452111c8a9ca75c6e6d5c1767ada7e46a74':
  Fix b/5974247
 2012-05-02 16:43:28 -07:00
Ruei-sung Lin
1c82345211 Merge "Fix b/5974247" into jb-dev 2012-05-02 16:41:13 -07:00
Chris Craik
2fe99801e8 Add temporary functor lifetime logging 
bug:6405861

Note: revert once the above bug is verified fixed

Change-Id: Iae04ec6ffa73a2711f96e128d60011bcb5864b5c
 2012-05-02 16:37:24 -07:00
Irfan Sheriff
2f104185a5 am 04e83d39: Merge "Fix reference counting of wifi locks" into jb-dev 
* commit '04e83d39523316ad7fa9fd7b3f392caa847ddc70':
  Fix reference counting of wifi locks
 2012-05-02 16:27:38 -07:00
Irfan Sheriff
04e83d3952 Merge "Fix reference counting of wifi locks" into jb-dev 2012-05-02 16:25:34 -07:00
Matthew Xie
cdffda286b am d69c3675: Merge "Always move Bluetooth Adapter to cold state when turn off Bluetooth." into jb-dev 
* commit 'd69c367577440be968d33f6ab67bc758c379156f':
  Always move Bluetooth Adapter to cold state when turn off Bluetooth.
 2012-05-02 16:23:46 -07:00
Matthew Xie
d69c367577 Merge "Always move Bluetooth Adapter to cold state when turn off Bluetooth." into jb-dev 2012-05-02 16:20:55 -07:00
Craig Mautner
df363bee7d am be4f5bb7: Merge "Fix Home key causes wrong animation" into jb-dev 
* commit 'be4f5bb7fc08ca25d67525fdd97d15f73d150891':
  Fix Home key causes wrong animation
 2012-05-02 16:18:58 -07:00
John Reck
17c61ea555 am 9a793c91: Merge "Add missing null check" into jb-dev 
* commit '9a793c91b6cdd4b78a574e1fe5e701dc76fc78e5':
  Add missing null check
 2012-05-02 16:18:57 -07:00
Craig Mautner
be4f5bb7fc Merge "Fix Home key causes wrong animation" into jb-dev 2012-05-02 16:17:24 -07:00
Jeff Sharkey
0fdcadf28e am 9a671137: Merge "Set tmpdir to application cache directory." into jb-dev 
* commit '9a671137dc95e243009dab34971da75f0d598456':
  Set tmpdir to application cache directory.
 2012-05-02 16:16:11 -07:00
John Reck
9a793c91b6 Merge "Add missing null check" into jb-dev 2012-05-02 16:15:51 -07:00
John Reck
40e07b9ce8 am 2f612bdf: Merge "Rewrite PictureSet" into jb-dev 
* commit '2f612bdfbd7bf94111015d06ba3fa4e864d0972b':
  Rewrite PictureSet
 2012-05-02 16:13:23 -07:00
Jeff Sharkey
9a671137dc Merge "Set tmpdir to application cache directory." into jb-dev 2012-05-02 16:12:49 -07:00
John Reck
2f612bdfbd Merge "Rewrite PictureSet" into jb-dev 2012-05-02 16:11:17 -07:00
Jim Miller
07a42cfcd4 am 1771ee34: Merge "Revert "Fix for layout parameter validation bug in GridLayout."" into jb-dev 
* commit '1771ee34d1d308193e61a1b75368149f2d06aa6c':
  Revert "Fix for layout parameter validation bug in GridLayout."
 2012-05-02 16:02:38 -07:00
Jim Miller
1771ee34d1 Merge "Revert "Fix for layout parameter validation bug in GridLayout."" into jb-dev 2012-05-02 15:59:27 -07:00
Jim Miller
782c04b864 Revert "Fix for layout parameter validation bug in GridLayout." 
This reverts commit 8a36e05443f13edde1eae0cf6ea01b3b2da6e637 which was causing
keyguard_screen_tab_unlock.xml to have a bad layout.

Change-Id: I50bdc6dbdf8d7b98ef77eae532860d375574213e
 2012-05-02 15:50:30 -07:00
Adam Powell
020d53224c am fbbdbc2d: Merge "Fix setting action bar home-as-up from AB style" into jb-dev 
* commit 'fbbdbc2d2326e96ce31950baccddd2f295fe594c':
  Fix setting action bar home-as-up from AB style
 2012-05-02 15:44:45 -07:00
Adam Powell
fbbdbc2d23 Merge "Fix setting action bar home-as-up from AB style" into jb-dev 2012-05-02 15:42:23 -07:00
Ruei-sung Lin
f4b403159f Fix b/5974247 
Change-Id: I8c5cf035f195142607875739604d163c7a43e305
 2012-05-02 15:16:57 -07:00
Winson Chung
21a75218b0 am 3e1cf5b4: Merge "Updating task and fragment transitions. (Bug 5285022)" into jb-dev 
* commit '3e1cf5b423c31301fd17605c752d68a883048f77':
  Updating task and fragment transitions. (Bug 5285022)
 2012-05-02 14:53:30 -07:00
Winson Chung
3e1cf5b423 Merge "Updating task and fragment transitions. (Bug 5285022)" into jb-dev 2012-05-02 14:51:08 -07:00
Winson Chung
bd127f0966 Updating task and fragment transitions. (Bug 5285022) 
Change-Id: Iae7cc88d7b608360455956488562a40cbdb725f9
 2012-05-02 14:49:28 -07:00
Eric Fischer
5b18fb8cba am 46bba663: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '46bba66318358a9ddd247035ae65e888c307f567':
  Import translations. DO NOT MERGE
 2012-05-02 14:45:48 -07:00
Eric Fischer
46bba66318 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-02 14:43:45 -07:00
Irfan Sheriff
2c02da2bc6 Fix reference counting of wifi locks 
Bug: 6105898
Change-Id: I7368de91fa4aa63fd97dda0ee91d810aaaa53d8b
 2012-05-02 14:40:16 -07:00
Matthew Xie
7f58b36fec Always move Bluetooth Adapter to cold state when turn off Bluetooth. 
quick switch feature introduced in ICS does not work very well. Reported
logs indicate the Bluez stack cannot sustain the long time ON/hotoff state.
This change will always move the adapter to code but move it to hotoff
to be able to turn on quickly.
bug 5792792

Change-Id: I41c39d4bf11bb5eb3cd83279e8ec81e01774e008
 2012-05-02 14:15:10 -07:00
Adam Powell
d40423a7ad Fix setting action bar home-as-up from AB style 
Bug 6427860

Change-Id: I0052417a2c97560ade768509781b27b5e064660d
 2012-05-02 14:06:03 -07:00
Jeff Sharkey
cff5d25da8 am 6f28f9ef: Merge "Push existing rules when netd reconnects." into jb-dev 
* commit '6f28f9ef315e3b5190259a943be91ecfafc69103':
  Push existing rules when netd reconnects.
 2012-05-02 13:51:14 -07:00
Jeff Sharkey
6f28f9ef31 Merge "Push existing rules when netd reconnects." into jb-dev 2012-05-02 13:48:30 -07:00
Jeff Sharkey
e1d330a071 Set tmpdir to application cache directory. 
Otherwise File.createTempFile() uses /sdcard which most apps don't
have write access to.

Bug: 6347289
Change-Id: Ibde191a63e4dbb9b03437406f8c999f192bcfa21
 2012-05-02 13:47:37 -07:00
Eric Fischer
ef3e44f69a Import translations. DO NOT MERGE 
Change-Id: I5ae8fc8c95a47a3b981a10bf2218c774de71627f
 2012-05-02 12:58:28 -07:00
Adam Powell
56de329630 am 0cd4f671: Merge "Fix documentation of Activity#navigateUpTo() to describe its actual behavior." into jb-dev 
* commit '0cd4f6718b3d9b9d147a28e32bbb3c0f9147d5a9':
  Fix documentation of Activity#navigateUpTo() to describe its actual behavior.
 2012-05-02 12:03:31 -07:00
Gilles Debunne
0bab2b068c am 54562cfb: Merge "Better horizontal internal scroll handling in Text." into jb-dev 
* commit '54562cfbcd97a3b9d3ac9fb74f7a0d0d4bb9b8a0':
  Better horizontal internal scroll handling in Text.
 2012-05-02 12:03:29 -07:00
Chet Haase
dcc8103542 am fe5984f4: Merge "Corrects invalidation logic for layered views" into jb-dev 
* commit 'fe5984f43a5be9f95d1febb806f3aee8601c7ff4':
  Corrects invalidation logic for layered views
 2012-05-02 12:00:24 -07:00
Adam Powell
0cd4f6718b Merge "Fix documentation of Activity#navigateUpTo() to describe its actual behavior." into jb-dev 2012-05-02 11:59:55 -07:00
Gilles Debunne
54562cfbcd Merge "Better horizontal internal scroll handling in Text." into jb-dev 2012-05-02 11:59:54 -07:00
Chet Haase
fe5984f43a Merge "Corrects invalidation logic for layered views" into jb-dev 2012-05-02 11:56:56 -07:00
Irfan Sheriff
7a224b0f33 am d07223f8: Merge "Fix getConfiguredNetworks when wifi is disabled" into jb-dev 
* commit 'd07223f8294bbc32c9dbbee295e5c0739ce09550':
  Fix getConfiguredNetworks when wifi is disabled
 2012-05-02 11:44:19 -07:00
Irfan Sheriff
d07223f829 Merge "Fix getConfiguredNetworks when wifi is disabled" into jb-dev 2012-05-02 11:42:09 -07:00
Irfan Sheriff
a3cbe75c93 Fix getConfiguredNetworks when wifi is disabled 
Bug: 6380917
Change-Id: I4c6f1a379ef2401cde739aedfc82578c03e7dcf3
 2012-05-02 11:39:54 -07:00
Adam Powell
35c064b2e8 Fix documentation of Activity#navigateUpTo() to describe its actual 
behavior.

Change-Id: I804fcef5df6f5885b47b7a1c7703ed301bea09b0
 2012-05-02 11:38:57 -07:00
Irfan Sheriff
78e2360950 am 7a6a4bf1: Merge "P2p fixes" into jb-dev 
* commit '7a6a4bf1b5905d3136ca883fff1d432e7c260298':
  P2p fixes
 2012-05-02 11:16:27 -07:00
Irfan Sheriff
7a6a4bf1b5 Merge "P2p fixes" into jb-dev 2012-05-02 11:14:21 -07:00