OSDN Git Service
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:58 +0000 (05:54 +0000)]
am
d7e89906: Update platformDir search in tests. [DO NOT MERGE]
* commit '
d7e89906a453a562a8fef303fc6c4068dfa5c0d0':
Update platformDir search in tests. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:52 +0000 (05:54 +0000)]
am
afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE]
* commit '
afedbc47b3c8f3fa9955496e6ceb7f5702dd90a3':
Make Context.getClassLoader() work. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:44 +0000 (05:54 +0000)]
am
92480a9a: Fix include tag rendering. [DO NOT MERGE]
* commit '
92480a9ad89a813bdf36185fa8c4d227d8415b4c':
Fix include tag rendering. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:39 +0000 (05:54 +0000)]
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]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:33 +0000 (05:54 +0000)]
am
b1370c26: Fix build: udpate parser factory method [DO NOT MERGE]
* commit '
b1370c2687f4b03f7b9b36f89bb636b5b65f9531':
Fix build: udpate parser factory method [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:28 +0000 (05:54 +0000)]
am
aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE]
* commit '
aa72988955789be6e790c344daba3ef17abfcd98':
Don't keep LayoutlibCallback reference. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:23 +0000 (05:54 +0000)]
am
5c90c4f4: Remove kxml dependency [DO NOT MERGE]
* commit '
5c90c4f459c2a7213a197f7ee98ad71e85af31bc':
Remove kxml dependency [DO NOT MERGE]
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:53:07 +0000 (10:53 +0000)]
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
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:19:10 +0000 (07:19 +0000)]
am
87a786af: am
445ab7fa: am
ff8dc212: Allow debugging only for apps forked from zygote
* commit '
87a786afdba8ec94036c62fb58265d364a7064ae':
Allow debugging only for apps forked from zygote
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 21:31:41 +0000 (21:31 +0000)]
am
50ed152a: am
7f63ef38: am
9b6a6099: Prevent insanely long passwords from crashing SystemUI
* commit '
50ed152ab646b00714947a9cf75e01e618b16c02':
Prevent insanely long passwords from crashing SystemUI
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 13:06:52 +0000 (13:06 +0000)]
am
7720eb18: Merge "Render to measured size when using expand mode" into lmp-mr1-dev
* commit '
7720eb18c1c2fe06e8f4b2f6e2936a4072494da8':
Render to measured size when using expand mode
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:50:52 +0000 (00:50 +0000)]
am
bc4743eb: 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 '
bc4743ebe845958fab8bbb0d0a425d55ece3d205':
Prevent system uid component from running in an app process
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:58 +0000 (17:03 +0000)]
am
d72dc762: am
ec425a19: am
df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev
* commit '
d72dc76275d7d0cc9559e0e5439bcc3ccbda81a2':
Prevent system uid component from running in an app process
Wale Ogunwale [Wed, 1 Jul 2015 17:03:54 +0000 (17:03 +0000)]
am
131e6b24: Merge "Prevent system uid component from running in an app process" into lmp-mr1-dev
* commit '
131e6b24d88c4704687f41e9a016ab1919c53fa4':
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:11:48 +0000 (20:11 +0000)]
am
83631047: 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 '
8363104782302c08f2f03d4e1e345edb7f20876c':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Joe Fernandez [Tue, 30 Jun 2015 20:11:40 +0000 (20:11 +0000)]
am
f1686ac2: 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 '
f1686ac225c75991d931348818065f9e99cf0b73':
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 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:34:59 +0000 (22:34 +0000)]
am
5b8976a5: am
853c6178: am
791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
5b8976a5eaffe81a742ec2600cf9b63e911f978c':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
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 [Fri, 26 Jun 2015 22:03:10 +0000 (22:03 +0000)]
am
90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
90224355cd6bd54fa7a9ec30c1cecc573104a3e3':
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 09:36:39 +0000 (09:36 +0000)]
am
5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev
* commit '
5e50e00c663a5d0b11d1f41509e1fb4e56d166f1':
Fix for shadows on theme editor
Diego Perez [Mon, 15 Jun 2015 09:36:34 +0000 (09:36 +0000)]
am
ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev
* commit '
ead59b0d479c3a911be87261b523255e8e51f76a':
Fix GcSnapshot drawInLayer when clipping is used.
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:45:26 +0000 (14:45 +0000)]
am
ce4a9d91: Merge "New custom widgets library" into lmp-mr1-dev
* commit '
ce4a9d9110436a2ea825976af7895c58303a3dac':
New custom widgets library
Diego Perez [Fri, 12 Jun 2015 14:45:21 +0000 (14:45 +0000)]
am
f5a99437: Merge "Fix crash when shadowSize is 0" into lmp-mr1-dev
* commit '
f5a99437bf203eca49e8ab8f74f2c206c551289b':
Fix crash when shadowSize is 0
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 16:06:51 +0000 (16:06 +0000)]
am
e899576f: 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 '
e899576f17ff50b2c509806f6080b0cf2df01014':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
Leon Scroggins III [Wed, 10 Jun 2015 16:06:47 +0000 (16:06 +0000)]
am
6b16398d: am
604ae32b: am
4dae8e41: Merge "DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes" into lmp-dev
* commit '
6b16398dd148b38da19a8d5d7f5598fa44fbe7ac':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
Svetoslav [Wed, 10 Jun 2015 16:06:42 +0000 (16:06 +0000)]
am
07264d93: am
18fb1c92: (-s ours) am
bf0652ee: DO NOT MERGE Don\'t take flags when creating app widget config activity.
* commit '
07264d936d4039057277151641e66671c33ed1af':
DO NOT MERGE Don't take flags when creating app widget config activity.
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 21:27:59 +0000 (21:27 +0000)]
am
127d0b80: Merge "Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""" into lmp-mr1-dev
* commit '
127d0b8065cb87fafddd0cf65a33e42afac69672':
Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""
Justin Harrison [Wed, 3 Jun 2015 21:27:54 +0000 (21:27 +0000)]
am
29b98884: Merge "Revert "During early boot, send LOCALE_CHANGED only to registered receivers"" into lmp-mr1-dev
* commit '
29b988846721eb870df9813a950ef31a2ecacebd':
Revert "During early boot, send LOCALE_CHANGED only to registered receivers"
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:34:55 +0000 (17:34 +0000)]
am
958a7c1c: 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 '
958a7c1cd816986ac58073ae415b0825c0a11b7b':
Check that the parcel contained the expected amount of region data. DO NOT MERGE
Leon Scroggins III [Wed, 27 May 2015 17:34:51 +0000 (17:34 +0000)]
am
b6e3f930: am
2bbcc253: am
b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev
* commit '
b6e3f930c182ed254e7de3b3e5d22bc7323227f2':
Check that the parcel contained the expected amount of region data. DO NOT MERGE