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

27799 Commits

Author SHA1 Message Date
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
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
Dianne Hackborn
2a30547af4 Merge "Work on issue #6949468: android.dpi.cts.ConfigurationScreenLayoutTest..." into jb-mr1-dev 2012-09-30 15:52:47 -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
Craig Mautner
c36c49ee83 Changing debug for b/7094175. 
Fixes bug 7094175 (but not really).

Change-Id: Ice2abb93f479ea0bda931e9643710668c25aa285
 2012-09-29 16:02:43 -07:00
Adam Cohen
82ebe6f777 Getting rid of keyguard widget flag that isn't used 
-> issue 7238875

Change-Id: Ifad890b4061784889f3fc7711a165452cf230fbd
 2012-09-28 19:33:05 -07:00
Jeff Brown
489c1e9f82 am 7f813202: Merge "Get rid of preventScreenOn()." into jb-mr1-dev 
* commit '7f813202cb08a829b59e17be749ffee4a2f482b8':
  Get rid of preventScreenOn().
 2012-09-28 19:08:17 -07:00
Jeff Brown
7f813202cb Merge "Get rid of preventScreenOn()." into jb-mr1-dev 2012-09-28 19:05:52 -07:00
Fabrice Di Meglio
343e11345e Fix bug #6427629 Clean up layout direction APIs 
- remove onPaddingChanged(int) and fold it into onRtlPropertiesChanged(int)

Change-Id: I1d7f02d2b4538c6c991bd4285501bbc73e6aa5c3
 2012-09-28 18:26:07 -07:00
Jeff Brown
120664816a Get rid of preventScreenOn(). 
Bug: 7165399
Change-Id: I1968265ecd74fff4d85efd2ca03b1983425ea518
 2012-09-28 18:21:36 -07:00
Dianne Hackborn
66e9275226 am 84215565: Merge "Fix issue #7255954: API Review: rename Dream to DreamService" into jb-mr1-dev 
* commit '84215565dd5dda84db7fd35b8ae4ccb571465cd2':
  Fix issue #7255954: API Review: rename Dream to DreamService
 2012-09-28 18:20:02 -07:00
Dianne Hackborn
84215565dd Merge "Fix issue #7255954: API Review: rename Dream to DreamService" into jb-mr1-dev 2012-09-28 18:17:13 -07:00
Dianne Hackborn
be87e2f588 Fix issue #7255954: API Review: rename Dream to DreamService 
Change-Id: I89ecf2c3ec4fef09c0495aa68de11576f9cfd872
 2012-09-28 17:42:39 -07:00
Adam Powell
7fb07337f8 am 4984ec72: Merge "Fix adjustViewBounds handling for ImageView" into jb-mr1-dev 
* commit '4984ec7222d86a9b507a9961363bf50d2b72df1b':
  Fix adjustViewBounds handling for ImageView
 2012-09-28 17:09:51 -07:00
Fabrice Di Meglio
d35b2dc7cc am be290dd8: Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings" into jb-mr1-dev 
* commit 'be290dd850c8e2c31830e2a87205499586f55353':
  Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings
 2012-09-28 17:09:45 -07:00
Dianne Hackborn
752cb20245 am 3ff8e1a8: Merge "Fix issue #7211769 and #7244492, thrash around on #7226656." into jb-mr1-dev 
* commit '3ff8e1a80058e5557d13693d3223e1aa011c0038':
  Fix issue #7211769 and #7244492, thrash around on #7226656.
 2012-09-28 17:09:37 -07:00
Robert Greenwalt
a6c9a612af resolved conflicts for merge of 925a659d to jb-mr1-aah-dev 
Change-Id: I520c5df139c88cc0fecaeffdc9e2b5eb8dd352aa
 2012-09-28 17:00:00 -07:00
Jean-Baptiste Queru
3c45765a2a Merge from jb-mr1-aah-dev 
Change-Id: I4deb6ff1d3c9e00aefacbe772227bf43c139ecca
 2012-09-28 16:44:18 -07:00
Adam Powell
4984ec7222 Merge "Fix adjustViewBounds handling for ImageView" into jb-mr1-dev 2012-09-28 16:15:36 -07:00
Fabrice Di Meglio
be290dd850 Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings" into jb-mr1-dev 2012-09-28 16:12:15 -07:00
Dianne Hackborn
3ff8e1a800 Merge "Fix issue #7211769 and #7244492, thrash around on #7226656." into jb-mr1-dev 2012-09-28 15:54:44 -07:00
Adam Powell
d5edc77217 Fix adjustViewBounds handling for ImageView 
When computing the adjusted view bounds, don't constrain the
dimensions by the original estimate if the opposite dimension has a
fixed size. This can result in the view never getting properly
enlarged.

Also fix a long-standing bug in MeasureSpec.makeMeasureSpec where
oversized or negative values could result in broken packed values.

Bug 7240251

Change-Id: I359d108ff52b6f3b5c4bf393d2271d28999c0127
 2012-09-28 15:52:36 -07:00
Fabrice Di Meglio
15bbde41da Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings 
- fix padding issue. Need to update padding if layout direction change

Change-Id: I2924c1b94c7ef054dd9bd670de4c5c206f52e412
 2012-09-28 15:49:38 -07:00