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

83727 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
ec098efcb1 am 342c6bc8: am 54099555: am 380a8e3d: Merge "Am: Clean mLaunchingProviders of all providers started by the client" 
* commit '342c6bc8e5edb5a0cfa2ad65162d559b7f2ad993':
  Am: Clean mLaunchingProviders of all providers started by the client
 2012-09-05 12:36:04 -07:00
Jean-Baptiste Queru
f389f2820c resolved conflicts for merge of 7749a1c5 to jb-mr1-dev 
Change-Id: If30a6a4ded996749b34f6a975481a97006cbcf97
 2012-09-05 12:21:50 -07:00
Jean-Baptiste Queru
342c6bc8e5 am 54099555: am 380a8e3d: Merge "Am: Clean mLaunchingProviders of all providers started by the client" 
* commit '540995555505486074e9652a9c682bdf6e3056c5':
  Am: Clean mLaunchingProviders of all providers started by the client
 2012-09-05 12:12:56 -07:00
Jean-Baptiste Queru
7749a1c5ec am b4ac801c: am 1ca2fee9: Merge "Make default value of auto-sync in SyncStorageEngine configurable" 
* commit 'b4ac801c477c0a0de18da89744d9a78e79d2ff51':
  Make default value of auto-sync in SyncStorageEngine configurable
 2012-09-05 12:12:52 -07:00
Jean-Baptiste Queru
5409955555 am 380a8e3d: Merge "Am: Clean mLaunchingProviders of all providers started by the client" 
* commit '380a8e3d126374b0205e8452bf2b4b70779e2606':
  Am: Clean mLaunchingProviders of all providers started by the client
 2012-09-05 12:10:48 -07:00
Jean-Baptiste Queru
b4ac801c47 am 1ca2fee9: Merge "Make default value of auto-sync in SyncStorageEngine configurable" 
* commit '1ca2fee9547dbdd7008211ac318b1f8f40ce1e35':
  Make default value of auto-sync in SyncStorageEngine configurable
 2012-09-05 12:10:44 -07:00
Fabrice Di Meglio
5575e97cea Merge "Fix bug #7023040 android.widget.cts.TextViewTest#testResetTextAlignment failures" into jb-mr1-dev 2012-09-05 12:03:32 -07:00
Scott Main
f53c571144 am b693f6a9: am 8f58d381: older not lower 
* commit 'b693f6a94ca2fa6bd4bba94363112bfd1aeb70ee':
  older not lower
 2012-09-05 12:01:14 -07:00
Scott Main
b693f6a94c am 8f58d381: older not lower 
* commit '8f58d38103bd3ddc68c2b226e80b9f4c60529dae':
  older not lower
 2012-09-05 11:58:55 -07:00
Scott Main
e8c47a88dc am 3bcf81df: am 253483dd: Merge "docs: Accessibility DevGuide, Jelly Bean edition" into jb-dev 
* commit '3bcf81dfa44a4a583f5c7345849349974e5e121c':
  docs: Accessibility DevGuide, Jelly Bean edition
 2012-09-05 11:55:17 -07:00
Scott Main
8f58d38103 older not lower 
Change-Id: Idd925213af834d138991fc6237cfe0329f73ad67
 2012-09-05 11:54:05 -07:00
Scott Main
3827d4327e am 5ba48e12: am d4107dca: Merge "dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts" into jb-dev 
* commit '5ba48e12d35c103632d435159c04bb377005c300':
  dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
 2012-09-05 11:53:37 -07:00
Scott Main
3bcf81dfa4 am 253483dd: Merge "docs: Accessibility DevGuide, Jelly Bean edition" into jb-dev 
* commit '253483dd974302f0d286eacf6f0f8a9ac9258f78':
  docs: Accessibility DevGuide, Jelly Bean edition
 2012-09-05 11:52:57 -07:00
Scott Main
5ba48e12d3 am d4107dca: Merge "dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts" into jb-dev 
* commit 'd4107dca294a2e719b6ba3a268b7147d7cc2922f':
  dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
 2012-09-05 11:51:21 -07:00
Scott Main
253483dd97 Merge "docs: Accessibility DevGuide, Jelly Bean edition" into jb-dev 2012-09-05 11:50:18 -07:00
Scott Main
d4107dca29 Merge "dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts" into jb-dev 2012-09-05 11:48:56 -07:00
Jean-Baptiste Queru
380a8e3d12 Merge "Am: Clean mLaunchingProviders of all providers started by the client" 2012-09-05 11:40:30 -07:00
Joe Fernandez
ba4cf3c850 docs: Accessibility DevGuide, Jelly Bean edition 
Change-Id: Idafa0d755c0397b539a6de5b10096abc1c06c2c7
 2012-09-05 11:27:48 -07:00
Jean-Baptiste Queru
0b5a4a1513 am 11626a91: am 9eb3bd88: am 42a58ecd: Merge "Revert "Watchdog: Improvement of debuggability"" 
* commit '11626a91b6e695e7a8fa9e9a9f1a37df11cfb4e2':
  Revert "Watchdog: Improvement of debuggability"
 2012-09-05 11:07:21 -07:00
Jean-Baptiste Queru
11626a91b6 am 9eb3bd88: am 42a58ecd: Merge "Revert "Watchdog: Improvement of debuggability"" 
* commit '9eb3bd88f14c386c89dd2576c3ca798f2493b0fd':
  Revert "Watchdog: Improvement of debuggability"
 2012-09-05 11:04:53 -07:00
Jean-Baptiste Queru
1ca2fee954 Merge "Make default value of auto-sync in SyncStorageEngine configurable" 2012-09-05 11:03:13 -07:00
Jean-Baptiste Queru
9eb3bd88f1 am 42a58ecd: Merge "Revert "Watchdog: Improvement of debuggability"" 
* commit '42a58ecd27783d347242206bcffd4052cf1d5164':
  Revert "Watchdog: Improvement of debuggability"
 2012-09-05 11:01:25 -07:00
Jean-Baptiste Queru
42a58ecd27 Merge "Revert "Watchdog: Improvement of debuggability"" 2012-09-05 10:55:43 -07:00
Romain Guy
4a332f5bae Merge "Don't invalidate all the glyphs when flushing large textures" into jb-mr1-dev 2012-09-05 10:41:39 -07:00
Scott Main
395b3936b8 dashboard update for 9/4 
switch to simplified pie charts: codenames for platforms and separate size and density charts

Change-Id: I9b54f19f6a0c66645b4790e090afef4ec70555b0
 2012-09-05 09:34:08 -07:00
Daniel Sandler
5a426f6c4a Merge "Full-height panels on phones." into jb-mr1-dev 2012-09-05 09:33:50 -07:00
Daniel Sandler
bf526d14f3 Full-height panels on phones. 
The dynamic carrier label is also back for those devices.

Finally, allow the panel to be dragged just by touching the
(newly reopened) empty area.

Bug: 6999596
Change-Id: I65f2867f1bd1977270de0bcedd32cb7141fcb6b1
 2012-09-05 10:36:02 -04:00
Daniel Sandler
256a1b4dac Merge "The default notification LED color is now white." into jb-mr1-dev 2012-09-05 05:45:51 -07:00
Michael Jurka
78770167ce Merge "Fixing preloading recents for all devices" into jb-mr1-dev 2012-09-05 05:45:51 -07:00
Michael Jurka
d0d4bb8459 Fixing preloading recents for all devices 
- Fixed for tablets and phones with hard nav buttons

Change-Id: I1dc2249376b3f376c283598f5cef6e326b191ace
 2012-09-05 05:39:16 -07:00
Michael Jurka
881f0b1ee0 Remove unneeded imports 2012-09-05 04:44:59 -07:00
Michael Jurka
8481980495 Merge "Porting old code for min alpha for items in recents" into jb-mr1-dev 2012-09-05 03:40:15 -07:00
Michael Jurka
a1730fa4f1 Merge "Debug code for window transition crash" into jb-mr1-dev 2012-09-05 03:09:11 -07:00
Brian Muramatsu
580e9f72e0 Merge "Make battery shutdown temperature configurable" into jb-mr1-dev 2012-09-04 22:48:36 -07:00
Mathias Agopian
f87633f38c Merge "update to new SurfaceComposerClient API" into jb-mr1-dev 2012-09-04 20:30:02 -07:00
Satoshi Kataoka
0d727c714b Merge "Add subtypeId for keeping enabled "InputMethodSubtype"s even if subtype parameters are changed" into jb-mr1-dev 2012-09-04 20:27:50 -07:00
Mathias Agopian
63f1c43fbe update to new SurfaceComposerClient API 
Change-Id: I8f2c96df56fe3a851b8ec03bb8734db0b6bea3d5
 2012-09-04 20:23:23 -07:00
Adam Powell
b326fa046b am 4289b49d: (-s ours) am 9f3b0bfd: DO NOT MERGE - Make WebView track focal points more accurately 
* commit '4289b49dd580bd51b97b8e571b23aa00dbaec310':
  DO NOT MERGE - Make WebView track focal points more accurately
 2012-09-04 19:51:45 -07:00
Adam Powell
730b5b6914 am 52da9fa7: (-s ours) am c4ce0da2: DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold 
* commit '52da9fa7b53690c073b15d849d0d9befe47314f7':
  DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold
 2012-09-04 19:51:42 -07:00
Adam Powell
4289b49dd5 am 9f3b0bfd: DO NOT MERGE - Make WebView track focal points more accurately 
* commit '9f3b0bfd0b1d8876c96036a303b3ff72df0e8ad0':
  DO NOT MERGE - Make WebView track focal points more accurately
 2012-09-04 19:49:13 -07:00
Adam Powell
52da9fa7b5 am c4ce0da2: DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold 
* commit 'c4ce0da255df07e3d8a799aa4e9af2f1949ef4f4':
  DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold
 2012-09-04 19:49:07 -07:00
Romain Guy
521dc51fd4 Don't invalidate all the glyphs when flushing large textures 
FontRenderer::flushLargeCaches identifies the large textures used to
cache glyphs and visits all the known fonts to mark their glyphs
invalid if they belong to one of these large textures.

Unfortunately, Font::invalidateTextureCache had a logic error
which would make it mark *all glyphs* as invalid, not matter
what texture they belong to. This means that any large cache
flush would cause all glyphs to be invalidate, thus forcing
the rendering system to recreate them on the next draw.

Font::invalidateTextureCache is supposed to behave this way:
- If the specified cacheTexture is NULL (default value), mark
all glyphs as invalid (see FontRenderer::flushAllAndInvalidate())
- If cacheTexture is *not* NULL, invalidate only the glyphs for
which glyph.cacheTexture == cacheTexture.

The previous condition read:

if (cacheTexture || glyph.cacheTexture == cacheTexture)

This test *always* passes.

Change-Id: I418886cb594c81c6178d0f9e9953d975e991cf22
 2012-09-04 19:20:06 -07:00
Fabrice Di Meglio
fa1babd221 Fix bug #7023040 android.widget.cts.TextViewTest#testResetTextAlignment failures 
- cache the text aligment as we cannot resolve the text alignment during reset of the text direction

Change-Id: I79de625e517bf8bad6313fd5e349f1181b1eaa30
 2012-09-04 19:11:25 -07:00
Romain Guy
6c8c6d9d44 Merge "Correctly check the height of a glyph prior to caching it" into jb-mr1-dev 2012-09-04 19:01:48 -07:00
Romain Guy
e43f785b7f Correctly check the height of a glyph prior to caching it 
Change-Id: Iaf3977afc20fcde65bfda7b9e092b3e723241684
 2012-09-04 18:58:46 -07:00
Dianne Hackborn
bac6c12974 Merge "Fix another issue #7097984 java.lang.SecurityException: Permission Denial:" into jb-mr1-dev 2012-09-04 18:50:30 -07:00
Dianne Hackborn
fd8bf5c790 Fix another issue #7097984 java.lang.SecurityException: Permission Denial: 
broadcast asks to run as user -1 but is calling from user 0; this requires

Dupped bug of a different problem.

Change-Id: I15f4ab08b81f5f5746ba1cd183dee4f0b1281df5
 2012-09-04 18:48:37 -07:00
Brian Muramatsu
6809352087 Merge "Fix GPS settings change listener in LocManager" into jb-mr1-dev 2012-09-04 18:36:35 -07:00
Adam Powell
9f3b0bfd0b DO NOT MERGE - Make WebView track focal points more accurately 
Change-Id: I6683edee6933b1dd026453935d72119320ab3c81
 2012-09-04 18:33:56 -07:00
Adam Powell
c4ce0da255 DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold 
Change-Id: I13132ce1d912b54e251f7afed5143c72a2ec2e78
 2012-09-04 18:33:42 -07:00