OSDN Git Service
Deepanshu Gupta [Mon, 1 Jun 2015 21:21:24 +0000 (14:21 -0700)]
LayoutLib: Skip classes from java package. [DO NOT MERGE]
Classes in "java" package can't be defined at runtime anyway. No use
including them in LayoutLib.
Change-Id: I7e7c46f0d74e32c893b23093828569b4fa5e3a73
(cherry picked from commit
86caef1892e1ce063e0e880396c8deaa3a6a171d)
Deepanshu Gupta [Wed, 27 May 2015 19:35:56 +0000 (12:35 -0700)]
Skip warnings for some unresolved references. [DO NOT MERGE]
Some applications rename the newer RTL attributes to the older
attributes in order to target RTL locales, but not need to include two
attributes everywhere it's needed. For example, iosched renames
paddingStart to paddingLeft (among other attributes) for API 17 and
above. This leads to hundreds of warnings about missing attributes.
This change suppresses such warnings.
Also, skip adding unresolved attributes to the typed array. This is more
in line with the actual implementation on device, and prevents
unexpected warnings/errors/crashes later.
Change-Id: Iee616fa6295aa9731ede0cf9dcd6dd2bd1fe8f20
(cherry picked from commit
b3e872be9e634c8d1f34d07778ea753880bbf2d9)
Deepanshu Gupta [Fri, 13 Mar 2015 22:24:59 +0000 (15:24 -0700)]
Fix import order. [DO NOT MERGE]
Change-Id: I50bfbf4011290683a1c6adb94e0b6fa301dcc75b
(cherry picked from commit
b9b8aef94e5bad8f5f03f686a2d3d8a09c045a7b)
Deepanshu Gupta [Sat, 30 May 2015 00:00:34 +0000 (17:00 -0700)]
Fix ParserFactory not initialized error. [DO NOT MERGE]
Bug: http://b.android.com/175129
Change-Id: I2111673767e0f62ee910560022b559a177d55abd
(cherry picked from commit
996458b76c944f78eee26d7bd8cb4d39303b9119)
Deepanshu Gupta [Thu, 28 May 2015 19:33:04 +0000 (12:33 -0700)]
Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]
Replace direct member access with getter that checks for nullness.
Change-Id: I4a56a0ee903ae7d8c89b91d74b128302e1965586
(cherry picked from commit
d758e042ce08c46712db3db2d63fc84795028dfe)
Deepanshu Gupta [Wed, 27 May 2015 23:57:10 +0000 (16:57 -0700)]
Fix BridgeTypedArray.getType() [DO NOT MERGE]
Also includes some fixes for BridgeTypedArray.getInt() - when value is a
color, when value is an octal int, when value is true/false.
Bug: http://b.android.com/162438
Change-Id: I0b985ea3437be8018d0e116e7a599843cc7aacd6
(cherry picked from commit
5779ad71eabed3aabaefef1e4749693f8320816e)
Deepanshu Gupta [Tue, 26 May 2015 16:24:48 +0000 (09:24 -0700)]
Include Shapes in LayoutLib. [DO NOT MERGE]
Change-Id: Ifb32882c478f8d407ad904e224b67fe2bd65dc08
(cherry picked from commit
59164ec0551aa49f497acca81222f304cf4f344b)
Deepanshu Gupta [Fri, 22 May 2015 22:47:16 +0000 (15:47 -0700)]
LayoutLib: Support getting resource arrays. [DO NOT MERGE]
- Don't crash when Resources.get<Type>Array() is called.
- If the IDE supports it, actually return the value.
- Add tests for getArray.
- Update test app to latest gradle plugin version.
- Switch to using AppTheme for tests, since the tests depend on some
custom theme attributes. The AppTheme now inherits from
Material.Light.DarkActionBar, so other tests should be unaffected.
Depends on a newer version of sdk-common, which fixes the parsing of
array resource in value files.
Bug:
12372031
Change-Id: I313b61511e98ac1402d75056ebfdeeb005ebb96d
(cherry picked from commit
642cff50f8f7a67eed09eac1e56d7133b26a192c)
Deepanshu Gupta [Fri, 22 May 2015 21:11:22 +0000 (14:11 -0700)]
LayoutLib: Change nullity annotations. [DO NOT MERGE]
Switch from using tools nullity annotations (com.android.annotations)
to android framework annotations (android.annotation).
A new sdk-common prebuilt is required for LayoutLib tests. The new
sdk-common requires an updated tools-common. The updated tools-common
doesn't have nullity annotations. So, instead of adding the annotation
dependency, just reuse the platform ones. This also paves the way to
include other platform annotations like IdRes etc.
Change-Id: I87b8f767d3681d914abe7d1329e26a87f49f50a7
(cherry picked from commit
476e582d2ffdf25102d4c55f8c242baa3d21d37f)
Deepanshu Gupta [Thu, 21 May 2015 18:47:36 +0000 (11:47 -0700)]
Add documentation about hack in commit:
f8ea750455 [DO NOT MERGE]
Change-Id: I9ce871a67fb67e02e0c4df1eb5c3261ea52a914b
(cherry picked from commit
6330971ed293a2777bbdab09288f90ea4b2d0255)
Deepanshu Gupta [Mon, 24 Aug 2015 20:50:18 +0000 (13:50 -0700)]
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)
Deepanshu Gupta [Wed, 20 May 2015 21:51:37 +0000 (14:51 -0700)]
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)
Deepanshu Gupta [Wed, 20 May 2015 18:28:50 +0000 (11:28 -0700)]
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)
Deepanshu Gupta [Tue, 19 May 2015 01:47:07 +0000 (18:47 -0700)]
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)
Deepanshu Gupta [Tue, 19 May 2015 18:55:15 +0000 (11:55 -0700)]
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)
Deepanshu Gupta [Mon, 18 May 2015 21:39:03 +0000 (14:39 -0700)]
Show better error message for color attr not found. [DO NOT MERGE]
Change-Id: I1ca32989522d30fec336eb607ee81f9e5cb5f48f
(cherry picked from commit
5f1bf496948fb6383ae17e5467a26a00489d7564)
Deepanshu Gupta [Fri, 15 May 2015 00:00:50 +0000 (17:00 -0700)]
Fix build: udpate parser factory method [DO NOT MERGE]
Change-Id: I78ad55bc924427b44451ec32fbd1032d6cd77544
(cherry picked from commit
3dc19883c571a829c36aa603c04a55c91b00dd57)
Deepanshu Gupta [Thu, 14 May 2015 22:37:29 +0000 (15:37 -0700)]
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)
Deepanshu Gupta [Sat, 9 May 2015 20:09:22 +0000 (13:09 -0700)]
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)
Sebastien Hertz [Fri, 21 Aug 2015 10:37:46 +0000 (10:37 +0000)]
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
Sebastien Hertz [Fri, 21 Aug 2015 10:29:30 +0000 (10:29 +0000)]
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
Sebastien Hertz [Fri, 21 Aug 2015 10:18:38 +0000 (10:18 +0000)]
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
Sebastien Hertz [Fri, 21 Aug 2015 10:09:22 +0000 (10:09 +0000)]
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
Sebastien Hertz [Fri, 21 Aug 2015 09:50:24 +0000 (09:50 +0000)]
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
Sebastien Hertz [Fri, 21 Aug 2015 07:08:43 +0000 (07:08 +0000)]
am
445ab7fa: am
ff8dc212: Allow debugging only for apps forked from zygote
* commit '
445ab7fa43f32ac1a256b15f5ab2bd619e9711e4':
Allow debugging only for apps forked from zygote
Sebastien Hertz [Fri, 21 Aug 2015 07:01:02 +0000 (07:01 +0000)]
am
ff8dc212: Allow debugging only for apps forked from zygote
* commit '
ff8dc21278b19b22ed8dc9f9475850838336d351':
Allow debugging only for apps forked from zygote
Sebastien Hertz [Mon, 10 Aug 2015 16:55:34 +0000 (18:55 +0200)]
Allow debugging only for apps forked from zygote DO NOT MERGE
When starting the runtime from app_process, we only pass JDWP options
if starting zygote. It prevents from opening a JDWP connection in
non-zygote programs while Android apps (forked from zygote) remain
debuggable.
Bug:
23050463
(cherry picked from commit
7a09b8322cab26d6e3da1362d3c74964ae66b5d4)
Change-Id: I2400ecc8aea7579c43300efccf288b69f70eef53
Sebastien Hertz [Mon, 10 Aug 2015 16:55:34 +0000 (18:55 +0200)]
Allow debugging only for apps forked from zygote
When starting the runtime from app_process, we only pass JDWP options
if starting zygote. It prevents from opening a JDWP connection in
non-zygote programs while Android apps (forked from zygote) remain
debuggable.
Bug:
23050463
(cherry picked from commit
7a09b8322cab26d6e3da1362d3c74964ae66b5d4)
Change-Id: Ib5b6d3bc4d45389993c3c54226df5a7b72479d19
Adrian Roos [Thu, 23 Jul 2015 18:47:07 +0000 (18:47 +0000)]
am
7f63ef38: am
9b6a6099: Prevent insanely long passwords from crashing SystemUI
* commit '
7f63ef380ff8c95ea43edd832a7b986ad362e7cf':
Prevent insanely long passwords from crashing SystemUI
Adrian Roos [Thu, 23 Jul 2015 18:34:56 +0000 (18:34 +0000)]
am
9b6a6099: Prevent insanely long passwords from crashing SystemUI
* commit '
9b6a60991453136819a6feeca404e1102e78f735':
Prevent insanely long passwords from crashing SystemUI
Adrian Roos [Tue, 21 Jul 2015 20:27:22 +0000 (13:27 -0700)]
Prevent insanely long passwords from crashing SystemUI
Bug:
22214934
Change-Id: I32e238e53ac4b6dd0ae6de226b98894c495b256f
Diego Perez [Tue, 21 Jul 2015 12:56:50 +0000 (12:56 +0000)]
Merge "Render to measured size when using expand mode" into lmp-mr1-dev
Wale Ogunwale [Thu, 2 Jul 2015 00:37:02 +0000 (00:37 +0000)]
am
7ab264ab: am
742bfa80: am
f3dbb57e: am
c215b2b2: am
dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev
* commit '
7ab264abc214b7e1b7fff9934814020cea5f18fa':
Prevent system uid component from running in an app process
Wale Ogunwale [Wed, 1 Jul 2015 17:17:23 +0000 (17:17 +0000)]
am
742bfa80: am
f3dbb57e: am
c215b2b2: am
dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev
* commit '
742bfa809cf2c022d690f84b4213e908ee66e8aa':
Prevent system uid component from running in an app process
Wale Ogunwale [Wed, 1 Jul 2015 17:03:02 +0000 (17:03 +0000)]
am
f3dbb57e: am
c215b2b2: am
dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev
* commit '
f3dbb57ee8fce4b7c2cad352ebe5096a880ae06b':
Prevent system uid component from running in an app process
Wale Ogunwale [Wed, 1 Jul 2015 16:39:11 +0000 (16:39 +0000)]
am
c215b2b2: am
dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev
* commit '
c215b2b24575e6d7693f396c7fdfe675d5ea9d1c':
Prevent system uid component from running in an app process
Wale Ogunwale [Wed, 1 Jul 2015 16:35:21 +0000 (16:35 +0000)]
am
ec425a19: am
df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev
* commit '
ec425a19f973e2511485b61424dffb9f3cafb542':
Prevent system uid component from running in an app process
Wale Ogunwale [Wed, 1 Jul 2015 16:30:40 +0000 (16:30 +0000)]
Merge "Prevent system uid component from running in an app process" into lmp-mr1-dev
Wale Ogunwale [Wed, 1 Jul 2015 16:18:42 +0000 (16:18 +0000)]
am
df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev
* commit '
df9948d81232a03271113c16bee6f3ab6b826bad':
Prevent system uid component from running in an app process
Wale Ogunwale [Wed, 1 Jul 2015 16:18:17 +0000 (16:18 +0000)]
am
dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev
* commit '
dc9cfca80139714ca37122148d041beedbf0ceb2':
Prevent system uid component from running in an app process
Wale Ogunwale [Wed, 1 Jul 2015 16:06:46 +0000 (16:06 +0000)]
Merge "Prevent system uid component from running in an app process" into lmp-dev
Wale Ogunwale [Wed, 1 Jul 2015 16:06:32 +0000 (16:06 +0000)]
Merge "Prevent system uid component from running in an app process" into klp-dev
Amit Mahajan [Tue, 30 Jun 2015 20:00:00 +0000 (20:00 +0000)]
am
22766e85: am
bcf9223b: am
23444e76: (-s ours) am
eee86342: am
9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
22766e85d8b7bbedaa28a409f34120c4f3d4a2d3':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Joe Fernandez [Tue, 30 Jun 2015 19:59:53 +0000 (19:59 +0000)]
am
88c2d704: am
4bd25634: am
765255b4: am
6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs
* commit '
88c2d704c3bbb58a676b4b1164b1c98aecdf467d':
Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
Amit Mahajan [Tue, 30 Jun 2015 19:45:08 +0000 (19:45 +0000)]
am
bcf9223b: am
23444e76: (-s ours) am
eee86342: am
9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
bcf9223b3bbe542d0ab040398c26cf1c600f5493':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Joe Fernandez [Tue, 30 Jun 2015 19:45:03 +0000 (19:45 +0000)]
am
4bd25634: am
765255b4: am
6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs
* commit '
4bd25634f13876e7ab31b6de66ceb9ca1cdc784d':
Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
Amit Mahajan [Tue, 30 Jun 2015 18:21:50 +0000 (18:21 +0000)]
am
23444e76: (-s ours) am
eee86342: am
9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
23444e76d2480d2537c2b6418f0c6c89c8cdb590':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Joe Fernandez [Tue, 30 Jun 2015 18:21:41 +0000 (18:21 +0000)]
am
765255b4: am
6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs
* commit '
765255b41229553842da855b8e5d9dfa87cf8e2b':
Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
Amit Mahajan [Fri, 26 Jun 2015 22:31:49 +0000 (22:31 +0000)]
am
eee86342: am
9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
eee86342713a7c89c30933a22f8b7e190d3af10f':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Amit Mahajan [Fri, 26 Jun 2015 22:19:29 +0000 (22:19 +0000)]
am
853c6178: am
791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
853c61788387c38c1103f26b1c8c028da5676776':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Amit Mahajan [Fri, 26 Jun 2015 22:14:24 +0000 (22:14 +0000)]
am
9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
9edf7ad563ead119698ac3106b699515bd160ffe':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Amit Mahajan [Fri, 26 Jun 2015 22:03:46 +0000 (22:03 +0000)]
am
791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
791dd2c67466d2d9dafe58b1258e7718e3f30bc0':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Amit Mahajan [Thu, 11 Jun 2015 00:02:39 +0000 (17:02 -0700)]
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Bug:
21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
Amit Mahajan [Thu, 11 Jun 2015 00:02:39 +0000 (17:02 -0700)]
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Bug:
21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
Amit Mahajan [Thu, 11 Jun 2015 00:02:39 +0000 (17:02 -0700)]
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Bug:
21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
Wale Ogunwale [Thu, 25 Jun 2015 16:29:58 +0000 (09:29 -0700)]
Prevent system uid component from running in an app process
Bug:
21669445
Change-Id: I792c6e676d4b6d54a51228d264130b8125075d98
Wale Ogunwale [Thu, 11 Jun 2015 19:44:47 +0000 (12:44 -0700)]
Prevent system uid component from running in an app process
Bug:
21669445
Change-Id: I11d0bc5301d7e2a64972221f54f3cbd611f8e404
(cherry picked from commit
44368567f840e3469b5fd2c9399ed444b6f46ebf)
Wale Ogunwale [Thu, 11 Jun 2015 19:44:47 +0000 (12:44 -0700)]
Prevent system uid component from running in an app process
Bug:
21669445
Change-Id: I11d0bc5301d7e2a64972221f54f3cbd611f8e404
(cherry picked from commit
44368567f840e3469b5fd2c9399ed444b6f46ebf)
Joe Fernandez [Fri, 19 Jun 2015 23:01:45 +0000 (23:01 +0000)]
am
6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs
* commit '
6f8dab04572c772decef9b7ec5380f8e240a51ce':
Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
Joe Fernandez [Fri, 19 Jun 2015 22:49:26 +0000 (22:49 +0000)]
Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs
Diego Perez [Mon, 15 Jun 2015 08:34:56 +0000 (08:34 +0000)]
Merge "Fix for shadows on theme editor" into lmp-mr1-dev
Diego Perez [Mon, 15 Jun 2015 08:34:01 +0000 (08:34 +0000)]
Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev
Diego Perez [Fri, 12 Jun 2015 14:34:48 +0000 (14:34 +0000)]
Merge "New custom widgets library" into lmp-mr1-dev
Diego Perez [Fri, 12 Jun 2015 14:34:08 +0000 (14:34 +0000)]
Merge "Fix crash when shadowSize is 0" into lmp-mr1-dev
Leon Scroggins III [Wed, 10 Jun 2015 15:51:45 +0000 (15:51 +0000)]
am
48b38452: am
a6932472: am
5b751c80: (-s ours) am
7496e153: am
0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
* commit '
48b38452b0454a1398d01a5df9fe949e2febdeef':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
Leon Scroggins III [Wed, 10 Jun 2015 15:51:38 +0000 (15:51 +0000)]
am
604ae32b: am
4dae8e41: Merge "DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes" into lmp-dev
* commit '
604ae32bcc6791da813a8e594783b695131bf888':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
Svetoslav [Wed, 10 Jun 2015 15:51:38 +0000 (15:51 +0000)]
am
18fb1c92: (-s ours) am
bf0652ee: DO NOT MERGE Don\'t take flags when creating app widget config activity.
* commit '
18fb1c92d8c6ac732b85d7dee02a75591aec154b':
DO NOT MERGE Don't take flags when creating app widget config activity.
Justin Harrison [Wed, 3 Jun 2015 19:20:43 +0000 (19:20 +0000)]
Merge "Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""" into lmp-mr1-dev
Justin Harrison [Wed, 3 Jun 2015 19:18:30 +0000 (19:18 +0000)]
Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""
This reverts commit
c48c31394e7e5dc104d22644d0e4e4a6a607497a.
Change-Id: Ia2b59da5d953a8a692c0e2f5eabb12e952dbdea1
Justin Harrison [Wed, 3 Jun 2015 19:18:04 +0000 (19:18 +0000)]
Merge "Revert "During early boot, send LOCALE_CHANGED only to registered receivers"" into lmp-mr1-dev
Justin Harrison [Wed, 3 Jun 2015 18:48:19 +0000 (18:48 +0000)]
Revert "During early boot, send LOCALE_CHANGED only to registered receivers"
This reverts commit
afd883f8a3ee260a5505f83d628c0b789871c837.
Change-Id: Ia4fadbbc7e531d13cd9e9019f0cdb30cc090cb7a
Diego Perez [Tue, 2 Jun 2015 16:09:45 +0000 (17:09 +0100)]
Render to measured size when using expand mode
When using RenderingMode.V_SCROLL or RenderingMode.H_SCROLL, if the
screen size is smaller than the measured size but as large as the
desired size, the layout will render incorrectly and won't expand.
This changes that to expand to at least the size of the screen.
Added tests for the V_SCROLL and H_SCROLL modes.
Bug: http://b.android.com/174928
Change-Id: I22686903560775e2e4f362af1d7b50c9b985467d
Leon Scroggins III [Tue, 2 Jun 2015 13:41:50 +0000 (13:41 +0000)]
am
a6932472: am
5b751c80: (-s ours) am
7496e153: am
0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
* commit '
a6932472d976c63a6b3970aac3607c4fe3a790b9':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
Leon Scroggins III [Tue, 2 Jun 2015 13:29:02 +0000 (13:29 +0000)]
am
5b751c80: (-s ours) am
7496e153: am
0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
* commit '
5b751c80070a6c790fd386808be2a4258e37e69a':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
Leon Scroggins III [Tue, 2 Jun 2015 13:12:12 +0000 (13:12 +0000)]
am
7496e153: am
0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
* commit '
7496e153f4308b39df9c53615770f44f593c3504':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
Leon Scroggins III [Tue, 2 Jun 2015 13:01:13 +0000 (13:01 +0000)]
am
4dae8e41: Merge "DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes" into lmp-dev
* commit '
4dae8e41b530672030731ec7cb69369da645cf30':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
Leon Scroggins III [Tue, 2 Jun 2015 12:59:29 +0000 (12:59 +0000)]
am
0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
* commit '
0d2081734ce124191ac1f3e8585336daa414abbe':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
Leon Scroggins III [Tue, 2 Jun 2015 12:48:41 +0000 (12:48 +0000)]
Merge "DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes" into lmp-dev
Diego Perez [Tue, 2 Jun 2015 10:14:53 +0000 (11:14 +0100)]
Fix for shadows on theme editor
If the preferred ColorModel doesn't support alpha, the shadows are
incorrectly rendered. In the theme editor on Linux, the graphics device
object doesn't support alpha so we need to use a different color model.
We default to ARGB which works fine.
Change-Id: I3e71e3d086fa4975a9149d36792e574813f37dfd
Svetoslav [Mon, 1 Jun 2015 23:02:37 +0000 (23:02 +0000)]
am
bf0652ee: DO NOT MERGE Don\'t take flags when creating app widget config activity.
* commit '
bf0652eeea280bb1d687fe2fc3e869e0f6e9a541':
DO NOT MERGE Don't take flags when creating app widget config activity.
Svetoslav [Mon, 1 Jun 2015 19:55:35 +0000 (12:55 -0700)]
DO NOT MERGE Don't take flags when creating app widget config activity.
bug:
19618745
Change-Id: Ib0e421454d343e6db55d5538f1d55ac22a3dd722
Leon Scroggins III [Fri, 29 May 2015 20:13:11 +0000 (16:13 -0400)]
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
bug:
20883006
Change-Id: I4f109667fb210a80fbddddf5f1bfb7ef3a02b6ce
Leon Scroggins III [Fri, 29 May 2015 20:13:11 +0000 (16:13 -0400)]
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
bug:
20883006
Change-Id: I4f109667fb210a80fbddddf5f1bfb7ef3a02b6ce
Leon Scroggins III [Wed, 27 May 2015 17:18:54 +0000 (17:18 +0000)]
am
3d3e3bb4: am
c7a558fe: am
425d7c87: (-s ours) am
11297581: am
18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE
* commit '
3d3e3bb445dbd1775cdcab0ac19563400ac2d60a':
Check that the parcel contained the expected amount of region data. DO NOT MERGE
Leon Scroggins III [Wed, 27 May 2015 17:18:47 +0000 (17:18 +0000)]
am
2bbcc253: am
b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev
* commit '
2bbcc253254a497b8f9bb86712fb6f0f2548e9f2':
Check that the parcel contained the expected amount of region data. DO NOT MERGE
Leon Scroggins III [Wed, 27 May 2015 15:22:45 +0000 (15:22 +0000)]
am
c7a558fe: am
425d7c87: (-s ours) am
11297581: am
18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE
* commit '
c7a558fe73631e438061c31a54861594f0eb024f':
Check that the parcel contained the expected amount of region data. DO NOT MERGE
Leon Scroggins III [Wed, 27 May 2015 15:10:30 +0000 (15:10 +0000)]
am
425d7c87: (-s ours) am
11297581: am
18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE
* commit '
425d7c8713679ce9799139f7f91c6a45caa3b486':
Check that the parcel contained the expected amount of region data. DO NOT MERGE
Leon Scroggins III [Wed, 27 May 2015 14:53:00 +0000 (14:53 +0000)]
am
11297581: am
18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE
* commit '
11297581667128d2568a47ee03acab5c4f9f2784':
Check that the parcel contained the expected amount of region data. DO NOT MERGE
Leon Scroggins III [Wed, 27 May 2015 14:39:21 +0000 (14:39 +0000)]
am
b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev
* commit '
b36ace7401c0e198ceddd2fdb908346b7bb5928f':
Check that the parcel contained the expected amount of region data. DO NOT MERGE
Leon Scroggins III [Wed, 27 May 2015 14:37:18 +0000 (14:37 +0000)]
am
18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE
* commit '
18d7926709451b9e767731f46778e4238fc8e3b5':
Check that the parcel contained the expected amount of region data. DO NOT MERGE
Leon Scroggins III [Wed, 27 May 2015 14:29:30 +0000 (14:29 +0000)]
Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev
Wale Ogunwale [Wed, 27 May 2015 05:03:29 +0000 (05:03 +0000)]
am
523a19bf: am
c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
* commit '
523a19bf3df202c58369279fc4e538e9e342c1e7':
Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
Wale Ogunwale [Wed, 27 May 2015 04:50:11 +0000 (04:50 +0000)]
am
c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
* commit '
c9a0c0b90773fded6c251646300231f67c891b78':
Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
Leon Scroggins III [Tue, 26 May 2015 20:41:09 +0000 (16:41 -0400)]
Check that the parcel contained the expected amount of region data. DO NOT MERGE
bug:
20883006
Change-Id: Ib47a8ec8696dbc37e958b8dbceb43fcbabf6605b
Leon Scroggins III [Tue, 26 May 2015 20:41:09 +0000 (16:41 -0400)]
Check that the parcel contained the expected amount of region data. DO NOT MERGE
bug:
20883006
Change-Id: Ib47a8ec8696dbc37e958b8dbceb43fcbabf6605b
Wale Ogunwale [Mon, 6 Apr 2015 23:08:52 +0000 (16:08 -0700)]
Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
* Applications must now have ...permission.REAL_GET_TASKS to
be able to get process information for all applications.
* Only the process information for the calling application will be
returned if the app doesn't have the permission.
* Privilages apps will temporarily be able to get process information
for all applications if they don't have the new permission, but have
deprecated ...permission.GET_TASKS.
Bug:
20034603
Change-Id: I67ae9491f65d2280adb6a81593693d499714a216
(cherry picked from commit
9dbaa54f6834e013a63f18bd51ace554de811d80)
Diego Perez [Thu, 14 May 2015 02:10:50 +0000 (03:10 +0100)]
New custom widgets library
Adds the widgets needed by the theme editor as a jar file that will be
linked from AS. The controls currently are:
- ThemePreviewLayout: A custom layout that allows to dynamically reflow
cards that display the theme preview.
- PressedButton: Custom button to display in a pressed state (currently
we can only do it programatically).
- ErrorCatcher: View that can wrap other view and stops a view throwing
exceptions that will break the theme editor rendering. This is
currently used to wrap the custom controls loaded from the source
code.
The new library currently depends on bridge to be able to use the logger
for the ErrorCatcher view. The ErrorCatcher view is a temporary solution
that will be replaced in a future CL and the dependency will be removed.
Change-Id: I832c447e22e1381abff74c46c4282921b3f6fa23
John Reck [Thu, 14 May 2015 00:40:44 +0000 (00:40 +0000)]
Merge "Revert "DO NOT MERGE Backport of limited jank-tracking metrics"" into lmp-mr1-dev
John Reck [Wed, 13 May 2015 21:42:28 +0000 (21:42 +0000)]
Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
This reverts commit
2614bd225f84f7a23e6b30fc6b47bede153e5f4c.
Change-Id: I344b4cbaa0bb0caf50bceb806d1446ee27ea52d8
John Reck [Wed, 13 May 2015 21:42:08 +0000 (21:42 +0000)]
Merge "DO NOT MERGE Backport of limited jank-tracking metrics" into lmp-mr1-dev