OSDN Git Service

android-x86/frameworks-base.git
8 years agoam 02bc5488: Merge "Remove RPC interface Type"
Casey Dahlin [Wed, 2 Sep 2015 21:18:46 +0000 (21:18 +0000)]
am 02bc5488: Merge "Remove RPC interface Type"

* commit '02bc5488c19dcae7f21c43c8f3a20138e01a04d9':
  Remove RPC interface Type

8 years agoMerge "Remove RPC interface Type"
Casey Dahlin [Wed, 2 Sep 2015 21:01:33 +0000 (21:01 +0000)]
Merge "Remove RPC interface Type"

8 years agoRemove RPC interface Type
Casey Dahlin [Tue, 1 Sep 2015 20:21:26 +0000 (13:21 -0700)]
Remove RPC interface Type

AIDL previously supported "rpc" and "flatten" types, which are not used
anywhere in the Android tree. This patch removes them, which significantly cuts
down code and complexity.

Bug: 23517584
Test: Rebuilt AOSP tree against new version
Change-Id: I6cf38d43c1ce109ffca987cc14520945aa22431f
Signed-off-by: Casey Dahlin <sadmac@google.com>
8 years agoam f37947cb: Merge "aidl: Don\'t link librt on Mac"
Christopher Wiley [Wed, 2 Sep 2015 16:34:40 +0000 (16:34 +0000)]
am f37947cb: Merge "aidl: Don\'t link librt on Mac"

* commit 'f37947cb1a452b81f7b25cf961763c2ec3db5632':
  aidl: Don't link librt on Mac

8 years agoMerge "aidl: Don't link librt on Mac"
Christopher Wiley [Wed, 2 Sep 2015 16:23:01 +0000 (16:23 +0000)]
Merge "aidl: Don't link librt on Mac"

8 years agoaidl: Don't link librt on Mac
Christopher Wiley [Wed, 2 Sep 2015 01:36:44 +0000 (18:36 -0700)]
aidl: Don't link librt on Mac

This fixes unittest build on Mac.

Change-Id: I5180f647d1b5b41f99c4d0423aaec9d05fee6355

8 years agoresolved conflicts for merge of ef57e5e0 to stage-aosp-master
Yasuhiro Matsuda [Wed, 2 Sep 2015 13:48:13 +0000 (22:48 +0900)]
resolved conflicts for merge of ef57e5e0 to stage-aosp-master

Change-Id: I1c31b38936dc74619dea27f0d5eecab43360bb8c

8 years agoMerge "Add trace code to system server."
Yasuhiro Matsuda [Wed, 2 Sep 2015 12:54:23 +0000 (12:54 +0000)]
Merge "Add trace code to system server."

8 years agoam dd80a6cf: Merge "aidl: Stop using Bionic\'s test main"
Christopher Wiley [Tue, 1 Sep 2015 20:01:30 +0000 (20:01 +0000)]
am dd80a6cf: Merge "aidl: Stop using Bionic\'s test main"

* commit 'dd80a6cf37799b41ae07c60137d312c5ea2db961':
  aidl: Stop using Bionic's test main

8 years agoMerge "aidl: Stop using Bionic's test main"
Christopher Wiley [Tue, 1 Sep 2015 19:46:21 +0000 (19:46 +0000)]
Merge "aidl: Stop using Bionic's test main"

8 years agoaidl: Stop using Bionic's test main
Christopher Wiley [Tue, 1 Sep 2015 19:39:25 +0000 (12:39 -0700)]
aidl: Stop using Bionic's test main

This allows us to build unittests on Mac, where Bionic's test main
does not build.

Change-Id: I59c805d233498bb67575f2e5f7049341f70ce55c

8 years agoam 722bf5c7: Merge "aidl: Separate aidl logic into its own static library"
Christopher Wiley [Tue, 1 Sep 2015 18:49:12 +0000 (18:49 +0000)]
am 722bf5c7: Merge "aidl: Separate aidl logic into its own static library"

* commit '722bf5c7dec37265021c17d35b0b078776699f97':
  aidl: Separate aidl logic into its own static library

8 years agoMerge "aidl: Separate aidl logic into its own static library"
Christopher Wiley [Tue, 1 Sep 2015 18:34:32 +0000 (18:34 +0000)]
Merge "aidl: Separate aidl logic into its own static library"

8 years agoam 267cb88f: Merge "Set up aidl for gtest"
Christopher Wiley [Tue, 1 Sep 2015 18:20:19 +0000 (18:20 +0000)]
am 267cb88f: Merge "Set up aidl for gtest"

* commit '267cb88f4d4adb2cdddd9b29eb8fce7104507114':
  Set up aidl for gtest

8 years agoaidl: Separate aidl logic into its own static library
Christopher Wiley [Tue, 1 Sep 2015 18:07:48 +0000 (11:07 -0700)]
aidl: Separate aidl logic into its own static library

Compile aidl's logic into a static library that can be
linked against both the unittest binary and the executable. Validate
that this is working by writing a basic unittest against options
parsing.

Provide default values for Options struct members.  These were
previously taking on values according to the the bits in the memory
allocated to hold them for preprocessed inputs.

Bug: 23516947
Change-Id: Ib57cd7f473995f7851d788deac39f9c4d9018e8f
Test: compiles and unittests pass

8 years agoMerge "Set up aidl for gtest"
Christopher Wiley [Tue, 1 Sep 2015 18:11:41 +0000 (18:11 +0000)]
Merge "Set up aidl for gtest"

8 years agoam 9d586927: Merge "Automatically assign default seinfo labels using the string ...
Nick Kralevich [Tue, 1 Sep 2015 16:37:59 +0000 (16:37 +0000)]
am 9d586927: Merge "Automatically assign default seinfo labels using the string "default"."

* commit '9d586927102b597845607ccc82661e350821de82':
  Automatically assign default seinfo labels using the string "default".

8 years agoam 4d6cb77a: Merge "Tighten up compiler flags for aidl"
Christopher Wiley [Tue, 1 Sep 2015 16:37:31 +0000 (16:37 +0000)]
am 4d6cb77a: Merge "Tighten up compiler flags for aidl"

* commit '4d6cb77ad92c9acadb5afc5d80be38dd3b63c3fa':
  Tighten up compiler flags for aidl

8 years agoam 60dd5d59: Merge "Remove USE_MINGW, whitelist windows modules"
Dan Willemsen [Tue, 1 Sep 2015 16:37:10 +0000 (16:37 +0000)]
am 60dd5d59: Merge "Remove USE_MINGW, whitelist windows modules"

* commit '60dd5d5966ebe993f5a81c46d9dea62c207abfd3':
  Remove USE_MINGW, whitelist windows modules

8 years agoam a73e0045: Merge "Revert "Tighten up compiler flags for aidl""
Christopher Wiley [Tue, 1 Sep 2015 16:37:00 +0000 (16:37 +0000)]
am a73e0045: Merge "Revert "Tighten up compiler flags for aidl""

* commit 'a73e004516bae61bebe1e308f5b3ee295c1050b2':
  Revert "Tighten up compiler flags for aidl"

8 years agoam 1643e97b: Merge "aidl: Pull main() into dedicated file"
Christopher Wiley [Tue, 1 Sep 2015 16:36:52 +0000 (16:36 +0000)]
am 1643e97b: Merge "aidl: Pull main() into dedicated file"

* commit '1643e97b330d6c0f47e8643e52b12c6887a89f81':
  aidl: Pull main() into dedicated file

8 years agoam 2b83384f: Merge "Tighten up compiler flags for aidl"
Christopher Wiley [Tue, 1 Sep 2015 16:36:37 +0000 (16:36 +0000)]
am 2b83384f: Merge "Tighten up compiler flags for aidl"

* commit '2b83384f44ffa30d1d3d61ded9ac4f83a275b77d':
  Tighten up compiler flags for aidl

8 years agoMerge "Automatically assign default seinfo labels using the string "default"."
Nick Kralevich [Tue, 1 Sep 2015 13:39:10 +0000 (13:39 +0000)]
Merge "Automatically assign default seinfo labels using the string "default"."

8 years agoAutomatically assign default seinfo labels using the string "default".
Robert Craig [Fri, 28 Aug 2015 16:11:41 +0000 (12:11 -0400)]
Automatically assign default seinfo labels using the string "default".

default seinfo values are those for which policy lacks a
matching stanza in the corresponding mac_permissions.xml
file. Prior to this change the null object reference was
used to represent the non-matching state. This is in
contrast to a policy supplied default stanza which will
assign a non null seinfo value. Confused yet?

Basically, two default states were distinguished in the
code to describe the two cases where either a policy stanza
spelled out the base case seinfo label or not. Policy
writers could either supply a default stanza or rely on
the class instantiated value assigned by the ApplicationInfo
object. The hope was that the later assignment could be
used to help distinguish the cases where policy writers
intentionally white listed apps. This change will just use
the hard coded "default" string implicitly to describe all
cases and removes the idea of a policy supplied default stanza.

Change-Id: Ib7b01ee004775f24db9a69340a31784b967ce030
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
8 years agoMerge "Tighten up compiler flags for aidl"
Christopher Wiley [Mon, 31 Aug 2015 20:59:23 +0000 (20:59 +0000)]
Merge "Tighten up compiler flags for aidl"

8 years agoTighten up compiler flags for aidl
Christopher Wiley [Mon, 24 Aug 2015 22:06:58 +0000 (15:06 -0700)]
Tighten up compiler flags for aidl

Turn all warnings to errors, with special cases for places where
yacc forces us to be lenient.  Remove one variable with 0 references
elsewhere in the code.

These flags are confined to be clang only because the Windows SDK build
is using an older compiler that does not understand these flags.

Change-Id: I6407bd331c25b8845bde46e9a917bce1d6857bd8

8 years agoMerge "Remove USE_MINGW, whitelist windows modules"
Dan Willemsen [Mon, 31 Aug 2015 19:30:57 +0000 (19:30 +0000)]
Merge "Remove USE_MINGW, whitelist windows modules"

8 years agoMerge "Revert "Tighten up compiler flags for aidl""
Christopher Wiley [Mon, 31 Aug 2015 19:13:04 +0000 (19:13 +0000)]
Merge "Revert "Tighten up compiler flags for aidl""

8 years agoRevert "Tighten up compiler flags for aidl"
Christopher Wiley [Mon, 31 Aug 2015 19:07:40 +0000 (19:07 +0000)]
Revert "Tighten up compiler flags for aidl"

This reverts commit eea2353a3427f7d157c46e24ab6aba1378e16c2e.

This seems to have broken the build because whatever compiler the builder is using doesn't understand the same "turn off this warning" flags as my local host's compiler.

Change-Id: Ic68b7065b161a5ae683b7082c67147835833e0fa

8 years agoMerge "aidl: Pull main() into dedicated file"
Christopher Wiley [Mon, 31 Aug 2015 19:03:44 +0000 (19:03 +0000)]
Merge "aidl: Pull main() into dedicated file"

8 years agoaidl: Pull main() into dedicated file
Christopher Wiley [Sun, 30 Aug 2015 17:57:07 +0000 (10:57 -0700)]
aidl: Pull main() into dedicated file

This separates the main() entry point from the functionality we're
hoping to test.  While here, redo the header guards to be consistent
accross the codebae.

Bug: 23516947
Change-Id: I61666126bdba0941f14bd0f031caaa30367b864a
Test: Compiles

8 years agoMerge "Tighten up compiler flags for aidl"
Christopher Wiley [Mon, 31 Aug 2015 17:52:03 +0000 (17:52 +0000)]
Merge "Tighten up compiler flags for aidl"

8 years agoTighten up compiler flags for aidl
Christopher Wiley [Mon, 24 Aug 2015 22:06:58 +0000 (15:06 -0700)]
Tighten up compiler flags for aidl

Turn all warnings to errors, with special cases for places where
yacc forces us to be lenient.  Remove one variable with 0 references
elsewhere in the code.

Change-Id: Ia7819795eb162e9c77d215088aee4c45bd87c1af

8 years agoSet up aidl for gtest
Casey Dahlin [Fri, 28 Aug 2015 22:46:48 +0000 (15:46 -0700)]
Set up aidl for gtest

Bug: 23516947

Change-Id: I1c004868525f462d04894a7b96c671b626061ab5
Signed-off-by: Casey Dahlin <sadmac@google.com>
8 years agoam 3fc6f441: (-s ours) Merge "Do not merge namespaces"
Christopher Wiley [Fri, 28 Aug 2015 23:19:02 +0000 (23:19 +0000)]
am 3fc6f441: (-s ours) Merge "Do not merge namespaces"

* commit '3fc6f441ac88aff88a9c474bd1ae93dfde3ed11a':
  Do not merge namespaces

8 years agoMerge "Do not merge namespaces"
Christopher Wiley [Fri, 28 Aug 2015 23:09:50 +0000 (23:09 +0000)]
Merge "Do not merge namespaces"

8 years agoRemove USE_MINGW, whitelist windows modules
Dan Willemsen [Wed, 19 Aug 2015 18:13:56 +0000 (11:13 -0700)]
Remove USE_MINGW, whitelist windows modules

Bug: 23566667
Change-Id: Ie6b8c51e2b6d6273f99f4e361c440136d7c6915c

8 years agoAdd trace code to system server.
Yasuhiro Matsuda [Tue, 30 Jun 2015 08:07:32 +0000 (17:07 +0900)]
Add trace code to system server.

- Add TRACE_TAG_SYSTEM_SERVER for tracing system server code.
- Add a few more tracing code to the code paths related to boot.

BUG: 21739901
BUG: 22207144
Change-Id: I08b424d2f83783f512c3818394099909cd55f327

8 years agoam 258b56ec: am 9f37bd8a: am 0238bf24: docs: New auto Desktop Head Unit (DHU) docs
Rich Slogar [Thu, 27 Aug 2015 01:48:25 +0000 (01:48 +0000)]
am 258b56ec: am 9f37bd8a: am 0238bf24: docs: New auto Desktop Head Unit (DHU) docs

* commit '258b56ec58fca2b740bcfe9a2af81f0f59a14abb':
  docs: New auto Desktop Head Unit (DHU) docs

8 years agoam a4a1e68f: am ebdedb47: (-s ours) am 42994097: am a1be8b43: LayoutLib: Update golde...
Deepanshu Gupta [Thu, 27 Aug 2015 01:48:18 +0000 (01:48 +0000)]
am a4a1e68f: am ebdedb47: (-s ours) am 42994097: am a1be8b43: LayoutLib: Update golden test images. [DO NOT MERGE]

* commit 'a4a1e68fe76134a940e02f3d425b3429791177e5':
  LayoutLib: Update golden test images. [DO NOT MERGE]

8 years agoam c2e98ca3: am 68ff174b: (-s ours) am 2b99b5da: am c9862b44: An ugly hack to render...
Deepanshu Gupta [Thu, 27 Aug 2015 01:48:12 +0000 (01:48 +0000)]
am c2e98ca3: am 68ff174b: (-s ours) am 2b99b5da: am c9862b44: An ugly hack to render CalendarView. [DO NOT MERGE]

* commit 'c2e98ca39a67bd24e305826c51a0ba85f7b59ef4':
  An ugly hack to render CalendarView. [DO NOT MERGE]

8 years agoam 58967c69: am d9600c98: (-s ours) am 7eb81868: am b1ad4a15: LayoutLib: Fix true...
Deepanshu Gupta [Thu, 27 Aug 2015 01:48:06 +0000 (01:48 +0000)]
am 58967c69: am d9600c98: (-s ours) am 7eb81868: am b1ad4a15: LayoutLib: Fix true transparency in status bar. [DO NOT MERGE]

* commit '58967c69b96492fb64a258c0131f0c6791057ed3':
  LayoutLib: Fix true transparency in status bar. [DO NOT MERGE]

8 years agoam 5d282e3f: am 5769732e: (-s ours) am 9d6e87b6: am da687918: Make getInt in BridgeTy...
Deepanshu Gupta [Thu, 27 Aug 2015 01:48:00 +0000 (01:48 +0000)]
am 5d282e3f: am 5769732e: (-s ours) am 9d6e87b6: am da687918: Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]

* commit '5d282e3f3c280642ce7c99c4e72f0ccf7132fc09':
  Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]

8 years agoam 47530108: am 728fc731: (-s ours) am c43506fc: am 8c674fda: Fix layout mirroring...
Deepanshu Gupta [Thu, 27 Aug 2015 01:47:53 +0000 (01:47 +0000)]
am 47530108: am 728fc731: (-s ours) am c43506fc: am 8c674fda: Fix layout mirroring. [DO NOT MERGE]

* commit '47530108c22cb8eb50d425cd10be48b4fb3005b0':
  Fix layout mirroring. [DO NOT MERGE]

8 years agoam 4116ed7b: am 37ae8f4e: (-s ours) am 918e62f1: am 7aa36129: Fix typo: s/FullScreen...
Deepanshu Gupta [Thu, 27 Aug 2015 01:47:46 +0000 (01:47 +0000)]
am 4116ed7b: am 37ae8f4e: (-s ours) am 918e62f1: am 7aa36129: Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE]

* commit '4116ed7b0524b42d8d3b0cb01545e1dc3bac6c6c':
  Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE]

8 years agoam dfcd35d7: am e4b4b084: (-s ours) am eb15670c: am 92f373fe: Fix Matrix_Delegate...
Deepanshu Gupta [Thu, 27 Aug 2015 01:47:39 +0000 (01:47 +0000)]
am dfcd35d7: am e4b4b084: (-s ours) am eb15670c: am 92f373fe: Fix Matrix_Delegate.native_getValues() [DO NOT MERGE]

* commit 'dfcd35d7929025fdcd2f13a1fe5ec84090f07716':
  Fix Matrix_Delegate.native_getValues() [DO NOT MERGE]

8 years agoam a0bef60c: am 05ed2d91: (-s ours) am 42e53ecb: am 66d91401: Revert to using AppThem...
Deepanshu Gupta [Thu, 27 Aug 2015 01:47:32 +0000 (01:47 +0000)]
am a0bef60c: am 05ed2d91: (-s ours) am 42e53ecb: am 66d91401: Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]

* commit 'a0bef60c3670e4484b5bfc3fc5cc79b7f9918603':
  Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]

8 years agoam af3deb06: am 21f66a6b: (-s ours) am 5078ad32: am 6b1b651f: Fix imports. [DO NOT...
Deepanshu Gupta [Thu, 27 Aug 2015 01:47:24 +0000 (01:47 +0000)]
am af3deb06: am 21f66a6b: (-s ours) am 5078ad32: am 6b1b651f: Fix imports. [DO NOT MERGE]

* commit 'af3deb06be28a6131d854ae4a109aa49dc8179dc':
  Fix imports. [DO NOT MERGE]

8 years agoam 554f3a35: am 34f6f597: (-s ours) am 4a213763: am 5ad4dae1: Fix theme namespace...
Deepanshu Gupta [Thu, 27 Aug 2015 01:47:18 +0000 (01:47 +0000)]
am 554f3a35: am 34f6f597: (-s ours) am 4a213763: am 5ad4dae1: Fix theme namespace in tests. [DO NOT MERGE]

* commit '554f3a352a0a2091321cf72b4ddf32869c901dcb':
  Fix theme namespace in tests. [DO NOT MERGE]

8 years agoam 4ed5de88: am 39b4f4cc: (-s ours) am f988761c: am 723e136f: Run setup for full...
Deepanshu Gupta [Thu, 27 Aug 2015 01:47:11 +0000 (01:47 +0000)]
am 4ed5de88: am 39b4f4cc: (-s ours) am f988761c: am 723e136f: Run setup for full tests only once. [DO NOT MERGE]

* commit '4ed5de8861ab085f253086141de7c96f54acf41a':
  Run setup for full tests only once. [DO NOT MERGE]

8 years agoam dd7d7aac: am de8da279: (-s ours) am e54dbc4a: am 3ba16c1d: LayoutLib: fix layout...
Deepanshu Gupta [Thu, 27 Aug 2015 01:47:03 +0000 (01:47 +0000)]
am dd7d7aac: am de8da279: (-s ours) am e54dbc4a: am 3ba16c1d: LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]

* commit 'dd7d7aacfea68dfd20a7b6d4be67777a7cfe2993':
  LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]

8 years agoam 28677599: am 963cac18: (-s ours) am 147c0506: am 55a36337: LayoutLib: Fix Status...
Deepanshu Gupta [Thu, 27 Aug 2015 01:46:56 +0000 (01:46 +0000)]
am 28677599: am 963cac18: (-s ours) am 147c0506: am 55a36337: LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE]

* commit '28677599a9adc1e41f4e48623fbbe7839a43223a':
  LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE]

8 years agoam fe0e8709: am 76111ecb: (-s ours) am e093bbf3: am d861fd81: Set support flag for...
Deepanshu Gupta [Thu, 27 Aug 2015 01:46:49 +0000 (01:46 +0000)]
am fe0e8709: am 76111ecb: (-s ours) am e093bbf3: am d861fd81: Set support flag for custom layouts for RecyclerView. [DO NOT MERGE]

* commit 'fe0e87094c1df6ee3ec5a1bf420c74b134bd673d':
  Set support flag for custom layouts for RecyclerView. [DO NOT MERGE]

8 years agoam b342aba0: am c5bd6146: (-s ours) am 8a50ecea: am 82fae621: LayoutLib: translucent...
Deepanshu Gupta [Thu, 27 Aug 2015 01:46:42 +0000 (01:46 +0000)]
am b342aba0: am c5bd6146: (-s ours) am 8a50ecea: am 82fae621: LayoutLib: translucent sys ui bars [DO NOT MERGE]

* commit 'b342aba021104d167608349e69e1398b65cf57de':
  LayoutLib: translucent sys ui bars [DO NOT MERGE]

8 years agoam 23a7bc9c: am 6dcfe1e2: (-s ours) am d4be80d9: am 9068539a: Update nav bar icons...
Deepanshu Gupta [Thu, 27 Aug 2015 01:46:34 +0000 (01:46 +0000)]
am 23a7bc9c: am 6dcfe1e2: (-s ours) am d4be80d9: am 9068539a: Update nav bar icons. [DO NOT MERGE]

* commit '23a7bc9cc65952c6127ccbbdce6c80fc4c04e89a':
  Update nav bar icons. [DO NOT MERGE]

8 years agoam 884cc475: am 5eaa09ff: (-s ours) am d1dde055: am e5afc311: Move the layout code...
Deepanshu Gupta [Thu, 27 Aug 2015 01:46:26 +0000 (01:46 +0000)]
am 884cc475: am 5eaa09ff: (-s ours) am d1dde055: am e5afc311: Move the layout code out of RenderSessionImpl. [DO NOT MERGE]

* commit '884cc4754b4062d7263000006b58bade82d09985':
  Move the layout code out of RenderSessionImpl. [DO NOT MERGE]

8 years agoam d7e001e6: am 1f2c15ca: (-s ours) am 87f5fd6b: am c989950d: CalendarView rendering...
Deepanshu Gupta [Thu, 27 Aug 2015 01:46:14 +0000 (01:46 +0000)]
am d7e001e6: am 1f2c15ca: (-s ours) am 87f5fd6b: am c989950d: CalendarView rendering: use R.styleable to find attr. [DO NOT MERGE]

* commit 'd7e001e640d5255525138631dd8b62fda8d63da0':
  CalendarView rendering: use R.styleable to find attr. [DO NOT MERGE]

8 years agoam 19229a8e: am 36e164e0: (-s ours) am e3eecca9: am b2fdaca9: Add tools:openDrawer...
Deepanshu Gupta [Thu, 27 Aug 2015 01:46:08 +0000 (01:46 +0000)]
am 19229a8e: am 36e164e0: (-s ours) am e3eecca9: am b2fdaca9: Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE]

* commit '19229a8e1f929393b0bbd2cdd1f27bfe15865411':
  Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE]

8 years agoam c1b987f0: am 13cd7660: (-s ours) am b4060700: am a14ec6f4: Change tools:list_item...
Deepanshu Gupta [Thu, 27 Aug 2015 01:45:59 +0000 (01:45 +0000)]
am c1b987f0: am 13cd7660: (-s ours) am b4060700: am a14ec6f4: Change tools:list_item to listitem. [DO NOT MERGE]

* commit 'c1b987f0b574b25ecea115562122faf5c74b142e':
  Change tools:list_item to listitem. [DO NOT MERGE]

8 years agoam af51c690: am a556d756: (-s ours) am 8bfc5a9d: am b1e21330: Implement tools:list_it...
Deepanshu Gupta [Thu, 27 Aug 2015 01:45:49 +0000 (01:45 +0000)]
am af51c690: am a556d756: (-s ours) am 8bfc5a9d: am b1e21330: Implement tools:list_item for RecyclerView. [DO NOT MERGE]

* commit 'af51c69052e4a7e4c8a10358812976bb188f050c':
  Implement tools:list_item for RecyclerView. [DO NOT MERGE]

8 years agoam 7f795d16: am 413d41aa: (-s ours) am 67b73b60: am cd4d5b3f: Support AppBar from...
Jens Ole Lauridsen [Thu, 27 Aug 2015 01:45:41 +0000 (01:45 +0000)]
am 7f795d16: am 413d41aa: (-s ours) am 67b73b60: am cd4d5b3f: Support AppBar from Material Design. [DO NOT MERGE]

* commit '7f795d16e1207eced6fbb48e889da49105a0b8b5':
  Support AppBar from Material Design. [DO NOT MERGE]

8 years agoam 1df73c5b: am 7a92c26e: (-s ours) am 6f5709ca: am de13095d: Update tests per new...
Deepanshu Gupta [Thu, 27 Aug 2015 01:45:32 +0000 (01:45 +0000)]
am 1df73c5b: am 7a92c26e: (-s ours) am 6f5709ca: am de13095d: Update tests per new layoutlib_api [DO NOT MERGE]

* commit '1df73c5bef6dd20e1b3a0dd79f9e56a4a1609e6d':
  Update tests per new layoutlib_api [DO NOT MERGE]

8 years agoam 40960191: am c5c2ea04: (-s ours) am 9a13b1e7: am db67caa6: Add missing resolveResV...
Deepanshu Gupta [Thu, 27 Aug 2015 01:45:26 +0000 (01:45 +0000)]
am 40960191: am c5c2ea04: (-s ours) am 9a13b1e7: am db67caa6: Add missing resolveResValue call. [DO NOT MERGE]

* commit '409601913682269d6682259ceaa706a29cec56c4':
  Add missing resolveResValue call. [DO NOT MERGE]

8 years agoam b9d2a529: am e4acf0ad: (-s ours) am ad16968d: am 6eef1246: LayoutLib: Skip classes...
Deepanshu Gupta [Thu, 27 Aug 2015 01:45:19 +0000 (01:45 +0000)]
am b9d2a529: am e4acf0ad: (-s ours) am ad16968d: am 6eef1246: LayoutLib: Skip classes from java package. [DO NOT MERGE]

* commit 'b9d2a529952d3ee0edd483bf19b59a080dcd9c98':
  LayoutLib: Skip classes from java package. [DO NOT MERGE]

8 years agoam 637eacfd: am 7911c8b9: (-s ours) am 15e549a8: am 4f5e6c63: Skip warnings for some...
Deepanshu Gupta [Thu, 27 Aug 2015 01:45:07 +0000 (01:45 +0000)]
am 637eacfd: am 7911c8b9: (-s ours) am 15e549a8: am 4f5e6c63: Skip warnings for some unresolved references. [DO NOT MERGE]

* commit '637eacfdb4d2b499806f4a1b3b5ebab78b5f3bca':
  Skip warnings for some unresolved references. [DO NOT MERGE]

8 years agoam 8cafc782: am 13670bc6: (-s ours) am 669e4969: am 3e875dbb: Fix import order. ...
Deepanshu Gupta [Thu, 27 Aug 2015 01:45:00 +0000 (01:45 +0000)]
am 8cafc782: am 13670bc6: (-s ours) am 669e4969: am 3e875dbb: Fix import order. [DO NOT MERGE]

* commit '8cafc782d8763b0bc9044c21595026707828596b':
  Fix import order. [DO NOT MERGE]

8 years agoam 57185503: am 6dc8bab9: (-s ours) am c0fd1316: am e5fa12ad: Fix ParserFactory not...
Deepanshu Gupta [Thu, 27 Aug 2015 01:44:53 +0000 (01:44 +0000)]
am 57185503: am 6dc8bab9: (-s ours) am c0fd1316: am e5fa12ad: Fix ParserFactory not initialized error. [DO NOT MERGE]

* commit '57185503a11d8509a432c673a1cb38d5efd6aacf':
  Fix ParserFactory not initialized error. [DO NOT MERGE]

8 years agoam e779dec0: am bf7907bf: (-s ours) am 6b836cd0: am a287b842: Fix NPE in BridgeContex...
Deepanshu Gupta [Thu, 27 Aug 2015 01:44:45 +0000 (01:44 +0000)]
am e779dec0: am bf7907bf: (-s ours) am 6b836cd0: am a287b842: Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]

* commit 'e779dec0ab98637a4269bcd2a8cdd9c0e2e01bf2':
  Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]

8 years agoam 42872f73: am f2bf5470: (-s ours) am 91e456d2: am e698bb27: Fix BridgeTypedArray...
Deepanshu Gupta [Thu, 27 Aug 2015 01:44:37 +0000 (01:44 +0000)]
am 42872f73: am f2bf5470: (-s ours) am 91e456d2: am e698bb27: Fix BridgeTypedArray.getType() [DO NOT MERGE]

* commit '42872f7342f49a58ecee62d547e8a074b9321871':
  Fix BridgeTypedArray.getType() [DO NOT MERGE]

8 years agoam 35f6976e: am 7ec7805a: (-s ours) am 8a6295e8: am e481e713: Include Shapes in Layou...
Deepanshu Gupta [Thu, 27 Aug 2015 01:44:30 +0000 (01:44 +0000)]
am 35f6976e: am 7ec7805a: (-s ours) am 8a6295e8: am e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]

* commit '35f6976e10d04dd6fc6576895689b3327250cdc4':
  Include Shapes in LayoutLib. [DO NOT MERGE]

8 years agoam dc78e108: am 594939fc: (-s ours) am 66d5f24d: am ba5a02c5: LayoutLib: Support...
Deepanshu Gupta [Thu, 27 Aug 2015 01:44:23 +0000 (01:44 +0000)]
am dc78e108: am 594939fc: (-s ours) am 66d5f24d: am ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE]

* commit 'dc78e1080ed5c37b3ed8b633c025421d584a0aed':
  LayoutLib: Support getting resource arrays. [DO NOT MERGE]

8 years agoam 0ae85775: am bd343c1f: (-s ours) am b32e44ff: am a5ffed0b: LayoutLib: Change nulli...
Deepanshu Gupta [Thu, 27 Aug 2015 01:44:15 +0000 (01:44 +0000)]
am 0ae85775: am bd343c1f: (-s ours) am b32e44ff: am a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE]

* commit '0ae857751caf4ecec16e164ca7a0e5a35eab8764':
  LayoutLib: Change nullity annotations. [DO NOT MERGE]

8 years agoam 7d7f0f47: am 9b1ac269: (-s ours) am 1754824c: am c96ef952: Add documentation about...
Deepanshu Gupta [Thu, 27 Aug 2015 01:44:04 +0000 (01:44 +0000)]
am 7d7f0f47: am 9b1ac269: (-s ours) am 1754824c: am c96ef952: Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]

* commit '7d7f0f4731b9908117cf157ee3fbf992d9e09c6d':
  Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]

8 years agoam fcc62127: am 6b7f9ae6: (-s ours) am 678f0ea2: am b318ff54: Make DatePicker renderi...
Deepanshu Gupta [Thu, 27 Aug 2015 01:43:57 +0000 (01:43 +0000)]
am fcc62127: am 6b7f9ae6: (-s ours) am 678f0ea2: am b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]

* commit 'fcc6212778590a9d22379f21b414c4ee1e1bf7c2':
  Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]

8 years agoam e3040e9a: am d6363d86: (-s ours) am 2e57c1e2: am cc5e69e4: Inject anonymous inner...
Deepanshu Gupta [Thu, 27 Aug 2015 01:43:48 +0000 (01:43 +0000)]
am e3040e9a: am d6363d86: (-s ours) am 2e57c1e2: am cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE]

* commit 'e3040e9a737b442a7860eaaafb691c780f3d0ce6':
  Inject anonymous inner classes of injected classes [DO NOT MERGE]

8 years agoam 56c72f4c: am 5b886bb0: (-s ours) am 899daf75: am d7e89906: Update platformDir...
Deepanshu Gupta [Thu, 27 Aug 2015 01:43:42 +0000 (01:43 +0000)]
am 56c72f4c: am 5b886bb0: (-s ours) am 899daf75: am d7e89906: Update platformDir search in tests. [DO NOT MERGE]

* commit '56c72f4c50556fc3072460fedf83145d73eb6f96':
  Update platformDir search in tests. [DO NOT MERGE]

8 years agoam 720d677f: am aae9c930: (-s ours) am 2f50403f: am afedbc47: Make Context.getClassLo...
Deepanshu Gupta [Thu, 27 Aug 2015 01:43:35 +0000 (01:43 +0000)]
am 720d677f: am aae9c930: (-s ours) am 2f50403f: am afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE]

* commit '720d677fc29fdaaa8aed14f7eb1f0137cec5c3e9':
  Make Context.getClassLoader() work. [DO NOT MERGE]

8 years agoam ef319302: am 522e67e4: (-s ours) am de3ac8f9: am 92480a9a: Fix include tag renderi...
Deepanshu Gupta [Thu, 27 Aug 2015 01:43:28 +0000 (01:43 +0000)]
am ef319302: am 522e67e4: (-s ours) am de3ac8f9: am 92480a9a: Fix include tag rendering. [DO NOT MERGE]

* commit 'ef31930253fe9c0b0cc7d42c0f11181ffe69ea1b':
  Fix include tag rendering. [DO NOT MERGE]

8 years agoam a6d71a2c: am 8df6131a: (-s ours) am 50e1406a: am f6b08547: Show better error messa...
Deepanshu Gupta [Thu, 27 Aug 2015 01:43:21 +0000 (01:43 +0000)]
am a6d71a2c: am 8df6131a: (-s ours) am 50e1406a: am f6b08547: Show better error message for color attr not found. [DO NOT MERGE]

* commit 'a6d71a2c37fbf4357ddb084ed5050c27826514ac':
  Show better error message for color attr not found. [DO NOT MERGE]

8 years agoam df44516b: am 59f026e9: (-s ours) am 81990c3f: am b1370c26: Fix build: udpate parse...
Deepanshu Gupta [Thu, 27 Aug 2015 01:43:15 +0000 (01:43 +0000)]
am df44516b: am 59f026e9: (-s ours) am 81990c3f: am b1370c26: Fix build: udpate parser factory method [DO NOT MERGE]

* commit 'df44516b78b6dd3c2ae5849a07a6e07e9302b668':
  Fix build: udpate parser factory method [DO NOT MERGE]

8 years agoam bf019327: am b44f7fda: (-s ours) am 0a07bb95: am aa729889: Don\'t keep LayoutlibCa...
Deepanshu Gupta [Thu, 27 Aug 2015 01:43:03 +0000 (01:43 +0000)]
am bf019327: am b44f7fda: (-s ours) am 0a07bb95: am aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE]

* commit 'bf01932797aa5ae8d94643b7861b45c89364b2ba':
  Don't keep LayoutlibCallback reference. [DO NOT MERGE]

8 years agoam ef284578: am 78d77bc3: (-s ours) am bbbdc2ad: am 5c90c4f4: Remove kxml dependency...
Deepanshu Gupta [Thu, 27 Aug 2015 01:42:56 +0000 (01:42 +0000)]
am ef284578: am 78d77bc3: (-s ours) am bbbdc2ad: am 5c90c4f4: Remove kxml dependency [DO NOT MERGE]

* commit 'ef284578ee3b77890bcb45bbd1f89a5d244bced1':
  Remove kxml dependency [DO NOT MERGE]

8 years agoam 9f37bd8a: am 0238bf24: docs: New auto Desktop Head Unit (DHU) docs
Rich Slogar [Thu, 27 Aug 2015 01:37:51 +0000 (01:37 +0000)]
am 9f37bd8a: am 0238bf24: docs: New auto Desktop Head Unit (DHU) docs

* commit '9f37bd8a5d61b2fa05af1b259ec0461673434ec8':
  docs: New auto Desktop Head Unit (DHU) docs

8 years agoam ebdedb47: (-s ours) am 42994097: am a1be8b43: LayoutLib: Update golden test images...
Deepanshu Gupta [Thu, 27 Aug 2015 01:33:03 +0000 (01:33 +0000)]
am ebdedb47: (-s ours) am 42994097: am a1be8b43: LayoutLib: Update golden test images. [DO NOT MERGE]

* commit 'ebdedb47e5a24f980e7820c65c60c5bc04c5895d':
  LayoutLib: Update golden test images. [DO NOT MERGE]

8 years agoam 68ff174b: (-s ours) am 2b99b5da: am c9862b44: An ugly hack to render CalendarView...
Deepanshu Gupta [Thu, 27 Aug 2015 01:32:58 +0000 (01:32 +0000)]
am 68ff174b: (-s ours) am 2b99b5da: am c9862b44: An ugly hack to render CalendarView. [DO NOT MERGE]

* commit '68ff174b09d9c2bbacf4baa2ba88045df52af4db':
  An ugly hack to render CalendarView. [DO NOT MERGE]

8 years agoam d9600c98: (-s ours) am 7eb81868: am b1ad4a15: LayoutLib: Fix true transparency...
Deepanshu Gupta [Thu, 27 Aug 2015 01:32:53 +0000 (01:32 +0000)]
am d9600c98: (-s ours) am 7eb81868: am b1ad4a15: LayoutLib: Fix true transparency in status bar. [DO NOT MERGE]

* commit 'd9600c986dac7e133280ea812dd809532ab90d76':
  LayoutLib: Fix true transparency in status bar. [DO NOT MERGE]

8 years agoam 5769732e: (-s ours) am 9d6e87b6: am da687918: Make getInt in BridgeTypedArray...
Deepanshu Gupta [Thu, 27 Aug 2015 01:32:48 +0000 (01:32 +0000)]
am 5769732e: (-s ours) am 9d6e87b6: am da687918: Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]

* commit '5769732e6e945196bb8bc3e10231d63d6c8686b9':
  Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]

8 years agoam 728fc731: (-s ours) am c43506fc: am 8c674fda: Fix layout mirroring. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:32:42 +0000 (01:32 +0000)]
am 728fc731: (-s ours) am c43506fc: am 8c674fda: Fix layout mirroring. [DO NOT MERGE]

* commit '728fc73130908157770decc593d6e3131e1efd80':
  Fix layout mirroring. [DO NOT MERGE]

8 years agoam 37ae8f4e: (-s ours) am 918e62f1: am 7aa36129: Fix typo: s/FullScreen/Fullscreen...
Deepanshu Gupta [Thu, 27 Aug 2015 01:32:35 +0000 (01:32 +0000)]
am 37ae8f4e: (-s ours) am 918e62f1: am 7aa36129: Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE]

* commit '37ae8f4ef8921e8810c0a42fc11f3b45a72ffc03':
  Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE]

8 years agoam e4b4b084: (-s ours) am eb15670c: am 92f373fe: Fix Matrix_Delegate.native_getValues...
Deepanshu Gupta [Thu, 27 Aug 2015 01:32:30 +0000 (01:32 +0000)]
am e4b4b084: (-s ours) am eb15670c: am 92f373fe: Fix Matrix_Delegate.native_getValues() [DO NOT MERGE]

* commit 'e4b4b08446a5f74ba4a5b12c56f1157ab549e72a':
  Fix Matrix_Delegate.native_getValues() [DO NOT MERGE]

8 years agoam 05ed2d91: (-s ours) am 42e53ecb: am 66d91401: Revert to using AppTheme for LayoutL...
Deepanshu Gupta [Thu, 27 Aug 2015 01:32:24 +0000 (01:32 +0000)]
am 05ed2d91: (-s ours) am 42e53ecb: am 66d91401: Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]

* commit '05ed2d91484f6185bcca17a71f045be36810e409':
  Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]

8 years agoam 21f66a6b: (-s ours) am 5078ad32: am 6b1b651f: Fix imports. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:32:18 +0000 (01:32 +0000)]
am 21f66a6b: (-s ours) am 5078ad32: am 6b1b651f: Fix imports. [DO NOT MERGE]

* commit '21f66a6b9feb449f837f94c65595d67b4b91bf33':
  Fix imports. [DO NOT MERGE]

8 years agoam 34f6f597: (-s ours) am 4a213763: am 5ad4dae1: Fix theme namespace in tests. [DO...
Deepanshu Gupta [Thu, 27 Aug 2015 01:32:12 +0000 (01:32 +0000)]
am 34f6f597: (-s ours) am 4a213763: am 5ad4dae1: Fix theme namespace in tests. [DO NOT MERGE]

* commit '34f6f597901b50426b805a62bc0dbf32ef4b6692':
  Fix theme namespace in tests. [DO NOT MERGE]

8 years agoam 39b4f4cc: (-s ours) am f988761c: am 723e136f: Run setup for full tests only once...
Deepanshu Gupta [Thu, 27 Aug 2015 01:32:06 +0000 (01:32 +0000)]
am 39b4f4cc: (-s ours) am f988761c: am 723e136f: Run setup for full tests only once. [DO NOT MERGE]

* commit '39b4f4cc75e3e4e2a306102a76d4f9f2b9a1e2e6':
  Run setup for full tests only once. [DO NOT MERGE]

8 years agoam de8da279: (-s ours) am e54dbc4a: am 3ba16c1d: LayoutLib: fix layout when nav bar...
Deepanshu Gupta [Thu, 27 Aug 2015 01:32:00 +0000 (01:32 +0000)]
am de8da279: (-s ours) am e54dbc4a: am 3ba16c1d: LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]

* commit 'de8da2793df3b3cb05215fa5dd02542548a54b9f':
  LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]

8 years agoam 963cac18: (-s ours) am 147c0506: am 55a36337: LayoutLib: Fix Status/Navigation...
Deepanshu Gupta [Thu, 27 Aug 2015 01:31:53 +0000 (01:31 +0000)]
am 963cac18: (-s ours) am 147c0506: am 55a36337: LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE]

* commit '963cac18adefa1e60a827183b95b4e61a23929d3':
  LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE]

8 years agoam 76111ecb: (-s ours) am e093bbf3: am d861fd81: Set support flag for custom layouts...
Deepanshu Gupta [Thu, 27 Aug 2015 01:31:48 +0000 (01:31 +0000)]
am 76111ecb: (-s ours) am e093bbf3: am d861fd81: Set support flag for custom layouts for RecyclerView. [DO NOT MERGE]

* commit '76111ecbbde11e0cdddbb76530cf865f8846603e':
  Set support flag for custom layouts for RecyclerView. [DO NOT MERGE]

8 years agoam c5bd6146: (-s ours) am 8a50ecea: am 82fae621: LayoutLib: translucent sys ui bars...
Deepanshu Gupta [Thu, 27 Aug 2015 01:31:40 +0000 (01:31 +0000)]
am c5bd6146: (-s ours) am 8a50ecea: am 82fae621: LayoutLib: translucent sys ui bars [DO NOT MERGE]

* commit 'c5bd6146f73a24008414d5bb8c07550e2c7f66ed':
  LayoutLib: translucent sys ui bars [DO NOT MERGE]

8 years agoam 6dcfe1e2: (-s ours) am d4be80d9: am 9068539a: Update nav bar icons. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:31:34 +0000 (01:31 +0000)]
am 6dcfe1e2: (-s ours) am d4be80d9: am 9068539a: Update nav bar icons. [DO NOT MERGE]

* commit '6dcfe1e2b42f4c20860a34e47359cb559ae8c8f1':
  Update nav bar icons. [DO NOT MERGE]

8 years agoam 5eaa09ff: (-s ours) am d1dde055: am e5afc311: Move the layout code out of RenderSe...
Deepanshu Gupta [Thu, 27 Aug 2015 01:31:27 +0000 (01:31 +0000)]
am 5eaa09ff: (-s ours) am d1dde055: am e5afc311: Move the layout code out of RenderSessionImpl. [DO NOT MERGE]

* commit '5eaa09ff9e4cbf71fd8ca312029987c0c3d43f9e':
  Move the layout code out of RenderSessionImpl. [DO NOT MERGE]