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

164673 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
1696552f12 am 6e141199: am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs 
* commit '6e141199874f0c5603dee4fccc728412dad07d61':
  Doc change: distribute landing page.
 2015-04-18 23:32:46 +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
Sean Wan
b792f43301 Merge "DO NOT MERGE: Make wifi scan interval when disconnected configurable." into lmp-mr1-modular-dev 2015-04-17 23:45:37 +00:00
Sean Wan
79858a3260 DO NOT MERGE: Make wifi scan interval when disconnected configurable. 
Bug: 19335429
Change-Id: I167af190f0e448915f50d8edf853cf8a33646d44
 2015-04-17 16:08:59 -07:00
Joe Malin
f71f509af0 Docs: New swipe-to-refresh training guide. 
Doc-in-progress inherited from xoogler's (unfinished) CL
http://ag/427505 . See comments for staging location.

Patch set 1 is the version inherited from the xoogler; PS2 is after
my edits. Per a conversation with CB, I've removed the "ListFragment"
doc, and just put in a note about that topic in the
"add-swipe-refresh" doc.

Change-Id: Id1a1294b15c5a7363f650ea13237948b0effbc40
 2015-04-17 15:41:58 -07:00
Rich Slogar
c1002dfc52 am 71a616e0: am 203a4739: am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs 
* commit '71a616e05065e39a5a13b483b031a2040dc52eda':
  docs: studio remove gradle tasks dialog
 2015-04-17 17:27:13 +00:00
Rich Slogar
1252b4b869 am 61dd1dfd: am 684f3aa2: am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs 
* commit '61dd1dfda1e3f9d2c58a5d1719818b66134cadb9':
  docs: hierarchyviewer updates
 2015-04-17 17:27:07 +00:00
Rich Slogar
71a616e050 am 203a4739: am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs 
* commit '203a47395dfc17ba9e9b6b46c65bfbde002312f6':
  docs: studio remove gradle tasks dialog
 2015-04-17 17:14:48 +00:00
Rich Slogar
61dd1dfda1 am 684f3aa2: am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs 
* commit '684f3aa264e678affc1b33b27602493c96ee7eac':
  docs: hierarchyviewer updates
 2015-04-17 17:14:43 +00: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
a035dfbf8d More layoutlib tests. 
- Add another layout including more widgets and thus testing layoutlib
  better.
- Update targetSdk Version to 22.
- Handling of dynamic ids (@+id/) in LayoutLibTestCallback is buggy.
  Since this is not a problem in Studio, and this is not testing the
  callback, work around the issue by declaring the ids in
  values/ids.xml.

Change-Id: I457c105e8556c4df13cd86da2250fe5fd37843a8
 2015-04-16 15:50:31 -07:00
Filip Gruszczynski
4544b927d7 Hold a wake lock while dozing when wallpaper draws. 
This mimics what ViewRootImpl does before drawing.

Bug: 20242788
Change-Id: If85ad17113636f74267aedb3af04d0281b57ac0e
 2015-04-16 15:00:58 -07:00
Deepanshu Gupta
2bc2daa74e RecyclerView in LayoutLib: better XML attrs. 
- RecyclerView now supports XML attributes natively. Thus, remove the
   custom support via tools attribute. Users with older versions of
   RecyclerView should update.
 - Add Context.getPackageName() support used by RecyclerView.
 - Update SessionParamsFlags with the new changes and rename it to
   RenderParamsFlags.

The attribute behaves slightly different from the original tools
attribute. For usage, see commit 044b5b61e96 in frameworks/support.

Change-Id: I12073e37a2ba411558ca1d3e30c399e3d9a0b144
 2015-04-16 12:00:30 -07:00
Deepanshu Gupta
eca0b3d9ec Nullity annotations to some tests. 
Change-Id: I2939d7fab30f3b8fe32f2fdf720c630d677373ff
 2015-04-16 12:00:30 -07:00
Deepanshu Gupta
666748728f Fix title bar showing when not required. 
Bug: http://b.android.com/166383
Change-Id: I5ea051ffdbf9a2d73a83f62d56a0f4006b014348
 2015-04-16 11:59:04 -07:00
Deepanshu Gupta
1f3c7f3f50 am f18ceefc: am cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev 
* commit 'f18ceefcf0d3cc91e74737e0a93f16775e3bf18b':
  Update golden image for tests.
  Update to using LayoutlibCallback.
  Remove implementation of deprecated method.
  Add @empty support.
 2015-04-16 17:31:34 +00:00
Deepanshu Gupta
f18ceefcf0 am cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev 
* commit 'cd6e00c6d973af350f4bb0de5d85fed7e299d9e8':
  Update golden image for tests.
  Update to using LayoutlibCallback.
  Remove implementation of deprecated method.
  Add @empty support.
 2015-04-16 17:19:42 +00: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
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
726466c225 am 11002022: am 5b6e91a6: am af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs 
* commit '110020229e0a31b060a329dfe55181f98a31e802':
  docs: Add Cross-References to Material Design Spec
 2015-04-15 00:45:20 +00:00
Joe Fernandez
110020229e am 5b6e91a6: am af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs 
* commit '5b6e91a6717c4d6aa34adbbb2f2b5d6625c0802d':
  docs: Add Cross-References to Material Design Spec
 2015-04-14 20:14:32 +00: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
cda895c53d am c578bff7: am a80fc040: am 00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs 
* commit 'c578bff74acdaf103c05794f39acf9ea49e4621d':
  Doc change: add new pages for Designed for Families.
 2015-04-14 04:43:06 +00:00
Dirk Dougherty
c578bff74a am a80fc040: am 00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs 
* commit 'a80fc040ea814af2a1d3f2cbfa5efb8eaa898697':
  Doc change: add new pages for Designed for Families.
 2015-04-14 04:33:27 +00: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
2f0dc15519 am 2c871d2c: am 17781b68: am 473989c3: Merge "Update "Investigating your RAM usage" for ART" into lmp-docs 
* commit '2c871d2cce8e926c5300fdee33526eeb5e81810c':
  Update "Investigating your RAM usage" for ART
 2015-04-13 21:10:29 +00:00
smain@google.com
2b92e18b4b am 76c9e47e: am 4301dd04: am d60649c5: Merge "initial batch of NDK files for skeleton site build" into lmp-docs 
* commit '76c9e47e9fb7e81a6bbebeee83a77efb55799b23':
  initial batch of NDK files for skeleton site build
 2015-04-13 21:10:15 +00:00
Mathieu Chartier
2c871d2cce am 17781b68: am 473989c3: Merge "Update "Investigating your RAM usage" for ART" into lmp-docs 
* commit '17781b68df70a9c0bc446d91739be651d4c9a9e3':
  Update "Investigating your RAM usage" for ART
 2015-04-13 20:57:26 +00:00
smain@google.com
76c9e47e9f am 4301dd04: am d60649c5: Merge "initial batch of NDK files for skeleton site build" into lmp-docs 
* commit '4301dd0458a0789f6cc841d9e8b18e645e73c05d':
  initial batch of NDK files for skeleton site build
 2015-04-13 20:57:22 +00: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