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

98784 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
61963e88d9 am 67db4218: am 7fb1b8c6: am 946d68f3: am 9ac31a78: am ec171f3f: docs: add download ZIPs for chet\'s devbyte samples 
* commit '67db4218edf93ee3db36f9ac0e10682ed74f4150':
  docs: add download ZIPs for chet's devbyte samples
 2013-01-15 16:52:11 -08:00
Yorke Lee
30244d9239 Merge "Fix the build breakage due to incorrect javadoc link" 2013-01-15 16:47:18 -08:00
Yorke Lee
3e839f4eed Fix the build breakage due to incorrect javadoc link 
Change-Id: I1789f7e324a06c45c1be4088e9bd4e5cd6879aee
 2013-01-15 16:46:00 -08:00
Xavier Ducrohet
b7de2194d5 resolved conflicts for merge of c71c678e to master 
Change-Id: I9e1a6a1151af00f0a13e2010776276b240e0ac3a
 2013-01-15 16:41:29 -08:00
Scott Main
ceddf9f8e8 am 3c3995f5: Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev 
* commit '3c3995f5ab2d0bc38cd06effdd65395a6a9a0ac3':
  docs: put new devbytes playlist on the develop landing
 2013-01-15 15:25:04 -08:00
Scott Main
3c3995f5ab Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev 2013-01-15 15:20:53 -08:00
Raph Levien
e45113a156 Merge "Attempt to resolve build breakage on x86" 2013-01-15 14:58:29 -08:00
Scott Kennedy
7e553e15d9 am d50a0383: am ff5b7393: am 39ea055f: am 335da367: Merge "docs: Another fix for external 42607" into jb-mr1-dev 
* commit 'd50a038340935a0ea8cf8fadce7e21b640b58db0':
  docs: Another fix for external 42607
 2013-01-15 14:54:22 -08:00
Scott Main
67db4218ed am 7fb1b8c6: am 946d68f3: am 9ac31a78: am ec171f3f: docs: add download ZIPs for chet\'s devbyte samples 
* commit '7fb1b8c61337313de6566b1afa6886ceb368dd50':
  docs: add download ZIPs for chet's devbyte samples
 2013-01-15 14:54:18 -08:00
Scott Kennedy
d50a038340 am ff5b7393: am 39ea055f: am 335da367: Merge "docs: Another fix for external 42607" into jb-mr1-dev 
* commit 'ff5b73933a0444aae30e3a1a41bb31d19f7ff649':
  docs: Another fix for external 42607
 2013-01-15 14:52:32 -08:00
Scott Main
7fb1b8c613 am 946d68f3: am 9ac31a78: am ec171f3f: docs: add download ZIPs for chet\'s devbyte samples 
* commit '946d68f3d0e0a10753cc6566766f149d779f45b6':
  docs: add download ZIPs for chet's devbyte samples
 2013-01-15 14:52:29 -08:00
Xavier Ducrohet
c71c678e9b am a4e10cc7: am 6080cc5f: resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev 
* commit 'a4e10cc746caea514216f436e2065b3bbefb25ef':
  Fix the single crunch command to return the right error code.
 2013-01-15 14:50:37 -08:00
Scott Kennedy
ff5b73933a am 39ea055f: am 335da367: Merge "docs: Another fix for external 42607" into jb-mr1-dev 
* commit '39ea055f9e1b697db0dee197818be8de608e461f':
  docs: Another fix for external 42607
 2013-01-15 14:50:15 -08:00
Scott Main
946d68f3d0 am 9ac31a78: am ec171f3f: docs: add download ZIPs for chet\'s devbyte samples 
* commit '9ac31a78c85f2246cf49ff4a89a91e44375b1d56':
  docs: add download ZIPs for chet's devbyte samples
 2013-01-15 14:50:12 -08:00
Xavier Ducrohet
a4e10cc746 am 6080cc5f: resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev 
* commit '6080cc5fd7c332c79098a50605c0c37d99d4c481':
  Fix the single crunch command to return the right error code.
 2013-01-15 14:48:02 -08:00
Raph Levien
77b74d4f93 Attempt to resolve build breakage on x86 
If the scalblnf function is not available but scalbnf is, this patch
should fix the build.

Change-Id: Id83faba3298a44d57f4c924862a15c5d2bef3ca0
 2013-01-15 14:37:27 -08:00
Scott Kennedy
39ea055f9e am 335da367: Merge "docs: Another fix for external 42607" into jb-mr1-dev 
* commit '335da367a167d11eefb9d8127b9423093213bcc8':
  docs: Another fix for external 42607
 2013-01-15 14:29:20 -08:00
Xavier Ducrohet
6080cc5fd7 resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev 
Change-Id: I839981af97e54c39f0ea0b8141a4dd02959263a0
 2013-01-15 14:24:56 -08:00
Scott Kennedy
335da367a1 Merge "docs: Another fix for external 42607" into jb-mr1-dev 2013-01-15 14:24:24 -08:00
Chris Wren
59f733acc4 Merge "port system ui over to new ICU date formatting API." 2013-01-15 14:20:44 -08:00
Chris Wren
56018e577e port system ui over to new ICU date formatting API. 
Bug: 7288134
Change-Id: Icea2ff96fd91c6db66b3aad6f6653b21203351b1
 2013-01-15 17:14:48 -05:00
Victoria Lease
2f8b097ea1 Merge "fix NPE in updateClientUids" 2013-01-15 13:48:29 -08:00
Yorke Lee
be33f9696a Merge "Allow supplying extras when assigning QuickContactsBadge" 2013-01-15 11:26:20 -08:00
Raph Levien
7cd0859a73 Merge "Update framework text layout to use Harfbuzz NG" 2013-01-15 11:25:05 -08:00
Scott Main
5b61ad2a9e docs: put new devbytes playlist on the develop landing 
Change-Id: I7a9c936502a7d5caaa2d0588af3cbb1c790cc288
 2013-01-15 11:18:48 -08:00
Scott Main
9ac31a78c8 am ec171f3f: docs: add download ZIPs for chet\'s devbyte samples 
* commit 'ec171f3f48f49cffc49bf36d2d65a76489351034':
  docs: add download ZIPs for chet's devbyte samples
 2013-01-15 11:11:16 -08:00
Scott Main
ec171f3f48 docs: add download ZIPs for chet's devbyte samples 
Change-Id: I06ec87729afe2c5b161ae7877f2cc012db60db2f
 2013-01-15 11:03:49 -08:00
Xavier Ducrohet
dd52dfed52 am de3b69e0: Merge "Fix the single crunch command to return the right error code." into jb-mr1-dev 
* commit 'de3b69e0512c00158333a223f6c53c9eac7b3d34':
  Fix the single crunch command to return the right error code.
 2013-01-15 10:49:12 -08:00
Xavier Ducrohet
de3b69e051 Merge "Fix the single crunch command to return the right error code." into jb-mr1-dev 2013-01-15 10:45:29 -08:00
Victoria Lease
ea78b85bb7 fix NPE in updateClientUids 
Bug: 8009908
Change-Id: I54d97c587a3fa9d003f654f98fdfdbe21af791d6
 2013-01-15 10:39:28 -08:00
Xavier Ducrohet
c75d3f5c10 Fix the single crunch command to return the right error code. 
Casting from status_t to int doesn't work for return values
if the lower 8 bits are all 0.

Change-Id: I88e910dfe46cb72acd1595352e71da3c8eff4ca9
 2013-01-15 10:37:20 -08:00
Irfan Sheriff
77e843a305 Merge "Fix connectivitymanagertest" 2013-01-15 10:36:40 -08:00
Irfan Sheriff
f2488b6328 Fix connectivitymanagertest 
Change-Id: If5687eacec0f502c39b102eb5cf7d9383f0ec056
 2013-01-15 10:35:02 -08:00
Romain Guy
61840eb038 Merge "Preliminary Support for region clipping" 2013-01-15 10:25:00 -08:00
Irfan Sheriff
8217635056 Merge "Fix build" 2013-01-15 10:13:53 -08:00
Irfan Sheriff
86ee9640ee Fix build 
Change-Id: Ib9fd57c641e3bd2001c7c802f35d97e0cb849b8a
 2013-01-15 10:11:27 -08:00
Raph Levien
aaedde51b7 Update framework text layout to use Harfbuzz NG 
These are the frameworks changes to use the new version of Harfbuzz.

Change-Id: Idbef325e8fc1c27a9f2296414ddb1f79b778a00e
 2013-01-15 09:58:06 -08:00
Dirk Dougherty
fef45db2aa am f37d9c07: am b78714b5: am 5941ff03: am 9af5cf2b: am 20d47ca8: Doc change: add developer video to carousel and spotlight pages. 
* commit 'f37d9c07b258ceeea991801f9223ecf071debd08':
  Doc change: add developer video to carousel and spotlight pages.
 2013-01-15 09:37:04 -08:00
Baligh Uddin
4ed11353b3 Merge "Import translations. DO NOT MERGE" 2013-01-15 09:27:59 -08:00
Craig Mautner
07f943d417 Merge "Add Overrides, remove trailing whitespace." 2013-01-15 09:10:10 -08:00
Craig Mautner
6cfa7292cf Add Overrides, remove trailing whitespace. 
Once and for all.

Change-Id: I0835515696c1a8ec7dff719fb734cbbd0b4252d6
 2013-01-15 09:05:42 -08:00
Irfan Sheriff
92325abb2c Merge "Refactor enterprise config" 2013-01-15 09:02:59 -08:00
Irfan Sheriff
9b81319002 Refactor enterprise config 
Change-Id: I7104250e80317fce6164385701a7caffbcd14813
 2013-01-15 08:57:26 -08:00
Scott Kennedy
4aea83b1d1 docs: Another fix for external 42607 
Follow-up to If4215cef850ba8e4e8df356a68192566806e7914

Change-Id: I70a7a9f6a5be654b1fab9645c87da304b33aec5b
 2013-01-15 08:52:37 -08:00
Stefan Wysocki
1c15b8d896 Fix for truncated sentence in "Find on Page" field 
When typing a text in find on page, then deleting it again the
default text in the field "Find on Page" is truncated by
an invisible view.

This commit fixes the problem by setting the visibility of
mMatches view changes to View.GONE instead of View.INVISIBLE.

Change-Id: I9889f22a254cdabb0cbaba72bff4b14158e5c9ff
 2013-01-15 14:02:53 +01:00
Dirk Dougherty
f37d9c07b2 am b78714b5: am 5941ff03: am 9af5cf2b: am 20d47ca8: Doc change: add developer video to carousel and spotlight pages. 
* commit 'b78714b5dfc871fee251db125ec5e14f4e0aff5f':
  Doc change: add developer video to carousel and spotlight pages.
 2013-01-14 21:30:34 -08:00
Dirk Dougherty
b78714b5df am 5941ff03: am 9af5cf2b: am 20d47ca8: Doc change: add developer video to carousel and spotlight pages. 
* commit '5941ff03721005228072dca5b1c808cb5d12a001':
  Doc change: add developer video to carousel and spotlight pages.
 2013-01-14 21:28:11 -08:00
Dirk Dougherty
5941ff0372 am 9af5cf2b: am 20d47ca8: Doc change: add developer video to carousel and spotlight pages. 
* commit '9af5cf2b38d82d5ddda5ada67aab51314b473800':
  Doc change: add developer video to carousel and spotlight pages.
 2013-01-14 21:26:13 -08:00
Dirk Dougherty
9af5cf2b38 am 20d47ca8: Doc change: add developer video to carousel and spotlight pages. 
* commit '20d47ca81df71096fd74bc9205e0e2a744cb630a':
  Doc change: add developer video to carousel and spotlight pages.
 2013-01-14 21:24:16 -08:00
Dirk Dougherty
20d47ca81d Doc change: add developer video to carousel and spotlight pages. 
Change-Id: Ia12eb98f4d86edea72dfa1142d782ea24d3373f7
 2013-01-14 20:47:11 -08:00