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

160731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Leon Scroggins III
38cf068c04 am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit '16ac8ad7fac73524b5296f955884bd2aec405ded':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-24 17:15:43 +00:00
Andrew Solovay
44fa5e71ab am 5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs 
* commit '5b3152cffcd90441ca4cacdf5596e9bb3428af08':
  Docs: Correcting section on how to escape quotes in strings.
 2015-04-23 20:18:51 +00:00
Andrew Solovay
5b3152cffc Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs 2015-04-23 20:06:34 +00:00
Andrew Solovay
7a866a8831 am 09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs 
* commit '09cf4d500dd27342c913d2333f4f0fd2fa9dbfd0':
  docs: Update to doc on listening for restrictions-changed intent
 2015-04-23 18:31:59 +00:00
Andrew Solovay
09cf4d500d Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs 2015-04-23 18:20:07 +00:00
Leon Scroggins III
16ac8ad7fa am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit '4a6ca6724c789603626d74a8cc187365788a6cfd':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-23 15:53:24 +00:00
Svet Ganov
00e91901fd Merge "DO NOT MERGE Don't take flags when creating app widget config activity." into lmp-mr1-dev 2015-04-23 15:09:48 +00:00
Quddus Chong
d57ccb8d3c am f0936e2f: Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs 
* commit 'f0936e2fb0e9f013f6079e7a733a41d42d49c3f3':
  docs: Added 3rd-party Javadocs for GMS Parmesan release.
 2015-04-22 23:48:00 +00:00
Quddus Chong
7a8b094521 am 789c5971: Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs 
* commit '789c59711e55be981ed2093228ded0c588e74ba0':
  docs: Added What's New section for GMS v7.3 (Parmesan).
 2015-04-22 23:47:55 +00:00
Quddus Chong
f0936e2fb0 Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs 2015-04-22 23:38:38 +00:00
Quddus Chong
789c59711e Merge "docs: Added What's New section for GMS v7.3 (Parmesan)." into lmp-docs 2015-04-22 23:37:33 +00:00
Quddus Chong
cfdcf7d6d8 docs: Added What's New section for GMS v7.3 (Parmesan). 
Change-Id: Ie56171262f866b1f312db5cefaec849353a1c541
 2015-04-22 14:56:37 -07:00
Luan Nguyen
1cc5663357 am 33ac358a: docs: Add Wear Capability training 
* commit '33ac358a5a4199549d11ba1931243e7dc8a7ab85':
  docs: Add Wear Capability training
 2015-04-21 22:40:59 +00:00
Luan Nguyen
33ac358a5a docs: Add Wear Capability training 
bug: 20088602
Change-Id: I52ede5d91936c5eab3d6ee8be8108004cce1f0e0
 2015-04-21 08:24:49 -07:00
Luan Nguyen
4c20df0bbe am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs 
* commit '4aebbfbb9ba54d77ac99508fb66db6c9fd24343a':
  docs: Add Channel API summary for Wear.
 2015-04-21 15:00:56 +00:00
Luan Nguyen
4aebbfbb9b Merge "docs: Add Channel API summary for Wear." into lmp-docs 2015-04-21 14:53:04 +00:00
Quddus Chong
220f360e02 am 900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402 
* commit '900831f303beb4a67a871d969ac822d8b6d36460':
  docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402
 2015-04-20 22:51:40 +00:00
Quddus Chong
900831f303 docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. 
bug: 20304402

Change-Id: I0fab71be55f5c3c6d017ba585b92f8493050274a
 2015-04-20 14:01:24 -07:00
Quddus Chong
33fca8eae0 docs: Added 3rd-party Javadocs for GMS Parmesan release. 
Change-Id: Ia133c7267e500969310524369d34ab07c6aaa854
 2015-04-20 11:21:55 -07:00
Svet Ganov
68e6b5055b DO NOT MERGE Don't take flags when creating app widget config activity. 
bug:19618745

Change-Id: I7973ebfc67ebf52f14890dda9eb891a7b8a5a095
 2015-04-20 17:16:38 +00:00
Ryosuke Matsuuchi
558907f702 am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs 
* commit '0d2f280310458d23618edf6550818f8f9cfa6b47':
  doc: Add Korean version of DAC/distribute/ page.
 2015-04-19 00:22:51 +00:00
Ryosuke Matsuuchi
0d2f280310 Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs 2015-04-19 00:15:12 +00:00
Dirk Dougherty
6e14119987 am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs 
* commit 'ff233af75f2201c2724f8b388c39d3abeb8c6a2e':
  Doc change: distribute landing page.
 2015-04-18 23:22:48 +00:00
Dirk Dougherty
ff233af75f Merge "Doc change: distribute landing page." into lmp-docs 2015-04-18 23:11:42 +00:00
Dirk Dougherty
1792ec17b8 Doc change: distribute landing page. 
Change-Id: I7442760c79d2037c9ee51f52ebd15d8373b7e1be
 2015-04-18 16:00:23 -07:00
Rich Slogar
203a47395d am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs 
* commit '1fcc6bd854f6e152cf8796a4a70965e350c3bdcf':
  docs: studio remove gradle tasks dialog
 2015-04-17 17:03:04 +00:00
Rich Slogar
684f3aa264 am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs 
* commit 'efe861a4a7081da795fe6a0843308ca7cef26277':
  docs: hierarchyviewer updates
 2015-04-17 17:02:59 +00:00
Rich Slogar
1fcc6bd854 Merge "docs: studio remove gradle tasks dialog" into lmp-docs 2015-04-17 16:53:34 +00:00
Rich Slogar
efe861a4a7 Merge "docs: hierarchyviewer updates" into lmp-docs 2015-04-17 16:52:45 +00:00
Luan Nguyen
b5890f9b45 docs: Add Channel API summary for Wear. 
bug: 20089257
Change-Id: I447e58264e142a5e04aaf520d31dc4ced2506ecb
 2015-04-17 09:12:16 -07:00
Ryosuke Matsuuchi
19a7b54619 doc: Add Korean version of DAC/distribute/ page. 
Bug: 20204101
Change-Id: I5a4795dd03ca4f904c26ce6138eb98d085dd3deb
 2015-04-17 10:57:31 +09:00
Deepanshu Gupta
cd6e00c6d9 Merge changes from topic 'layoutlib-api-15' into lmp-mr1-dev 
* changes:
  Update golden image for tests.
  Update to using LayoutlibCallback.
  Remove implementation of deprecated method.
  Add @empty support.
 2015-04-16 17:12:45 +00:00
Leon Scroggins III
4a6ca6724c 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: Iab0d218c41ae0c39606e333e44cda078eef32291
 2015-04-16 15:38:03 +00:00
Deepanshu Gupta
54862febaf Update golden image for tests. 
Change-Id: If07edcbfb7016a6b80f4bd00cffab494f74bfc03
 2015-04-15 18:20:57 -07:00
Deepanshu Gupta
37dbb8b7f3 Update to using LayoutlibCallback. 
Change-Id: Ia89d418b0d40ca8efef8968a4a2a635616b945ac
 2015-04-15 18:20:56 -07:00
Deepanshu Gupta
49ce36e175 Remove implementation of deprecated method. 
BridgeResources.getDrawable(int) is not needed anymore, since the super
method is deprecated and it calls the alternative
getDrawable(int, Theme), which we override.

Change-Id: I00c0bfaef6c4167a787bb74990b91cebb951c847
 2015-04-15 18:20:55 -07:00
Deepanshu Gupta
9ca9774726 Add @empty support. 
Bug: http://b.android.com/162428
Change-Id: Id7a981de2fce21213e12cdabcce4104f146fd4d3
 2015-04-15 18:20:47 -07:00
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
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