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

178116 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
9b1ac26921 am 1754824c: am c96ef952: Add documentation about hack in commit: f8ea750455 [DO NOT MERGE] 
* commit '1754824c2835d6f3a17c4a2c0ab668991797fcf9':
  Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]
 2015-08-26 20:18:47 +00:00
Deepanshu Gupta
6b7f9ae6f5 am 678f0ea2: am b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE] 
* commit '678f0ea2ba47f06387670e9f75b13637a6446899':
  Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
 2015-08-26 20:18:34 +00:00
Deepanshu Gupta
d6363d8606 am 2e57c1e2: am cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE] 
* commit '2e57c1e23f43bb0ede6280720559ccc1e866024b':
  Inject anonymous inner classes of injected classes [DO NOT MERGE]
 2015-08-26 20:18:27 +00:00
Deepanshu Gupta
5b886bb08f am 899daf75: am d7e89906: Update platformDir search in tests. [DO NOT MERGE] 
* commit '899daf759e02bef0de14dc1a14b96b4d71f0b9fc':
  Update platformDir search in tests. [DO NOT MERGE]
 2015-08-26 20:18:15 +00:00
Deepanshu Gupta
aae9c9309c am 2f50403f: am afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE] 
* commit '2f50403fe0a8a035757b047af00c7520fadb9015':
  Make Context.getClassLoader() work. [DO NOT MERGE]
 2015-08-26 20:18:09 +00:00
Deepanshu Gupta
522e67e4ac am de3ac8f9: am 92480a9a: Fix include tag rendering. [DO NOT MERGE] 
* commit 'de3ac8f9fc5987ac1f1223da02b4275fdbae3d56':
  Fix include tag rendering. [DO NOT MERGE]
 2015-08-26 20:18:04 +00:00
Deepanshu Gupta
8df6131ac1 am 50e1406a: am f6b08547: Show better error message for color attr not found. [DO NOT MERGE] 
* commit '50e1406a4ad668179a9a3d28c58d68c0eee44237':
  Show better error message for color attr not found. [DO NOT MERGE]
 2015-08-26 20:17:51 +00:00
Deepanshu Gupta
59f026e937 am 81990c3f: am b1370c26: Fix build: udpate parser factory method [DO NOT MERGE] 
* commit '81990c3f988369c755590288b93508e30024c56c':
  Fix build: udpate parser factory method [DO NOT MERGE]
 2015-08-26 20:17:46 +00:00
Deepanshu Gupta
b44f7fda75 am 0a07bb95: am aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE] 
* commit '0a07bb95a1dd94c3457860a934d3ee546919cff2':
  Don't keep LayoutlibCallback reference. [DO NOT MERGE]
 2015-08-26 20:17:40 +00:00
Deepanshu Gupta
78d77bc379 am bbbdc2ad: am 5c90c4f4: Remove kxml dependency [DO NOT MERGE] 
* commit 'bbbdc2ad8939c28828a8441c0b24812c53a9eb66':
  Remove kxml dependency [DO NOT MERGE]
 2015-08-26 20:17:34 +00:00
Deepanshu Gupta
1754824c28 am c96ef952: Add documentation about hack in commit: f8ea750455 [DO NOT MERGE] 
* commit 'c96ef95285e935034377dee30f3b8a0329f6c3a2':
  Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]
 2015-08-26 05:55:14 +00:00
Deepanshu Gupta
678f0ea2ba am b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE] 
* commit 'b318ff54fcd17e7aadd1b0251c34cba348898704':
  Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
 2015-08-26 05:55:07 +00:00
Deepanshu Gupta
2e57c1e23f am cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE] 
* commit 'cc5e69e4fed8bb797dc3f83c1de32eaf4a52f324':
  Inject anonymous inner classes of injected classes [DO NOT MERGE]
 2015-08-26 05:55:02 +00:00
Deepanshu Gupta
899daf759e am d7e89906: Update platformDir search in tests. [DO NOT MERGE] 
* commit 'd7e89906a453a562a8fef303fc6c4068dfa5c0d0':
  Update platformDir search in tests. [DO NOT MERGE]
 2015-08-26 05:54:58 +00:00
Deepanshu Gupta
2f50403fe0 am afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE] 
* commit 'afedbc47b3c8f3fa9955496e6ceb7f5702dd90a3':
  Make Context.getClassLoader() work. [DO NOT MERGE]
 2015-08-26 05:54:52 +00:00
Deepanshu Gupta
de3ac8f9fc am 92480a9a: Fix include tag rendering. [DO NOT MERGE] 
* commit '92480a9ad89a813bdf36185fa8c4d227d8415b4c':
  Fix include tag rendering. [DO NOT MERGE]
 2015-08-26 05:54:44 +00:00
Deepanshu Gupta
50e1406a4a am f6b08547: Show better error message for color attr not found. [DO NOT MERGE] 
* commit 'f6b08547458b9219da1717a79363f778bfc57dd0':
  Show better error message for color attr not found. [DO NOT MERGE]
 2015-08-26 05:54:39 +00:00
Deepanshu Gupta
81990c3f98 am b1370c26: Fix build: udpate parser factory method [DO NOT MERGE] 
* commit 'b1370c2687f4b03f7b9b36f89bb636b5b65f9531':
  Fix build: udpate parser factory method [DO NOT MERGE]
 2015-08-26 05:54:33 +00:00
Deepanshu Gupta
0a07bb95a1 am aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE] 
* commit 'aa72988955789be6e790c344daba3ef17abfcd98':
  Don't keep LayoutlibCallback reference. [DO NOT MERGE]
 2015-08-26 05:54:28 +00:00
Deepanshu Gupta
bbbdc2ad89 am 5c90c4f4: Remove kxml dependency [DO NOT MERGE] 
* commit '5c90c4f459c2a7213a197f7ee98ad71e85af31bc':
  Remove kxml dependency [DO NOT MERGE]
 2015-08-26 05:54:23 +00:00
Deepanshu Gupta
c96ef95285 Add documentation about hack in commit: f8ea750455 [DO NOT MERGE] 
Change-Id: I9ce871a67fb67e02e0c4df1eb5c3261ea52a914b
(cherry picked from commit 6330971ed293a2777bbdab09288f90ea4b2d0255)
 2015-08-25 12:06:44 -07:00
Deepanshu Gupta
b318ff54fc Make DatePicker rendering not fail (style search fix). [DO NOT MERGE] 
Only cherry picked for the style not found fix.

Change-Id: Ied2b71de5b32bcb640bf4ec445e8a39509f800e9
(cherry picked from commit d5b82845450beac2d3c7db9cd80e9fc34d43a297)
 2015-08-25 12:06:44 -07:00
Deepanshu Gupta
cc5e69e4fe Inject anonymous inner classes of injected classes [DO NOT MERGE] 
When injecting classes in LayoutLib (eg. CreateInfo), so that LayoutLib
can refer back to the changes, also inject the anonymous inner classes.
Without this, the injected classes are not loadable. Although, LayoutLib
itself doesn't load these classes, but some tests do.

Change-Id: Ib5f6b779ef4d79dec8d614d3dbb26eeac88a1064
(cherry picked from commit bfc9c3bcbe3b7056d3330f754811c1506f181b88)
 2015-08-25 12:06:44 -07:00
Deepanshu Gupta
d7e89906a4 Update platformDir search in tests. [DO NOT MERGE] 
When trying to find the SDK Platform Dir for LayoutLib tests, also
test if the dir from which the tests are run is module dir.

Change-Id: Id5c6038d07ebbb122e38f907ad488ed1f2bcde32
(cherry picked from commit 612a05e7e15184b21437731b9aa5db2d1d4fc54c)
 2015-08-25 12:06:43 -07:00
Deepanshu Gupta
afedbc47b3 Make Context.getClassLoader() work. [DO NOT MERGE] 
Context.getClassLoader() is used by the LayoutInflater and can be used
by custom views. However, when called from the LayoutInflater, this
needs to return only the Framework classes. This is so that the IDE gets
a chance to instantiate the custom views, which helps in better error
reporting and better fallback in case of exceptions, like MockView.

To workaround this need of the same method returning different results
based on where it's called from, the method call in LayoutInflater is
renamed to getFrameworkClassLoader() and the new method is injected in
Context. The implementation of getFrameworkClassLoader() maintains the
existing behaviour of getClassLoader().

Context.getClassLoader() is now modified to return classes from both
Framework and the app namespace.

Also, update the list of packages to search for Framework views.

Change-Id: I1a6be4aa1fc5c1c5520b5440a348a52f10b6eb3b
(cherry picked from commit f8ea750455eec81e4e6d877b3e18e29a86d4ec95)
 2015-08-25 12:06:43 -07:00
Deepanshu Gupta
92480a9ad8 Fix include tag rendering. [DO NOT MERGE] 
A missing catch clause caused rendering to be failed when there is an
include tag that doesn't specify layout_width and layout_height. Also
improve the error messages to make debugging easier next time.

Change-Id: I617762636973a010b34da167c7b5fcd328b7d178
(cherry picked from commit 21b564573327b1ed2f7e06146b8a01c47ede3089)
 2015-08-25 12:06:42 -07:00
Deepanshu Gupta
f6b0854745 Show better error message for color attr not found. [DO NOT MERGE] 
Change-Id: I1ca32989522d30fec336eb607ee81f9e5cb5f48f
(cherry picked from commit 5f1bf496948fb6383ae17e5467a26a00489d7564)
 2015-08-25 12:06:42 -07:00
Deepanshu Gupta
b1370c2687 Fix build: udpate parser factory method [DO NOT MERGE] 
Change-Id: I78ad55bc924427b44451ec32fbd1032d6cd77544
(cherry picked from commit 3dc19883c571a829c36aa603c04a55c91b00dd57)
 2015-08-25 12:06:41 -07:00
Deepanshu Gupta
aa72988955 Don't keep LayoutlibCallback reference. [DO NOT MERGE] 
Switch to the newer API that enables keeping a reference only to the
ParserFactory which is a much leaner object as compared to
LayoutlibCallback.

 Conflicts:
	tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/android/BridgeXmlBlockParserTest.java

Change-Id: I9b7afd93226db23786a00b2951cbf5ae5b8f3e5f
(cherry picked from commit f2d408b51debadca830eefbf8131185ac55ce699)
 2015-08-25 12:06:41 -07:00
Deepanshu Gupta
5c90c4f459 Remove kxml dependency [DO NOT MERGE] 
Create XmlPullParser using callback provided by the client. This enables
clients to choose which XmlPullParser implementation they want.

Change-Id: I9ad97a4777820cdbe5c8fc3716f74ddec9065c70
(cherry picked from commit 78af25584633462e4ab8cf9bafe10f43e7cb2d83)
 2015-08-25 12:06:30 -07:00
Cheryl Potter
251f247907 am dc35d48f: Merge "docs: changed red to yellow in code snippet" into mnc-preview-docs 
* commit 'dc35d48f4fdc2016f900207ebc934e5a57bd9265':
  docs: changed red to yellow in code snippet
 2015-08-21 23:01:17 +00:00
Cheryl Potter
dc35d48f4f Merge "docs: changed red to yellow in code snippet" into mnc-preview-docs 2015-08-21 22:51:30 +00:00
Sebastien Hertz
852c617862 am b63e291d: am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit 'b63e291d05aa9522b2ef9b399936c52079820c3f':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 11:02:27 +00:00
Sebastien Hertz
b63e291d05 am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '88556ac22157ddfe154be6ee7c8853e0a81dc83c':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 10:53:07 +00:00
Sebastien Hertz
88556ac221 am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '599dc2bd1c809ae5a413fc3800fc3fbb71432de6':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 10:37:46 +00:00
Sebastien Hertz
599dc2bd1c am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '50af68e74a756d0fc81eda2a3580dbcf70362d42':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 10:29:30 +00:00
Sebastien Hertz
50af68e74a am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '55f86b1811f0411a5d685d6c97772b846a706e19':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 10:18:38 +00:00
Sebastien Hertz
55f86b1811 am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '9e7a0ddb65ad0bd04d49a24a68aa96730b2ba9a1':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 10:09:22 +00:00
Sebastien Hertz
9e7a0ddb65 am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '18089ceb71ad4ce2332096b8e7b5f8c1f8e263db':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 09:50:24 +00:00
Sebastien Hertz
b60bc0ece2 resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev 
Change-Id: I4cb38241b5efab1eb7af161e1589fa477a473a39
 2015-08-21 09:53:41 +02:00
Sebastien Hertz
a2d193183f am 87a786af: am 445ab7fa: am ff8dc212: Allow debugging only for apps forked from zygote 
* commit '87a786afdba8ec94036c62fb58265d364a7064ae':
  Allow debugging only for apps forked from zygote
 2015-08-21 07:19:10 +00:00
Sebastien Hertz
87a786afdb am 445ab7fa: am ff8dc212: Allow debugging only for apps forked from zygote 
* commit '445ab7fa43f32ac1a256b15f5ab2bd619e9711e4':
  Allow debugging only for apps forked from zygote
 2015-08-21 07:08:43 +00:00
Sebastien Hertz
445ab7fa43 am ff8dc212: Allow debugging only for apps forked from zygote 
* commit 'ff8dc21278b19b22ed8dc9f9475850838336d351':
  Allow debugging only for apps forked from zygote
 2015-08-21 07:01:02 +00:00
David Friedman
504623e1a7 am 5389f46c: Docs: Fixes to interactive-watch-face docs (CL 743190) 
* commit '5389f46ce4245a6a0cfc931160ea13dab17f6590':
  Docs: Fixes to interactive-watch-face docs (CL 743190)
 2015-08-20 16:59:08 +00:00
David Friedman
5389f46ce4 Docs: Fixes to interactive-watch-face docs (CL 743190) 
Change-Id: I2b9c7d7afbf5583da01808027869e1e98873c7d1
 2015-08-20 08:51:39 -07:00
David Friedman
9f4ddca909 am 56c22d29: Merge "Docs: Creating interactive watch faces Bug: 21721463" into mnc-preview-docs 
* commit '56c22d29b8727e55073cede04b51e65eb6125b9f':
  Docs: Creating interactive watch faces Bug: 21721463
 2015-08-20 00:57:50 +00:00
David Friedman
56c22d29b8 Merge "Docs: Creating interactive watch faces Bug: 21721463" into mnc-preview-docs 2015-08-20 00:44:58 +00:00
David Friedman
e6705bf25d Docs: Creating interactive watch faces 
Bug: 21721463

Training module and related API-reference documentation. This is new
material for Android Wear D(iamond) release.

Change-Id: I9959bca50fd96812abd7cfb693139986bc59b133
 2015-08-19 17:41:57 -07:00
David Friedman
311f8eeee0 am ed54f60a: Merge "Docs: Updating, clarifying Debug-over-WiFi instructions. Bug: 21371836" into mnc-preview-docs 
* commit 'ed54f60ae4d57ed1e9cc963fc3baf5de91d51c53':
  Docs: Updating, clarifying Debug-over-WiFi instructions. Bug: 21371836
 2015-08-19 22:31:15 +00:00
David Friedman
ed54f60ae4 Merge "Docs: Updating, clarifying Debug-over-WiFi instructions. Bug: 21371836" into mnc-preview-docs 2015-08-19 22:21:41 +00:00