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

87965 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
93b17876d4 am 5831159b: Merge "More migration to Global settings." into jb-mr1-dev 
* commit '5831159b8d4cf85fa46e2c4cb8e7d9f750014d6f':
  More migration to Global settings.
 2012-10-18 23:26:15 -07:00
Jeff Brown
fba021eaac am ce78b026: Merge "Fix deadlock." into jb-mr1-dev 
* commit 'ce78b026179bc041bce9c9e2d8b63b79a97cbf67':
  Fix deadlock.
 2012-10-18 23:26:11 -07:00
Jeff Sharkey
5831159b8d Merge "More migration to Global settings." into jb-mr1-dev 2012-10-18 23:23:16 -07:00
Jeff Brown
ce78b02617 Merge "Fix deadlock." into jb-mr1-dev 2012-10-18 23:22:02 -07:00
Dave Burke
744b4dca34 am 09a5321c: Merge "Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""" into jb-mr1-dev 
* commit '09a5321c60c02d944684abb98e0daec9dd810fab':
  Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""
 2012-10-18 21:05:29 -07:00
Dave Burke
09a5321c60 Merge "Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""" into jb-mr1-dev 2012-10-18 21:02:13 -07:00
Dave Burke
579e14016c Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" 
This reverts commit 57fca90ac65ecfe97acd4c93d442c3db8f815e11

Change-Id: I21b007a7d150a4c23f25a706cdba5cb86198198f
 2012-10-18 20:41:55 -07:00
Xavier Ducrohet
1a755c67e0 am ed5387be: am fcc93e73: (-s ours) am 135b5ba5: Layoutlib: Read and close XML files as soon as possible. do not merge. 
* commit 'ed5387be7a78d6d54214683fe5bf8bc3039529b9':
  Layoutlib: Read and close XML files as soon as possible. do not merge.
 2012-10-18 17:54:25 -07:00
Xavier Ducrohet
ed5387be7a am fcc93e73: (-s ours) am 135b5ba5: Layoutlib: Read and close XML files as soon as possible. do not merge. 
* commit 'fcc93e734be9fe4608fb5a6818163104cdec3fb5':
  Layoutlib: Read and close XML files as soon as possible. do not merge.
 2012-10-18 17:52:21 -07:00
Xavier Ducrohet
fcc93e734b am 135b5ba5: Layoutlib: Read and close XML files as soon as possible. do not merge. 
* commit '135b5ba52431b147d51a81b807784009cd0510dd':
  Layoutlib: Read and close XML files as soon as possible. do not merge.
 2012-10-18 17:48:57 -07:00
Jeff Brown
6669250034 Fix deadlock. 
The display manager must never call into the activity manager with
its lock held.  Make it clear that the adapters are constructed
while holding the syncroot lock.

Bug: 7377631
Change-Id: I1557313cbb31dcad9b5a46919a88a5a1c1af3e9b
 2012-10-18 17:37:39 -07:00
Fabrice Di Meglio
8de328c996 am 45c77ca0: Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev 
* commit '45c77ca0f6afd568ff6d149e17fb43c684e51722':
  Fix missing @hide on ViewGroup.resolveLayoutParams()
 2012-10-18 16:24:08 -07:00
Fabrice Di Meglio
45c77ca0f6 Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev 2012-10-18 16:20:36 -07:00
Fabrice Di Meglio
1e0ed6b232 Fix missing @hide on ViewGroup.resolveLayoutParams() 
- as we dont need this to be public

Change-Id: Ib8de262eec26d4785b13875d59599369b06a067d
 2012-10-18 16:06:52 -07:00
Xavier Ducrohet
135b5ba524 Layoutlib: Read and close XML files as soon as possible. do not merge. 
Because passing an InputStream to KXML does not close the
stream after the file has been parsed, the files are staying
locked on windows until the gc and finalizers are run.

This change preload the XML files and close their stream,
and then pass the content in a stream to the parser.

(cherry picked from commit c48b0b940d632b9862ff6aa32665e37fe9e50845)

Change-Id: I1b225454c166026c1aab6290c55ac8279e8862d5
 2012-10-18 15:48:10 -07:00
Fabrice Di Meglio
193229a52a am 0437302f: Merge "Fix the build" into jb-mr1-dev 
* commit '0437302f164f3eb1ba6a359ef5b3cd857facbbe4':
  Fix the build
 2012-10-18 15:40:24 -07:00
Jeff Sharkey
8d9a1f66d9 More migration to Global settings. 
Bug: 7375796
Change-Id: I3954ce141ad30073896090a28eee743ba15fd736
 2012-10-18 15:38:14 -07:00
Fabrice Di Meglio
0437302f16 Merge "Fix the build" into jb-mr1-dev 2012-10-18 15:37:26 -07:00
Fabrice Di Meglio
3cb8d26bb0 Fix the build 
- was missing a "make update-api" pass

Change-Id: I004a1650cf7946e0e8bd36d75dab81bbca80443c
 2012-10-18 15:34:30 -07:00
Xavier Ducrohet
26d76606af am d8149b03: Merge "Layoutlib: Read and close XML files as soon as possible." into jb-mr1-dev 
* commit 'd8149b03a8676a49f6ca500eecafe79fadf046a7':
  Layoutlib: Read and close XML files as soon as possible.
 2012-10-18 15:30:24 -07:00
Xavier Ducrohet
d8149b03a8 Merge "Layoutlib: Read and close XML files as soon as possible." into jb-mr1-dev 2012-10-18 15:27:39 -07:00
Fabrice Di Meglio
8c2bc7ccf1 am 07f85fec: Merge "Fix bug #7374285 GridLayout layout param margins are broken in RTL mode" into jb-mr1-dev 
* commit '07f85fecdd9f13a617953c7377ff62b4133b4e30':
  Fix bug #7374285  GridLayout layout param margins are broken in RTL mode
 2012-10-18 15:26:29 -07:00
Fabrice Di Meglio
07f85fecdd Merge "Fix bug #7374285 GridLayout layout param margins are broken in RTL mode" into jb-mr1-dev 2012-10-18 15:23:41 -07:00
Svetoslav Ganov
d7169b5936 am 80ce3d87: Merge "Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered." into jb-mr1-dev 
* commit '80ce3d8746e9bb727ebf37a8963b96be84d82413':
  Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered.
 2012-10-18 15:02:25 -07:00
Svetoslav Ganov
80ce3d8746 Merge "Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered." into jb-mr1-dev 2012-10-18 15:00:18 -07:00
Craig Mautner
84288ac10c am be2a4a5e: Merge "When removing windows remove from resize list." into jb-mr1-dev 
* commit 'be2a4a5e629b31071a160d57188219d6a76011fa':
  When removing windows remove from resize list.
 2012-10-18 14:49:31 -07:00
Craig Mautner
be2a4a5e62 Merge "When removing windows remove from resize list." into jb-mr1-dev 2012-10-18 14:46:13 -07:00
Xavier Ducrohet
c48b0b940d Layoutlib: Read and close XML files as soon as possible. 
Because passing an InputStream to KXML does not close the
stream after the file has been parsed, the files are staying
locked on windows until the gc and finalizers are run.

This change preload the XML files and close their stream,
and then pass the content in a stream to the parser.

Change-Id: Iabe27989dc616ec9e7de88e52b1ec3af9f007f7c
 2012-10-18 13:59:51 -07:00
Irfan Sheriff
877cc73091 am b98c2fb0: Merge "Do a clean shutdown of p2p" into jb-mr1-dev 
* commit 'b98c2fb0998b2ad6bffe9c06dd358ba4705eaa4b':
  Do a clean shutdown of p2p
 2012-10-18 13:46:35 -07:00
Irfan Sheriff
b98c2fb099 Merge "Do a clean shutdown of p2p" into jb-mr1-dev 2012-10-18 13:44:28 -07:00
Irfan Sheriff
62fa6de135 Do a clean shutdown of p2p 
We were doing a lazy shutdown and stopping supplicant behind p2p's back.
Make sure we stop p2p, before we go ahead with shutting down.

Bug: 7368832
Change-Id: I941e9cd69d6f27532207d3dc00b03c55c0e6335c
 2012-10-18 13:35:57 -07:00
Fabrice Di Meglio
fcc3348f61 Fix bug #7374285 GridLayout layout param margins are broken in RTL mode 
- resolve layout params in ViewGroup when layout direction is changed
- layout param resolution is checking the previous layout direction to
check if we need to resolve

Change-Id: I70af2ad2b4ec83c2ec6c93b3ff445852500d1687
 2012-10-18 13:24:03 -07:00
Chet Haase
eeb149ce56 am 58e60c23: Merge "Track size changes correctly for static wallpapers" into jb-mr1-dev 
* commit '58e60c239f1d08a67a154d974cab9711a1dd7ecc':
  Track size changes correctly for static wallpapers
 2012-10-18 13:00:13 -07:00
Chet Haase
58e60c239f Merge "Track size changes correctly for static wallpapers" into jb-mr1-dev 2012-10-18 12:57:23 -07:00
Jeff Hamilton
ba2c79a59f am e09aed49: Merge "Changes to support updating location providers." into jb-mr1-dev 
* commit 'e09aed49e3498c9e0f3545ab97f816233d5eac66':
  Changes to support updating location providers.
 2012-10-18 12:47:31 -07:00
Jeff Hamilton
e09aed49e3 Merge "Changes to support updating location providers." into jb-mr1-dev 2012-10-18 12:45:02 -07:00
Chet Haase
5f0d976b37 Track size changes correctly for static wallpapers 
Previous logic compared the surface size to the bitmap size to determine
whether to reload the bitmap. This was based on an assumption that the bitmap
would be created at the same sizea s the surface. However, the process of
how those sizes get determined is different for surfaces and wallpapers, causing
an occasional issue where the bitmap gets reloaded frequently, every time the wallpaper
is asked to redraw, even though it always gets recreated at the same size.

New logic checks previous surface dimensions against current surface dimensions to
determine whether the bitmap should be reloaded; we really only want to reload
it when the surface size changes.

Issue #7373200 pause when toggling between All Apps and Home screen; Home button stays illuminated for a long time

Change-Id: I108777b72bd42616ad7cf8274af1b3e6b2ed94e7
 2012-10-18 12:41:54 -07:00
Scott Main
d4161658e9 am e9b533bf: am 82f0ba79: am 4a6b6948: am 07322102: revise code sample for callback interface 
* commit 'e9b533bff02d75fa11df4392d921f7f4d3d9c101':
  revise code sample for callback interface
 2012-10-18 12:33:33 -07:00
Xavier Ducrohet
ebbfdeee38 am 5e42147a: am 64b3de29: (-s ours) am 434cd38f: Update layoutlib for jb mr1. do not merge. 
* commit '5e42147af3a8f284f9caa329c9fbfc994ca1d0da':
  Update layoutlib for jb mr1. do not merge.
 2012-10-18 12:31:50 -07:00
Scott Main
e9b533bff0 am 82f0ba79: am 4a6b6948: am 07322102: revise code sample for callback interface 
* commit '82f0ba79e67c154fc12a6cfde2fe1205da166b0d':
  revise code sample for callback interface
 2012-10-18 12:31:05 -07:00
Xavier Ducrohet
5e42147af3 am 64b3de29: (-s ours) am 434cd38f: Update layoutlib for jb mr1. do not merge. 
* commit '64b3de296cdbc8c02e2890f8853409c6d49cddb1':
  Update layoutlib for jb mr1. do not merge.
 2012-10-18 12:29:23 -07:00
Scott Main
82f0ba79e6 am 4a6b6948: am 07322102: revise code sample for callback interface 
* commit '4a6b69488f9fd90bbe04a930ffad8999bc93e173':
  revise code sample for callback interface
 2012-10-18 12:25:19 -07:00
Xavier Ducrohet
64b3de296c am 434cd38f: Update layoutlib for jb mr1. do not merge. 
* commit '434cd38f96a4a87220a8218901622f31e567354a':
  Update layoutlib for jb mr1. do not merge.
 2012-10-18 12:23:28 -07:00
Christopher Tate
2f29659852 am 1ea75b88: Merge "Sanity-check erroneous backup agent instantiations" into jb-mr1-dev 
* commit '1ea75b88b7ac4273b7a5395c5c57c6453d6cd3d1':
  Sanity-check erroneous backup agent instantiations
 2012-10-18 12:18:42 -07:00
Scott Main
aefc2e6233 am db164da8: Merge "improve some docs for dreams" into jb-mr1-dev 
* commit 'db164da885d15723597d6a525d0f46cb55dbcb88':
  improve some docs for dreams
 2012-10-18 12:18:38 -07:00
Scott Main
4a6b69488f am 07322102: revise code sample for callback interface 
* commit '07322102e5f1877bc2860d2c72eeeb41839d6bea':
  revise code sample for callback interface
 2012-10-18 12:18:31 -07:00
Svetoslav Ganov
444e8aabc1 Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered. 
1. When magnifier, if a dialog that popped up is wider than the scree we pan to its upper
   left corner. We now show the upper right corner if the locale direction is RTL.

2. Keyguard dialogs are not centered since they are used as a sign to recompute the
   magnified area but an unnecessary else statement prevents such dialogs from being
   properly show via a pan.

bug:7374331

Change-Id: I285e46b822a29f0082c502cb642f9da32dabfe6a
 2012-10-18 12:15:02 -07:00
Christopher Tate
1ea75b88b7 Merge "Sanity-check erroneous backup agent instantiations" into jb-mr1-dev 2012-10-18 12:07:03 -07:00
Scott Main
db164da885 Merge "improve some docs for dreams" into jb-mr1-dev 2012-10-18 11:37:30 -07:00
Chet Haase
d170e1890b am 18937b22: Merge "Stop reloading wallpaper bitmap" into jb-mr1-dev 
* commit '18937b22099723447388547a2d67f25bde6bdb10':
  Stop reloading wallpaper bitmap
 2012-10-18 11:20:47 -07:00