OSDN Git Service

android-x86/frameworks-base.git
9 years agoShow better error message for color attr not found. [DO NOT MERGE]
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)

9 years agoFix build: udpate parser factory method [DO NOT MERGE]
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)

9 years agoDon't keep LayoutlibCallback reference. [DO NOT MERGE]
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)

9 years agoRemove kxml dependency [DO NOT MERGE]
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)

9 years agoam 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow...
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

9 years agoam 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only...
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

9 years agoam 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked...
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

9 years agoam 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT...
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

9 years agoam 18089ceb: 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

9 years agoam 445ab7fa: am ff8dc212: 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

9 years agoam ff8dc212: 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

9 years agoAllow debugging only for apps forked from zygote DO NOT MERGE
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

9 years agoAllow 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

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

9 years agoam 7f63ef38: am 9b6a6099: 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

9 years agoam 9b6a6099: 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

9 years agoPrevent 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

9 years agoMerge "Render to measured size when using expand mode" into lmp-mr1-dev
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

9 years agoam 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent syste...
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

9 years agoam 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid compone...
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

9 years agoam f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from runni...
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

9 years agoam c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an...
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

9 years agoam ec425a19: am df9948d8: Merge "Prevent system uid component from running in an...
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

9 years agoMerge "Prevent system uid component from running in an app process" into lmp-mr1-dev
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

9 years agoam df9948d8: Merge "Prevent system uid component from running in an app process"...
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

9 years agoam dc9cfca8: Merge "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

9 years agoMerge "Prevent system uid component from running in an app process" into lmp-dev
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

9 years agoMerge "Prevent system uid component from running in an app process" into klp-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

9 years agoam 22766e85: am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT...
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.

9 years agoam 88c2d704: am 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens...
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.

9 years agoam bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change...
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.

9 years agoam 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used...
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.

9 years agoam 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMI...
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.

9 years agoam 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly...
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.

9 years agoam eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related...
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.

9 years agoam 853c6178: am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related...
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.

9 years agoam 9edf7ad5: 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.

9 years agoam 791dd2c6: 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.

9 years agoDO 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

9 years agoDO 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

9 years agoDO 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

9 years agoPrevent system uid component from running in an app process
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

9 years agoPrevent system uid component from running in an app process
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)

9 years agoPrevent system uid component from running in an app process
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)

9 years agoam 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces,...
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.

9 years agoMerge "Fixes a typo where parens were used instead of curly braces, preventing a...
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

9 years agoMerge "Fix for shadows on theme editor" into lmp-mr1-dev
Diego Perez [Mon, 15 Jun 2015 08:34:56 +0000 (08:34 +0000)]
Merge "Fix for shadows on theme editor" into lmp-mr1-dev

9 years agoMerge "Fix GcSnapshot drawInLayer when clipping is used." 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

9 years agoMerge "New custom widgets library" 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

9 years agoMerge "Fix crash when shadowSize is 0" 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

9 years agoam 48b38452: am a6932472: am 5b751c80: (-s ours) am 7496e153: am 0d208173: DO NOT...
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

9 years agoam 604ae32b: am 4dae8e41: Merge "DO NOT MERGE: Ensure that unparcelling Region only...
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

9 years agoam 18fb1c92: (-s ours) am bf0652ee: DO NOT MERGE Don\'t take flags when creating...
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.

9 years agoMerge "Revert "Revert "During early boot, send LOCALE_CHANGED only to registered...
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

9 years agoRevert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""
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

9 years agoMerge "Revert "During early boot, send LOCALE_CHANGED only to registered receivers...
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

9 years agoRevert "During early boot, send LOCALE_CHANGED only to registered receivers"
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

9 years agoRender to measured size when using expand mode
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

9 years agoam a6932472: am 5b751c80: (-s ours) am 7496e153: am 0d208173: DO NOT MERGE: Ensure...
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

9 years agoam 5b751c80: (-s ours) am 7496e153: am 0d208173: DO NOT MERGE: Ensure that unparcelli...
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

9 years agoam 7496e153: am 0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads...
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

9 years agoam 4dae8e41: Merge "DO NOT MERGE: Ensure that unparcelling Region only reads the...
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

9 years agoam 0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected...
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

9 years agoMerge "DO NOT MERGE: Ensure that unparcelling Region only reads the expected number...
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

9 years agoFix for shadows on theme editor
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

9 years agoam bf0652ee: DO NOT MERGE Don\'t take flags when creating app widget config activity.
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.

9 years agoDO 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

9 years agoDO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
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

9 years agoDO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
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

9 years agoam 3d3e3bb4: am c7a558fe: am 425d7c87: (-s ours) am 11297581: am 18d79267: Check...
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

9 years agoam 2bbcc253: am b36ace74: Merge "Check that the parcel contained the expected amount...
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

9 years agoam c7a558fe: am 425d7c87: (-s ours) am 11297581: am 18d79267: Check that the parcel...
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

9 years agoam 425d7c87: (-s ours) am 11297581: am 18d79267: Check that the parcel contained...
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

9 years agoam 11297581: am 18d79267: Check that the parcel contained the expected amount of...
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

9 years agoam b36ace74: Merge "Check that the parcel contained the expected amount of region...
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

9 years agoam 18d79267: Check that the parcel contained the expected amount of region data....
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

9 years agoMerge "Check that the parcel contained the expected amount of region data. DO NOT...
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

9 years agoam 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission...
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

9 years agoam c9a0c0b9: 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

9 years agoCheck that the parcel contained the expected amount of region data. DO NOT MERGE
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

9 years agoCheck that the parcel contained the expected amount of region data. DO NOT MERGE
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

9 years agoLockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
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)

9 years agoNew custom widgets library
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

9 years agoMerge "Revert "DO NOT MERGE Backport of limited jank-tracking metrics"" into lmp...
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

9 years agoRevert "DO NOT MERGE Backport of limited jank-tracking metrics"
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

9 years agoMerge "DO NOT MERGE Backport of limited jank-tracking metrics" into lmp-mr1-dev
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

9 years agoDuring early boot, send LOCALE_CHANGED only to registered receivers
Christopher Tate [Tue, 12 May 2015 01:00:45 +0000 (18:00 -0700)]
During early boot, send LOCALE_CHANGED only to registered receivers

Bug 20855725
Bug 19060618

Change-Id: I368660ecc6ee97a0c2a2f627fa1b09288bc92bd1

9 years agoMark persistent apps as such when the ProcessRecord is created
Christopher Tate [Fri, 8 May 2015 18:10:43 +0000 (11:10 -0700)]
Mark persistent apps as such when the ProcessRecord is created

...rather than only during the OS's "time to start the persistent apps"
boot phase.  This closes a window of opportunity during which a
persistent app container may be live without having been properly
noted as such, because it wound up being launched prior to the
[rather late] boot phase at which the persistent apps are directly
enumerated and bookkeeping for them established.

Bug 20855725

Change-Id: I41822b412de4540dbdeab300b38089303678f76c

9 years agoFix crash when shadowSize is 0
Diego Perez [Fri, 27 Feb 2015 15:31:36 +0000 (15:31 +0000)]
Fix crash when shadowSize is 0

Change-Id: I9f131afc95a2571fbc8a737df37f43653cfbb90d
(cherry picked from commit e81096458f689ab3c0c4dbab2452722c3e3623c4)

9 years agoMerge "Added function to render a drawable in all available states" into lmp-mr1-dev
Diego Perez [Thu, 7 May 2015 02:28:50 +0000 (02:28 +0000)]
Merge "Added function to render a drawable in all available states" into lmp-mr1-dev

9 years agoAdded function to render a drawable in all available states
Andrew Shulaev [Thu, 5 Mar 2015 11:51:38 +0000 (11:51 +0000)]
Added function to render a drawable in all available states

This reverts commit 01cdf8b135be3bf67b9386dc929109c3db82c730.

Change-Id: I596855047d78c3c718744ad61432fc45e1239634
(cherry picked from commit 1f158819bc7cf58f97e47fabfaf23b2fb838f2eb)

9 years agoFix GcSnapshot drawInLayer when clipping is used.
Diego Perez [Wed, 22 Apr 2015 08:51:54 +0000 (09:51 +0100)]
Fix GcSnapshot drawInLayer when clipping is used.

GcSnapshot only allocates an image for tinting that is the size of the
current clipping area.  When drawing to that image, the wrong
coordinate system was used since now we are dealing with only the
clipping rect we need to translate -clipX, -clipY the drawing so it's
painted at 0,0 of the new BufferedImage.

Change-Id: Id8639d5ea9bef36ac07743df332161d6eadc6a81

9 years agoMerge changes I60c09f33,Ie0134c2b into lmp-mr1-dev
Diego Perez [Thu, 7 May 2015 00:14:25 +0000 (00:14 +0000)]
Merge changes I60c09f33,Ie0134c2b into lmp-mr1-dev

* changes:
  Add new parameter to the render method to allow forcing a measure pass.
  Avoid caching mImage on the main render loop and use clipping.

9 years agoMerge "Make status and navigation bars widgets and usable from layouts" into lmp...
Diego Perez [Wed, 6 May 2015 23:52:05 +0000 (23:52 +0000)]
Merge "Make status and navigation bars widgets and usable from layouts" into lmp-mr1-dev

9 years agoMerge "Move StatusBar to use statusBarColor theme attribute" into lmp-mr1-dev
Diego Perez [Wed, 6 May 2015 23:45:40 +0000 (23:45 +0000)]
Merge "Move StatusBar to use statusBarColor theme attribute" into lmp-mr1-dev

9 years agoMerge "Make sure shaders use a color model compatible with the destination." into...
Diego Perez [Wed, 6 May 2015 23:43:49 +0000 (23:43 +0000)]
Merge "Make sure shaders use a color model compatible with the destination." into lmp-mr1-dev

9 years agoMerge "More layoutlib tests." into lmp-mr1-dev
Deepanshu Gupta [Wed, 6 May 2015 23:43:09 +0000 (23:43 +0000)]
Merge "More layoutlib tests." into lmp-mr1-dev

9 years agoMerge "RecyclerView in LayoutLib: better XML attrs." into lmp-mr1-dev
Deepanshu Gupta [Wed, 6 May 2015 23:42:54 +0000 (23:42 +0000)]
Merge "RecyclerView in LayoutLib: better XML attrs." into lmp-mr1-dev

9 years agoMerge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev
Diego Perez [Wed, 6 May 2015 23:42:33 +0000 (23:42 +0000)]
Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev

9 years agoMerge "Nullity annotations to some tests." into lmp-mr1-dev
Deepanshu Gupta [Wed, 6 May 2015 23:42:19 +0000 (23:42 +0000)]
Merge "Nullity annotations to some tests." into lmp-mr1-dev

9 years agoMerge "Fix title bar showing when not required." into lmp-mr1-dev
Deepanshu Gupta [Wed, 6 May 2015 23:42:00 +0000 (23:42 +0000)]
Merge "Fix title bar showing when not required." into lmp-mr1-dev