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

160900 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rich Slogar
f9f81b49d0 docs: hierarchyviewer updates 
b/19955159

Change-Id: I77da54048765eeb768ec59a0ce0cbe40d0ba9715
 2015-04-15 15:48:35 -07:00
Rich Slogar
caa15d49f9 docs: studio remove gradle tasks dialog 
Change-Id: If7517f49307a1e27b1d4053bd49ccdb07ffb758e
 2015-04-15 10:30:18 -07:00
Diego Perez
2d3449f982 Make sure shaders use a color model compatible with the destination. 
Change-Id: Iaf6e14bb86835c36a5b0c37519ac2ee794d10081
(cherry picked from commit 158ac454073a460375123d7d05152a7c6490efb6)
 2015-04-15 14:23:09 +00:00
Leon Scroggins III
69b8e962e1 Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
When reading from the parcel, if the number of colors is invalid, early
exit.

Add two more checks: setInfo must return true, and Parcel::readInplace
must return non-NULL. The former ensures that the previously read values
(width, height, etc) were valid, and the latter checks that the Parcel
had enough data even if the number of colors was reasonable.

Also use an auto-deleter to handle deletion of the SkBitmap.

Cherry pick from change-Id: Icbd562d6d1f131a723724883fd31822d337cf5a6

BUG=19666945

Change-Id: I9490d90244e051a4019d6266b2a1cb375a65198f
 2015-04-15 08:16:29 -04:00
Joe Fernandez
5b6e91a671 am af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs 
* commit 'af5f200038d377033a5c22e6f93bc49a9e67444d':
  docs: Add Cross-References to Material Design Spec
 2015-04-14 20:04:56 +00:00
Joe Fernandez
af5f200038 Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs 2015-04-14 19:55:36 +00:00
Joe Fernandez
49ca2de88a docs: Add Cross-References to Material Design Spec 
Change-Id: I6945f2234beb21b368a64ecad7a1680447310d5c
 2015-04-14 12:53:12 -07:00
Dirk Dougherty
a80fc040ea am 00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs 
* commit '00f857c5a132555774bd286c254dade281473427':
  Doc change: add new pages for Designed for Families.
 2015-04-14 04:22:27 +00:00
Dirk Dougherty
00f857c5a1 Merge "Doc change: add new pages for Designed for Families." into lmp-docs 2015-04-14 04:12:57 +00:00
Dirk Dougherty
f802cc02a2 Doc change: add new pages for Designed for Families. 
Change-Id: I9bda34abf7b045213c0fcb7f044ee86155900808
 2015-04-13 20:23:18 -07:00
Mathieu Chartier
17781b68df am 473989c3: Merge "Update "Investigating your RAM usage" for ART" into lmp-docs 
* commit '473989c35d9f0a42c6e7d3a56004dc76676b65b5':
  Update "Investigating your RAM usage" for ART
 2015-04-13 20:52:51 +00:00
smain@google.com
4301dd0458 am d60649c5: Merge "initial batch of NDK files for skeleton site build" into lmp-docs 
* commit 'd60649c541931a5a9e5972cdceac48b9042eaff4':
  initial batch of NDK files for skeleton site build
 2015-04-13 20:44:52 +00:00
Mathieu Chartier
473989c35d Merge "Update "Investigating your RAM usage" for ART" into lmp-docs 2015-04-13 20:44:18 +00:00
smain@google.com
d60649c541 Merge "initial batch of NDK files for skeleton site build" into lmp-docs 2015-04-13 20:32:38 +00:00
smain@google.com
0178321af6 initial batch of NDK files for skeleton site build 
Change-Id: I00152e817377c072f529940743499a3b6d91f80d
 2015-04-13 12:51:19 -07:00
Rich Slogar
3e664c3bda am bdc20109: Merge "docs: systrace update" into lmp-docs 
* commit 'bdc20109208d16144cd052b281e25e6e243b2547':
  docs: systrace update
 2015-04-13 18:30:38 +00:00
Rich Slogar
6656ea4607 am 880460a7: Merge "docs: nexus usb driver update" into lmp-docs 
* commit '880460a704c79b0d81c1aa8af9b3c163c8adf16d':
  docs: nexus usb driver update
 2015-04-13 18:30:33 +00:00
Rich Slogar
c0559808ee am a7ade2f7: Merge "docs: remove adb install option" into lmp-docs 
* commit 'a7ade2f7f0c496cb12edfc4ae805fd08c9c2359d':
  docs: remove adb install option
 2015-04-13 18:30:29 +00:00
Rich Slogar
bdc2010920 Merge "docs: systrace update" into lmp-docs 2015-04-13 18:14:06 +00:00
Rich Slogar
880460a704 Merge "docs: nexus usb driver update" into lmp-docs 2015-04-13 18:13:47 +00:00
Rich Slogar
a7ade2f7f0 Merge "docs: remove adb install option" into lmp-docs 2015-04-13 18:13:10 +00:00
Mathieu Chartier
2c957d4cb9 Update "Investigating your RAM usage" for ART 
Bug: 19884954
Change-Id: I9a987c7bb0ab2a9d8b2ac870796969f073803d56
(cherry picked from commit d92c6bde3fc61e1ea90c54e4fd19d72f0b1a3987)
 2015-04-13 17:29:15 +00:00
Mathieu Chartier
f2a4968b3f Merge "Update "Investigating your RAM usage" for ART" into lmp-mr1-dev 2015-04-13 17:29:02 +00:00
David Friedman
746fed6356 am 3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs 
* commit '3a77a8aeea1a40ca5c2cdb0b66a877032118d89f':
  New build rule reflecting different masthead, side nav for NDK minisite.
 2015-04-11 01:46:19 +00:00
David Friedman
3a77a8aeea Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs 2015-04-11 01:36:57 +00:00
Mathieu Chartier
d92c6bde3f Update "Investigating your RAM usage" for ART 
Bug: 19884954
Change-Id: I9a987c7bb0ab2a9d8b2ac870796969f073803d56
 2015-04-10 18:34:51 -07:00
Rich Slogar
9d6e95879a am 36e3f512: Merge "docs: remove studio proguard settings from play services" into lmp-docs 
* commit '36e3f5125895875c63242294da289ca4b09c9f9e':
  docs: remove studio proguard settings from play services
 2015-04-09 17:47:40 +00:00
Rich Slogar
36e3f51258 Merge "docs: remove studio proguard settings from play services" into lmp-docs 2015-04-09 17:39:29 +00:00
Andrew Solovay
3aba19a6c0 Docs: Correcting section on how to escape quotes in strings. 
The behavior for single and double-quotes is different--I expanded
this section to note how they differ.

(New version of a Gerrit CL I abandoned because of a commit mess-up.)

See first comment for doc stage location.

bug: 19959941
Change-Id: I417546a473f0ebe76a6e4102b87883a85365ac26
 2015-04-08 12:00:42 -07:00
Quddus Chong
c61fd05581 am ff4c6325: Merge "cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e" into lmp-docs 
* commit 'ff4c632592cce177997d63b3ff81c0b2be9cf9bb':
  cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e
 2015-04-08 18:27:56 +00:00
Quddus Chong
ff4c632592 Merge "cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e" into lmp-docs 2015-04-08 18:16:58 +00:00
Quddus Chong
0e3547bd44 cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. 
bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e

Change-Id: I48d1e2f8e1f7d94dffac61a274f9c1a2df31a822
 2015-04-08 10:59:27 -07:00
Quddus Chong
f0ab39c10b Merge "Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873" into lmp-mr1-dev 2015-04-08 17:46:21 +00:00
Eric Gilmore
a4f72eb079 am aac938a8: Merge "Fixing date." into lmp-docs 
* commit 'aac938a8597efb8d71ce7dc124779f1d268510eb':
  Fixing date.
 2015-04-08 00:33:07 +00:00
Eric Gilmore
aac938a859 Merge "Fixing date." into lmp-docs 2015-04-08 00:05:28 +00:00
Quddus Chong
a9f6a9b769 Fixed broken link in UiAutomation.setRunAsMonkey() method description. 
bug: 19711873

Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e
 2015-04-07 13:04:39 -07:00
Eric Gilmore
4480bdad95 Fixing date. 
Change-Id: Ia406bec97cda0ae309abbb8c538ad4ea3b4e9d42
 2015-04-07 11:58:52 -07:00
Quddus Chong
922946ea75 am a0c887c6: docs: Fixed typo in Implementing In-app Billing guide. bug: 19961296 
* commit 'a0c887c67e5d925247fcb77d714ccc3383c0d0da':
  docs: Fixed typo in Implementing In-app Billing guide. bug: 19961296
 2015-04-07 18:58:07 +00:00
Quddus Chong
a0c887c67e docs: Fixed typo in Implementing In-app Billing guide. 
bug: 19961296

Change-Id: If170b58feb6d7160790591b540cdb91d7c23d6e5
 2015-04-07 11:48:30 -07:00
David Friedman
1adf4958e8 New build rule reflecting different masthead, side nav for NDK minisite. 
Change-Id: I81b50cca405d907cf8a6514356b92e38b6808d3c
 2015-04-07 11:45:54 -07:00
Quddus Chong
868c795dd2 am 0307acf9: Merge "docs: Removed instruction to add gms version in manifest during Google Play services setup, since Android Studio automatically handles this. bug: 20077293" into lmp-docs 
* commit '0307acf90773a16faa6b33dad12b14b95708a3cc':
  docs: Removed instruction to add gms version in manifest during Google Play services setup, since Android Studio automatically handles this. bug: 20077293
 2015-04-07 18:40:32 +00:00
Quddus Chong
0307acf907 Merge "docs: Removed instruction to add gms version in manifest during Google Play services setup, since Android Studio automatically handles this. bug: 20077293" into lmp-docs 2015-04-07 18:31:45 +00:00
Joe Fernandez
19a57761b4 am 95c39774: docs: Small fix for Android Dashboard 
* commit '95c39774d245921be04b2a6f0f221f86545f8ac6':
  docs: Small fix for Android Dashboard
 2015-04-07 18:31:03 +00:00
Quddus Chong
31864381d3 docs: Removed instruction to add gms version in manifest during Google Play services setup, since Android Studio automatically handles this. 
bug: 20077293

Change-Id: Ie1148e751b9d22e5e7a1abad819c19a4c0b9c6b7
 2015-04-07 11:30:09 -07:00
Joe Fernandez
ab8828564c am b1a6bd01: docs: April 2015 Android Dashboard update 
* commit 'b1a6bd01bc278f4f6c6a656925e37b998d93f143':
  docs: April 2015 Android Dashboard update
 2015-04-07 18:18:55 +00:00
Joe Fernandez
95c39774d2 docs: Small fix for Android Dashboard 
Change-Id: I33f3b8b4a7b7abdf16bb5fc4964c51f2809f6c3d
 2015-04-07 11:18:00 -07:00
Joe Fernandez
b1a6bd01bc docs: April 2015 Android Dashboard update 
Change-Id: I7ddd526209cb41cc8944ea5bd99a32021ab343fa
 2015-04-07 11:07:53 -07:00
Matthew Williams
28358eaed2 Merge "Fixing to fail android.JobScheduler.TimingConstraintsTest#testSchedulePeriodic in TV test." into lmp-mr1-dev 2015-04-06 20:22:22 +00:00
Quddus Chong
d642f82975 am 54dee349: docs: Fixed broken urls in the UI testing training main page and revised intro to the \'Testing UI for a Single App\' class. 
* commit '54dee349976eaafe7df3a2bb48e9fce2b964a7f0':
  docs: Fixed broken urls in the UI testing training main page and revised intro to the 'Testing UI for a Single App' class.
 2015-04-04 00:29:11 +00:00
Quddus Chong
54dee34997 docs: Fixed broken urls in the UI testing training main page and revised intro to the 'Testing UI for a Single App' class. 
Change-Id: I0e2a49b639101a7607e8e90cf830d9d449ad6328
 2015-04-03 17:17:04 -07:00