Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,990 Commits 3 Branches 0 Tags
b4cce25be07358cbaff84b0582c2fd74803ca0fa
Commit Graph

27818 Commits

Author SHA1 Message Date
Jeff Sharkey
1e7de794a5 am 9e3004ef: am 28b291fb: Merge "Move bluetooth priorities from Secure to Global." into jb-mr1-dev 
* commit '9e3004ef3bd20b053ad3f290775900ae356ec054':
  Move bluetooth priorities from Secure to Global.
 2012-10-01 13:13:25 -07:00
Jeff Sharkey
9e3004ef3b am 28b291fb: Merge "Move bluetooth priorities from Secure to Global." into jb-mr1-dev 
* commit '28b291fb890332ca5f68ffa912a01c16ff6b7685':
  Move bluetooth priorities from Secure to Global.
 2012-10-01 13:11:30 -07:00
Jeff Sharkey
28b291fb89 Merge "Move bluetooth priorities from Secure to Global." into jb-mr1-dev 2012-10-01 13:08:21 -07:00
Jeff Sharkey
0ac1028b0d Move bluetooth priorities from Secure to Global. 
Bug: 7231171
Change-Id: I836fdc2cfb8d67f984b4715559b9e92d0dc41c95
 2012-10-01 12:54:12 -07:00
Jeff Brown
9370592e23 am 5d359a92: am 5e3dcf72: Merge "Remove clearUserActivityTimeout()." into jb-mr1-dev 
* commit '5d359a92658d01b0220f77eb294d6124848739bc':
  Remove clearUserActivityTimeout().
 2012-10-01 11:41:11 -07:00
Jeff Brown
5d359a9265 am 5e3dcf72: Merge "Remove clearUserActivityTimeout()." into jb-mr1-dev 
* commit '5e3dcf7210bed65d8f9aec40d9da078daf76dead':
  Remove clearUserActivityTimeout().
 2012-10-01 11:39:30 -07:00
Jeff Brown
5e3dcf7210 Merge "Remove clearUserActivityTimeout()." into jb-mr1-dev 2012-10-01 11:35:55 -07:00
Adam Powell
586439676f am 21a80ff4: am c56e5600: Merge "Construct a task stack for picking a wifi network from notification" into jb-mr1-dev 
* commit '21a80ff4d1a557d8e33f86a218d204c0093fefc7':
  Construct a task stack for picking a wifi network from notification
 2012-10-01 10:36:48 -07:00
Adam Powell
21a80ff4d1 am c56e5600: Merge "Construct a task stack for picking a wifi network from notification" into jb-mr1-dev 
* commit 'c56e5600501a5c376dc13e6a99fcec7782fc8718':
  Construct a task stack for picking a wifi network from notification
 2012-10-01 10:34:59 -07:00
Adam Powell
c56e560050 Merge "Construct a task stack for picking a wifi network from notification" into jb-mr1-dev 2012-10-01 10:32:35 -07:00
John Spurlock
e58fc04f7c am db3b01a5: am ff70848e: Merge "Status bar: Keep disabled state per user." into jb-mr1-dev 
* commit 'db3b01a5bfbf5e190bf6116b71e27971c3b5816b':
  Status bar: Keep disabled state per user.
 2012-10-01 10:24:05 -07:00
Chet Haase
1dd002214e am bcdaf8cb: am 62ea4363: Merge "Fix texture corruption" into jb-mr1-dev 
* commit 'bcdaf8cb6d75d721507739504732e0e3dc7f437c':
  Fix texture corruption
 2012-10-01 10:16:25 -07:00
Dianne Hackborn
3645f2ccde am 55241249: am 2a30547a: Merge "Work on issue #6949468: android.dpi.cts.ConfigurationScreenLayoutTest..." into jb-mr1-dev 
* commit '552412496c00c04c9af353785936a89743677d49':
  Work on issue #6949468: android.dpi.cts.ConfigurationScreenLayoutTest...
 2012-10-01 10:16:22 -07:00
Adam Powell
5f260236ed am 135ce20c: am fb42be77: Merge "Fix UNSPECIFIED measurement in RelativeLayout" into jb-mr1-dev 
* commit '135ce20c12ef869028aa7d0182960f92840b7cfc':
  Fix UNSPECIFIED measurement in RelativeLayout
 2012-10-01 10:16:03 -07:00
Dianne Hackborn
eede0f6fe0 am b4bca666: am 2effc77c: Merge "Update APIs to JB MR1 level 17." into jb-mr1-dev 
* commit 'b4bca6661784ab8087e382765c2e0d53e98d651f':
  Update APIs to JB MR1 level 17.
 2012-10-01 10:15:27 -07:00
Adam Cohen
2e16cf67c1 am e1430669: am b97a71e8: Merge "Getting rid of keyguard widget flag that isn\'t used" into jb-mr1-dev 
* commit 'e14306690096fc3a1ae78f411ba9a7b616224df7':
  Getting rid of keyguard widget flag that isn't used
 2012-10-01 10:15:17 -07:00
Craig Mautner
7b9a263b50 am 61d32c0d: am a6efc965: Merge "Changing debug for b/7094175." into jb-mr1-dev 
* commit '61d32c0d0f05a394129e03d774589b8d93f5f8fb':
  Changing debug for b/7094175.
 2012-10-01 10:15:05 -07:00
Fabrice Di Meglio
e05c172638 am 3332a701: am 10c84edc: Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings" into jb-mr1-dev 
* commit '3332a701e1cd6453089d7b0c6501c7f37cb69327':
  Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings
 2012-10-01 10:14:47 -07:00
Romain Guy
d49faf39ec am 25c8c198: am 8ed6b6a9: Merge "Perform a long computation to catch bitmap sizes > 32 bits Bug #7257930" into jb-mr1-dev 
* commit '25c8c198e6abc053fbba19145ed485e31dc5927e':
  Perform a long computation to catch bitmap sizes > 32 bits Bug #7257930
 2012-10-01 10:14:40 -07:00
Fabrice Di Meglio
840ea01fcb am 93cea34a: am f2e5cf48: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 
* commit '93cea34a7f7834f42f921402415f7797b677e442':
  Fix bug #6427629 Clean up layout direction APIs
 2012-10-01 10:14:31 -07:00
Jeff Brown
843b014aca am 489c1e9f: am 7f813202: Merge "Get rid of preventScreenOn()." into jb-mr1-dev 
* commit '489c1e9f82250770004ec9080778546b040f6146':
  Get rid of preventScreenOn().
 2012-10-01 10:13:52 -07:00
Dianne Hackborn
d698542867 am 66e92752: am 84215565: Merge "Fix issue #7255954: API Review: rename Dream to DreamService" into jb-mr1-dev 
* commit '66e92752260e4ef21e77a44379f3a6b8969b4d65':
  Fix issue #7255954: API Review: rename Dream to DreamService
 2012-10-01 10:13:25 -07:00
John Spurlock
db3b01a5bf am ff70848e: Merge "Status bar: Keep disabled state per user." into jb-mr1-dev 
* commit 'ff70848eb2a6b916ad2ad2ceec0c59bcb41373a2':
  Status bar: Keep disabled state per user.
 2012-10-01 10:13:14 -07:00
John Spurlock
13451a25ff Status bar: Keep disabled state per user. 
Bug:7165607
Change-Id: If6f7a41c2516996612aef5e013dd0d2bd23f9084
 2012-10-01 11:44:37 -04:00
Adam Powell
d56b4d1db3 Construct a task stack for picking a wifi network from notification 
Bug 7001327

Change-Id: I5a79e6933cd33386cd0aa4df626f15902deedd67
 2012-09-30 18:30:42 -07:00
Jeff Brown
edce6a7978 Remove clearUserActivityTimeout(). 
This function is not implemented and not needed.

Bug: 7165399
Change-Id: Ib1c50fabad6292ccf670404ba70aeb1242c4614d
 2012-09-30 16:23:05 -07:00
Chet Haase
bcdaf8cb6d am 62ea4363: Merge "Fix texture corruption" into jb-mr1-dev 
* commit '62ea4363362526d32b48f920601d3b4e27a117bb':
  Fix texture corruption
 2012-09-30 15:56:39 -07:00
Dianne Hackborn
552412496c am 2a30547a: Merge "Work on issue #6949468: android.dpi.cts.ConfigurationScreenLayoutTest..." into jb-mr1-dev 
* commit '2a30547af44536f6b0e2f7020ac1a435c72afc84':
  Work on issue #6949468: android.dpi.cts.ConfigurationScreenLayoutTest...
 2012-09-30 15:55:02 -07:00
Chet Haase
62ea436336 Merge "Fix texture corruption" into jb-mr1-dev 2012-09-30 15:54:10 -07:00
Dianne Hackborn
2a30547af4 Merge "Work on issue #6949468: android.dpi.cts.ConfigurationScreenLayoutTest..." into jb-mr1-dev 2012-09-30 15:52:47 -07:00
Chet Haase
6a2d17f713 Fix texture corruption 
When memory gets low on a device, activities flush everything they can.
Hardware-accelerated activites, such as Launcher, flush GL resources and destroy
the GL context. However, some resources were still hanging around, due to deferred
destruction policies (we don't delete layers until the DisplayLists they are in
are finalized, to ensure we don't deref deleted objects). This meant that we were
referring to obsolete GL data in these objects. in particular, it meant that we might
come around later, after a new GL context was created, and delete a texture object
that was incorrect. We use the layer's "texture id" to refer to the texture underlying the
layer. But if there's a new GL context, then this texture ID is no longer valid, and
we may be deleting the texture that a different object (layer, icon, whatever) is referring
to, because the driver may return that same ID under the new GL context.

The fix is to more aggressively delete things that we know will not be used again
when the GL context is destroyed. In particular, we delete all resources being used
by all DisplayLists at GL context destruction time.

Issue #7195815 Textures corruption on all devices, in many apps

Change-Id: I52d2d208173690dbb794a83402d38f14ea4c6c22
 2012-09-30 15:35:08 -07:00
Dianne Hackborn
fe37f8f51d Work on issue #6949468: android.dpi.cts.ConfigurationScreenLayoutTest... 
...#testScreenLayout failures on JO

This doesn't actually fix it; I have concluded that the test is broken
(the platform is correctly reporting that this is a NOT LONG device
because in portrait once you account for the status bar and system
bar our size is 880dp high and 600dp wide, which is not enough for us
to be in the LONG config).

However while working on this I noticed that the code for computing
the configuration of the external display was wrong.  I have fixed
that by putting this code for computing these parts of the configuration
in a common place that both the window manager and external display
code can use.

Change-Id: Ic6a84b955e9ec345a87f725203a29e4712dac0ad
 2012-09-30 15:06:05 -07:00
Adam Powell
135ce20c12 am fb42be77: Merge "Fix UNSPECIFIED measurement in RelativeLayout" into jb-mr1-dev 
* commit 'fb42be77ea88470c71f2ad1e03bff7fdc3721465':
  Fix UNSPECIFIED measurement in RelativeLayout
 2012-09-30 14:27:03 -07:00
Adam Powell
fb42be77ea Merge "Fix UNSPECIFIED measurement in RelativeLayout" into jb-mr1-dev 2012-09-30 14:24:53 -07:00
Adam Powell
132a742b94 Fix UNSPECIFIED measurement in RelativeLayout 
Explicitly handle UNSPECIFIED MeasureSpec mode.

Bug 7258418

Change-Id: Idc7b4f0a4a92505379eb5479a84665f7908fcb83
 2012-09-30 12:42:46 -07:00
Dianne Hackborn
b4bca66617 am 2effc77c: Merge "Update APIs to JB MR1 level 17." into jb-mr1-dev 
* commit '2effc77c9a49f983779dbab656bba490bb7d4ba0':
  Update APIs to JB MR1 level 17.
 2012-09-30 12:24:08 -07:00
Dianne Hackborn
2effc77c9a Merge "Update APIs to JB MR1 level 17." into jb-mr1-dev 2012-09-30 12:22:50 -07:00
Adam Cohen
e143066900 am b97a71e8: Merge "Getting rid of keyguard widget flag that isn\'t used" into jb-mr1-dev 
* commit 'b97a71e8bd9877f4d4e47ec41408079552ab165b':
  Getting rid of keyguard widget flag that isn't used
 2012-09-30 12:22:20 -07:00
Adam Cohen
b97a71e8bd Merge "Getting rid of keyguard widget flag that isn't used" into jb-mr1-dev 2012-09-30 12:19:50 -07:00
Craig Mautner
61d32c0d0f am a6efc965: Merge "Changing debug for b/7094175." into jb-mr1-dev 
* commit 'a6efc965cc6f42ab88c08e48463ea4604d29cc77':
  Changing debug for b/7094175.
 2012-09-30 11:47:17 -07:00
Craig Mautner
a6efc965cc Merge "Changing debug for b/7094175." into jb-mr1-dev 2012-09-30 11:45:32 -07:00
Fabrice Di Meglio
3332a701e1 am 10c84edc: Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings" into jb-mr1-dev 
* commit '10c84edcfa674f13d798f4de65f95c76269c6191':
  Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings
 2012-09-30 11:37:00 -07:00
Romain Guy
25c8c198e6 am 8ed6b6a9: Merge "Perform a long computation to catch bitmap sizes > 32 bits Bug #7257930" into jb-mr1-dev 
* commit '8ed6b6a96bf887e0b49c48838a9f22bb0f256296':
  Perform a long computation to catch bitmap sizes > 32 bits Bug #7257930
 2012-09-30 11:35:16 -07:00
Fabrice Di Meglio
10c84edcfa Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings" into jb-mr1-dev 2012-09-30 11:33:31 -07:00
Romain Guy
8ed6b6a96b Merge "Perform a long computation to catch bitmap sizes > 32 bits Bug #7257930" into jb-mr1-dev 2012-09-30 11:28:54 -07:00
Romain Guy
af61cc4cbb Perform a long computation to catch bitmap sizes > 32 bits 
Bug #7257930

Change-Id: I28d08024fabe8103251d480524b0b0f2fd2d2aba
 2012-09-30 11:26:39 -07:00
Dianne Hackborn
fc4947491f Update APIs to JB MR1 level 17. 
17 is current, resources are fixed, cleanup is done.

Change-Id: I6de446e209f59c5dd5fe1cde311776ab222817ea
 2012-09-30 11:24:23 -07:00
Fabrice Di Meglio
47fb191841 Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings 
- do not need those variables. Use what we already have in View.
- reset padding to initial values before changing it.

Change-Id: Ib396b3dca6e98a94d83a538a9b594b5eb426c453
 2012-09-30 11:00:02 -07:00
Fabrice Di Meglio
93cea34a7f am f2e5cf48: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 
* commit 'f2e5cf487e9bda4da1b902cb5c816ba48c9b7004':
  Fix bug #6427629 Clean up layout direction APIs
 2012-09-30 10:55:18 -07:00
Fabrice Di Meglio
f2e5cf487e Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 2012-09-30 10:53:26 -07:00