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

122914 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Prashant Malani
645e017ca5 Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev 2014-10-15 17:02:02 +00:00
Ricardo Cervera
dc1f308048 am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs 
* commit '8a7ba4c681d16aab194e1c4ab7b7bfcce5012d17':
  docs: Fixing notify link. Bug: 17571861
 2014-10-15 15:50:42 +00:00
Ricardo Cervera
8a7ba4c681 Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs 2014-10-15 15:47:31 +00:00
Luan Nguyen
c07a288a88 am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs 
* commit '2a364235d27245d999bb1d6e7621c0d6a0e89ef0':
  docs: Android Wear Design fixes
 2014-10-15 15:17:40 +00:00
Luan Nguyen
2a364235d2 Merge "docs: Android Wear Design fixes" into klp-modular-docs 2014-10-15 15:12:24 +00:00
smain@google.com
e43bb6a9ec am 075531ae: add the butterbar for L announce to Preview landing page 
* commit '075531ae190dd6e64d3a53991a209a624cb0ec63':
  add the butterbar for L announce to Preview landing page
 2014-10-15 03:36:11 +00:00
smain@google.com
075531ae19 add the butterbar for L announce to Preview landing page 
Change-Id: Id84a5a62153281b3daaefc287450d392ecb51bbc
 2014-10-14 19:39:11 -07:00
smain@google.com
6fbe299fa5 am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 
* commit 'd8d20f52ec0550477b773cee4c0f0343f2a9301f':
  update analytics event tracking calls to use new script bug: 16331906
 2014-10-15 02:15:35 +00:00
smain@google.com
d8d20f52ec update analytics event tracking calls to use new script 
bug: 16331906

Change-Id: I4cd8f08509cfb887a424696553404ba3c635151b
 2014-10-14 19:03:08 -07:00
Craig Mautner
1559d9d15f DO NOT MERGE Add empty ArrayList check. 
Fixes bug 15768779.
Fixes bug 17955259.

Change-Id: I3e4c48aa0fff99025e9ba1725e3d1f3523749dbd
 2014-10-15 01:30:10 +00:00
Ricardo Cervera-Navarro
c93723bdf9 am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs 
* commit '7668aa27999e5650fe8776853565f792311fb57d':
  Revert "docs: Watermarked images for codes that weren't found."
 2014-10-14 22:20:02 +00:00
Ricardo Cervera-Navarro
7668aa2799 am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs 
* commit 'aa7bcf140d95049f1482c896b770de7ba339f7c9':
  Revert "docs: Watermarked images for codes that weren't found."
 2014-10-14 22:14:16 +00:00
Ricardo Cervera-Navarro
aa7bcf140d Merge "Revert "docs: Watermarked images for codes that weren't found."" into klp-docs 2014-10-14 21:59:48 +00:00
Ricardo Cervera-Navarro
0813e29817 Revert "docs: Watermarked images for codes that weren't found." 
Remove easter eggs.

This reverts commit 453df8e6e33f30808ea2244eaa1dd32169996129.

Change-Id: Iaa8c815a876d163c35cc83f3cf4899dd426def7b
 2014-10-14 15:49:07 +00:00
Rich Slogar
858cfad948 am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs 
* commit 'a3287768e267f71fbce5d3341b6db8f3a9e04230':
  docs:SDK tools 23.0.5 Release Note
 2014-10-10 21:23:51 +00:00
Rich Slogar
a3287768e2 Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs 2014-10-10 21:19:08 +00:00
Eric Gilmore
a4eb81b67c am e77fe607: Docs: adding closing bracket to un-break javadoc tokens. 
* commit 'e77fe607609e5a6ea59e11164e21744623cf07a5':
  Docs: adding closing bracket to un-break javadoc tokens.
 2014-10-10 20:49:54 +00:00
Rich Slogar
309b1b384c docs:SDK tools 23.0.5 Release Note 
Change-Id: Ib26f100247d3b8b6f0447251a35fa427393c9938
 2014-10-10 11:19:59 -07:00
Eric Gilmore
e77fe60760 Docs: adding closing bracket to un-break javadoc tokens. 
Bug: 17186958

Change-Id: Ib21120d71ccd7c59536af3d26d7090fc919bec17
 2014-10-09 10:17:59 -07:00
Joe Fernandez
a63f81ec89 am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs 
* commit 'e15773be4837baf15079d5d7e8f8c0c09cef952f':
  docs: Android TV publishing requirements
 2014-10-09 12:01:36 +00:00
Joe Fernandez
e15773be48 Merge "docs: Android TV publishing requirements" into klp-modular-docs 2014-10-09 04:19:20 +00:00
Joe Fernandez
1b361d90d3 docs: Android TV publishing requirements 
Change-Id: If1105cb596934034a7156b573c99905bbe6c4978
 2014-10-08 20:56:32 -07:00
Fred Fettinger
b4093c12f8 hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE 
Cherry-picked into klp-modular-dev.

bug:17441218

GLConsumer uses glBindTexture() directly instead of going through
Caches::bindTexture(). This can cause libhwui to draw with the wrong
texture bound in the following case which involves 2 TextureViews:

Frame 1:
GLConsumer::updateTexImage() calls glBindTexture(GL_TEXTURE_EXTERNAL_OES, 1)
HWUI renders TextureView A:
    calls Caches::bindTexture(GL_TEXTURE_EXTERNAL_OES, 1) and draws

Frame 2:
GLConsumer::updateTexImage() calls glBindTexture(GL_TEXTURE_EXTERNAL_OES, 1)
GLConsumer::updateTexImage() calls glBindTexture(GL_TEXTURE_EXTERNAL_OES, 2)
HWUI renders TextureView A:
    calls Caches::bindTexture(GL_TEXTURE_EXTERNAL_OES, 1) and draws
HWUI renders TextureView B:
    calls Caches::bindTexture(GL_TEXTURE_EXTERNAL_OES, 2) and draws

In this case, HWUI will incorrectly draw TextureView A using texture 2 on
frame 2, because mBoundTextures[0]=1, even though the texture currently
bound to GL_TEXTURE_EXTERNAL_OES is 2.

Since GLConsumer is always used with a target of GL_TEXTURE_EXTERNAL_OES,
work around this problem by having mBoundTextures[] store only the
textures bound to the target GL_TEXTURE_2D. This is the common case
where the extra performance is needed. Since it's legal to have
different textures bound to GL_TEXTURE_2D and GL_TEXTURE_EXTERNAL_OES
on one texture unit, Caches::bindTexture() does not need to clear
mBoundTextures[mTextureUnit] when target != GL_TEXTURE_2D.

Change-Id: I8bc54ab8adcfacad7f3ed17a31236dc7a86c967a
Signed-off-by: Fred Fettinger <fred.fettinger@motorola.com>
(cherry picked from commit e4de36bbc2baf13206deb53ced39f0befadb1861)
 2014-10-09 00:57:17 +00:00
smain@google.com
63cd4977fd am 770c3c5e: fix unclickable link due to overlay from offset dev below 
* commit '770c3c5ed52f354fe04ced31aaa56ba57a028955':
  fix unclickable link due to overlay from offset dev below
 2014-10-09 00:04:57 +00:00
smain@google.com
770c3c5ed5 fix unclickable link due to overlay from offset dev below 
Change-Id: I59bedd0e928d578a3bd030caa4add4cfa96db83f
 2014-10-08 16:54:21 -07:00
Quddus Chong
9df3d67bdc am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014. 
* commit '7f567e4a1c561f60c6d31f6709508f5ec5a6ba88':
  docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
 2014-10-08 18:01:05 +00:00
Quddus Chong
7f567e4a1c docs: Changed date of GMS v6.1 (Manchego) release to October 2014. 
Change-Id: I710c0eab6913988d8bc70ded344a2d60fa594d92
 2014-10-08 10:51:21 -07:00
Deepanshu Gupta
4f133894a6 Exclude KXmlParser from LayoutLib. 
The class was incorrectly being included in the LayoutLib.

Change-Id: I3c86662efa068019fe9165f2fc49a00d0a1b7f2d
 2014-10-08 10:12:11 -07:00
Joe Fernandez
59c04ece56 am bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-modular-docs 
* commit 'bcd1af39fa674dcc46ddb30778304eaf67100a13':
  docs: Wear UI Lib training fixes
 2014-10-08 14:45:59 +00:00
Joe Fernandez
bcd1af39fa Merge "docs: Wear UI Lib training fixes" into klp-modular-docs 2014-10-08 14:37:35 +00:00
Deepanshu Gupta
11b14e3996 LayoutLib: Use ICU's line break algo. [DO NOT MERGE] 
Change-Id: I7e5b0ab7423a72f5a4b0e1163d0a537f0b03ba07
(cherry picked from commit 760f6394d0f65fbb5365186e8e068d53c506b653)
 2014-10-08 02:05:05 +00:00
Rich Slogar
916a6ea303 am 6af8fc7f: Merge "docs:64 bit image and skd update" into klp-modular-docs 
* commit '6af8fc7f89cb5dec15c23ee04c271188ff11138d':
  docs:64 bit image and skd update
 2014-10-08 00:34:38 +00:00
Rich Slogar
6af8fc7f89 Merge "docs:64 bit image and skd update" into klp-modular-docs 2014-10-08 00:31:43 +00:00
Quddus Chong
bb5a184872 am 8730092a: Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs 
* commit '8730092af798d27b9e9a9a4ba00cef0d3ebea55f':
  docs: Added API highlights for Google Play services 6.1 (Manchego).
 2014-10-07 23:33:10 +00:00
Quddus Chong
bf29d69780 am 6628e602: Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs 
* commit '6628e602fb616355db8272a697a7004d91f485b8':
  Updataed Google Play services Javadocs for v6.1 (Manchego) release.
 2014-10-07 23:33:03 +00:00
Quddus Chong
8730092af7 Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs 2014-10-07 23:27:02 +00:00
Quddus Chong
6628e602fb Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs 2014-10-07 23:26:49 +00:00
Rich Slogar
1b0fba6478 docs:64 bit image and skd update 
Change-Id: I53d3d8e8714cb4689ba80766b155fb1b3ea93484
 2014-10-07 11:40:27 -07:00
Ricardo Cervera
a18075e82b am bd964cad: docs: Removing references to self note on Common Intents page. 
* commit 'bd964cadd4846d5d954eadb7fcd2a61e51814c65':
  docs: Removing references to self note on Common Intents page.
 2014-10-07 18:38:24 +00:00
Ricardo Cervera
bd964cadd4 docs: Removing references to self note on Common Intents page. 
Change-Id: Ia1324f2363ce66ad0019946605a6a74a4cd28ecc
 2014-10-07 10:37:19 -07:00
Ricardo Cervera
6d30f57614 am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs 
* commit '3f7b4d8ff385ce30c6c266f8b0418fc621db2da8':
  docs: Update Common Intents page with Google Now actions
 2014-10-07 04:49:17 +00:00
Ricardo Cervera
3f7b4d8ff3 Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs 2014-10-07 04:41:13 +00:00
Ricardo Cervera
cee4ed8a1d docs: Update Common Intents page with Google Now actions 
Change-Id: I474539d37791b16df693193bcdaee4e2161a2612
 2014-10-06 19:16:06 -07:00
Luan Nguyen
4cd6d42cc7 docs: Android Wear Design fixes 
Change-Id: I258705082e32eb5633907bdf2ea5b4a5e4be69cb
 2014-10-06 07:55:34 -07:00
Quddus Chong
4be6fdebdd am ba2199fa: Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs 
* commit 'ba2199fa8c369d9627a216a4c3ea19497bf9e9c7':
  docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API.
 2014-10-04 01:30:43 +00:00
Quddus Chong
ba2199fa8c Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs 2014-10-04 01:20:14 +00:00
Ricardo Cervera
0e61e44ddf am 2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs 
* commit '2a02b8813bd6bfd3d36cca6e5e3a3ff6a868d881':
  docs: Training class for the Wearable UI Library
 2014-10-04 00:01:21 +00:00
Rich Slogar
64460a2b6e am 83d5c9bf: docs:change required ADT version to 23.0.2 
* commit '83d5c9bfbd75831375009e21989de40368afc04a':
  docs:change required ADT version to 23.0.2
 2014-10-04 00:01:17 +00:00
Ricardo Cervera
3ffe146151 docs: Wear UI Lib training fixes 
Change-Id: I8d4610b68218455b8a00a34a101cee1f0d945633
 2014-10-03 16:43:25 -07:00
Ricardo Cervera
2a02b8813b Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs 2014-10-03 23:25:24 +00:00