git.osdn.net Git - android-x86/frameworks-base.git/log

(root) / android-x86 / frameworks-base.git / log

Deepanshu Gupta [Wed, 6 Aug 2014 22:21:54 +0000 (22:21 +0000)]

am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs

* commit 'f970d2c201649843b8d51d094b865f16b15bc0bc':
Fix SystemProperties in LayoutLib.

commit | commitdiff | tree

Deepanshu Gupta [Wed, 6 Aug 2014 22:18:04 +0000 (22:18 +0000)]

am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs

* commit '79c3f678d21f6b3c058623217cbe5dd57a553fe8':
Fix SystemProperties in LayoutLib.

commit | commitdiff | tree

Deepanshu Gupta [Wed, 6 Aug 2014 22:13:18 +0000 (22:13 +0000)]

am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs

* commit '206c691bfdb3a6b78d35c7481365980dd387b8c9':
Fix SystemProperties in LayoutLib.

commit | commitdiff | tree

Deepanshu Gupta [Wed, 6 Aug 2014 22:09:13 +0000 (22:09 +0000)]

am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs

* commit '72cf03a27a73e91d4a3eabf74e0384b310f4a5b2':
Fix SystemProperties in LayoutLib.

commit | commitdiff | tree

Deepanshu Gupta [Wed, 6 Aug 2014 22:05:38 +0000 (22:05 +0000)]

am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs

* commit '3a544a81b3d2d529b2995f4b5db2077760d440b5':
Fix SystemProperties in LayoutLib.

commit | commitdiff | tree

Deepanshu Gupta [Wed, 6 Aug 2014 22:00:14 +0000 (15:00 -0700)]

resolved conflicts for merge of a232a68d to jb-mr1.1-docs

Change-Id: I1ea220e3e0a81880db68abab87beab56dc4a336c

commit | commitdiff | tree

Deepanshu Gupta [Wed, 6 Aug 2014 21:41:02 +0000 (14:41 -0700)]

resolved conflicts for merge of 5476cfee to jb-mr1-dev

Change-Id: I5197271e6fdd36fed9ca9f9b7221d9a99141a4b4

commit | commitdiff | tree

Deepanshu Gupta [Wed, 6 Aug 2014 21:28:24 +0000 (21:28 +0000)]

am 505c675c: Fix SystemProperties in LayoutLib.

* commit '505c675c3a536ac7c6ad264eb62542537532119c':
Fix SystemProperties in LayoutLib.

commit | commitdiff | tree

Deepanshu Gupta [Wed, 6 Aug 2014 00:33:35 +0000 (17:33 -0700)]

Fix SystemProperties in LayoutLib.

Not all System Properties were used via Build class. Also, properties
like SDK_INT which called SystemProperties directly were not initialized
properly.

This change is essentially cherry picking of the relevant parts from the
following commits:
984749bf75c9ce9d3401b8410ea7d6276544b6ee
167bc25bceea9280bbe4858db4cb8233f86ce325

Bug: http://b.android.com/73046
Change-Id: Ia0fb467ee6d5fdedda500d57d02be20006f115df

commit | commitdiff | tree

Deepanshu Gupta [Fri, 18 Jul 2014 22:12:02 +0000 (22:12 +0000)]

am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit 'c735197420948ffff757dbe6d00028a87ed09c15':
Fix style resolution for styles with '.' [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Fri, 18 Jul 2014 22:07:40 +0000 (22:07 +0000)]

am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit 'a3966c66ee24109ca4b71f591f0d740ee37987de':
Fix style resolution for styles with '.' [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Fri, 18 Jul 2014 22:01:45 +0000 (22:01 +0000)]

am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit '627439401ec86a083eefdc61728d6aa75ce9a4e5':
Fix style resolution for styles with '.' [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Fri, 18 Jul 2014 21:58:42 +0000 (21:58 +0000)]

am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit '8c71ff298b10ebdd3e5dec6f69f70176161b7e0a':
Fix style resolution for styles with '.' [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Fri, 18 Jul 2014 21:55:21 +0000 (21:55 +0000)]

am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit '87234e8544370d86b305fc55d6a5021c38b65495':
Fix style resolution for styles with '.' [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Fri, 18 Jul 2014 21:50:15 +0000 (21:50 +0000)]

am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit '9c48ab82084828087c47086f2379b4927ec057e2':
Fix style resolution for styles with '.' [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Fri, 18 Jul 2014 21:49:11 +0000 (21:49 +0000)]

am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev

* commit '610341b3eb99ef2f070c96d60ca30c28283f1dea':
Fix style resolution for styles with '.' [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Fri, 18 Jul 2014 21:45:28 +0000 (21:45 +0000)]

am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit 'ccf7b2aac600b6069f03f7f420872b64cc5e6726':
Fix style resolution for styles with '.' [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Fri, 18 Jul 2014 21:45:19 +0000 (21:45 +0000)]

am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev

* commit '95bbeb967243d453bf793cd06dd2dd914667fee9':
Fix style resolution for styles with '.' [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Fri, 18 Jul 2014 21:44:11 +0000 (21:44 +0000)]

am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]

* commit '696eb4da44097693a18e99e1f38d062ac1f0e147':
Fix default level flags for bidi. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Fri, 18 Jul 2014 21:41:18 +0000 (21:41 +0000)]

am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev

* commit 'b8e4e8e1f4fb1139368dc3f36e2d7bcf59dc32e9':
Fix style resolution for styles with '.' [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Fri, 18 Jul 2014 21:39:35 +0000 (21:39 +0000)]

am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit '5af7324ace4f318d7395b680beabec7a0f0e39b3':
Fix style resolution for styles with '.' [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Fri, 18 Jul 2014 21:39:33 +0000 (21:39 +0000)]

am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]

* commit 'c39916f7dadb2f8be2e7523c5ceade9f04a94e1e':
Fix default level flags for bidi. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Fri, 18 Jul 2014 21:38:39 +0000 (21:38 +0000)]

am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev

* commit 'd3ac01ff7616f7135b8b5044816690c93fba8548':
Fix style resolution for styles with '.' [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Fri, 18 Jul 2014 21:35:21 +0000 (21:35 +0000)]

am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]

* commit '37f54f4c1e2d97b33bdd8abe5f196debecc5437d':
Fix default level flags for bidi. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Fri, 18 Jul 2014 21:31:26 +0000 (21:31 +0000)]

am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]

* commit '357ebfc5e43ecb35da9207d78a9a8a6c117a1002':
Fix default level flags for bidi. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Fri, 18 Jul 2014 21:33:40 +0000 (21:33 +0000)]

Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr2-dev

commit | commitdiff | tree

Deepanshu Gupta [Fri, 18 Jul 2014 21:33:46 +0000 (21:33 +0000)]

Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr1.1-dev

commit | commitdiff | tree

Deepanshu Gupta [Thu, 10 Jul 2014 01:10:34 +0000 (18:10 -0700)]

Fix default level flags for bidi. [DO NOT MERGE]

Bug: b.android.com/69432
Change-Id: I26ff34a6d1f85c928a9a1cb3dfd739fc7d3a8fb6
(cherry picked from commit 95e636130dfc2c0203f16f5315a7fe14b03eb689)

commit | commitdiff | tree

Deepanshu Gupta [Thu, 10 Jul 2014 01:10:34 +0000 (18:10 -0700)]

Fix default level flags for bidi. [DO NOT MERGE]

Bug: b.android.com/69432
Change-Id: I26ff34a6d1f85c928a9a1cb3dfd739fc7d3a8fb6
(cherry picked from commit 95e636130dfc2c0203f16f5315a7fe14b03eb689)

commit | commitdiff | tree

Deepanshu Gupta [Thu, 10 Jul 2014 00:27:07 +0000 (17:27 -0700)]

Fix style resolution for styles with '.' [DO NOT MERGE]

Bug: b.android.com/72698
Change-Id: I96fb549cf5787d9e8cde2245524a8173471a60ca
(cherry picked from commit f2fa79e9b56b71f8aa30e6675255df69f88a173d)

commit | commitdiff | tree

Deepanshu Gupta [Thu, 10 Jul 2014 00:27:07 +0000 (17:27 -0700)]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 10 Jul 2014 00:27:07 +0000 (17:27 -0700)]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 8 Jul 2014 23:38:48 +0000 (23:38 +0000)]

am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]

* commit '0b4876043be6eb9c2eaccb8270370b9275d4d899':
Change font family name. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 8 Jul 2014 23:30:20 +0000 (23:30 +0000)]

am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]

* commit 'd53a9fcb7c56d6495e88cc3e39e2892e449a9171':
Change font family name. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 8 Jul 2014 23:30:10 +0000 (23:30 +0000)]

am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '10e540733416a94206a656ce749fa046ab3e7655':
Add a script to rename fonts for SDK. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 8 Jul 2014 23:26:15 +0000 (23:26 +0000)]

am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

* commit 'ca82da92db2949f134af01f577167639cbfc79bc':
Add a script to rename fonts for SDK. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 8 Jul 2014 23:25:22 +0000 (23:25 +0000)]

am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]

* commit '979f9c685e31a07e9bd1d89c0947b863dd456940':
Change font family name. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 8 Jul 2014 23:23:21 +0000 (23:23 +0000)]

am e30d3fdd: Change font family name. [DO NOT MERGE]

* commit 'e30d3fdd04840bfd90a172492edcacffeeea81da':
Change font family name. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 8 Jul 2014 23:21:34 +0000 (23:21 +0000)]

am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '5d0db7f2ff4a16a40bbdba9b1ae9b4434554bced':
Add a script to rename fonts for SDK. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 8 Jul 2014 23:17:22 +0000 (23:17 +0000)]

am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '5455ddc48fc31faea739a21cb46bda04bf36bb92':
Add a script to rename fonts for SDK. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Sat, 28 Jun 2014 01:39:32 +0000 (18:39 -0700)]

Change font family name. [DO NOT MERGE]

During the SDK build, rename the Font's Family name and not just the
PS Name. Updating the PS name doesn't work.

Change-Id: I997b5eec9f493ce97b95c33101ee426e773890c1
(cherry picked from commit 24f58dbce27f8fa56de992d0c03168a88ae80bad)

commit | commitdiff | tree

Deepanshu Gupta [Sat, 28 Jun 2014 01:39:32 +0000 (18:39 -0700)]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 8 Jul 2014 23:13:32 +0000 (23:13 +0000)]

Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

commit | commitdiff | tree

Deepanshu Gupta [Fri, 16 May 2014 01:39:30 +0000 (18:39 -0700)]

Add a script to rename fonts for SDK. [DO NOT MERGE]

Create a script that will rename the PS name encoded in the font that is
to be shipped with the SDK.

Change-Id: I675a98db39fea4525e3673656af1764eb7e5bb96
(cherry picked from commit b49e21e153c59b31503a376d62257e4fc6e7ce4f)

commit | commitdiff | tree

Deepanshu Gupta [Fri, 16 May 2014 01:39:30 +0000 (18:39 -0700)]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:30:05 +0000 (20:30 +0000)]

am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev

* commit 'bad112f23f09f8839b4b7294439b0fe725cc2034':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:27:49 +0000 (20:27 +0000)]

am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev

* commit 'c8235b8e7446c849df10ff2f897d2a3743b4934d':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:21:00 +0000 (20:21 +0000)]

am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev

* commit 'ffcad247d0401fb529441ecc65437226c2845461':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:17:40 +0000 (20:17 +0000)]

am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev

* commit '904b89c58465b0d0822478be514572ec752df3e8':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:14:52 +0000 (20:14 +0000)]

am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev

* commit '295184bc71a32a4e9418d34b2adeb0cef4b39781':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:10:55 +0000 (20:10 +0000)]

am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev

* commit '8782a12005e90bbd49be579fb8ede3a42a007380':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:08:29 +0000 (20:08 +0000)]

am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev

* commit 'e87c63e0e41cf34ef4b1ea1b06bf6a94c1f229c6':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:07:43 +0000 (20:07 +0000)]

Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 19:43:09 +0000 (19:43 +0000)]

am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev

* commit 'd2dff39b587bd073fcf5c97753c8a29e16f4ef57':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 19:43:01 +0000 (12:43 -0700)]

resolved conflicts for merge of 61fb5784 to jb-mr1-dev

Change-Id: I079d5db0d69fd1972e6754cdd1829dfd1645202d

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 19:38:01 +0000 (19:38 +0000)]

am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev

* commit 'b1ca2a0c7fda713f5f2ebe928706dd813d87cabb':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 19:34:15 +0000 (19:34 +0000)]

am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev

* commit 'f52fcc70541224c2d926f59461bde5a8bd6545a7':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 19:32:05 +0000 (19:32 +0000)]

am 3ff08eb6: Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

* commit '3ff08eb6bf68868d4f4e872fbbf1ecaf521934a9':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 19:31:31 +0000 (19:31 +0000)]

Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:53:49 +0000 (20:53 +0000)]

am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit 'd0f215756aa3767db8a73ece7fe9f401256dd263':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:49:37 +0000 (20:49 +0000)]

am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '3c1d72c2ef1819e0de5599761b21f00351ca3feb':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:41:34 +0000 (20:41 +0000)]

am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit 'ab869de19efc24265eebda19a97628713e072178':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:36:41 +0000 (20:36 +0000)]

am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit 'cd192c0b1ca56af3ed3dfdb38626304de0412254':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:35:12 +0000 (20:35 +0000)]

am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '0ab0d875d46d6d8974c9cf3ea5856dcfb557e9a4':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:35:09 +0000 (20:35 +0000)]

am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE]

* commit 'ffbf24476c153bbd9293261cc14d9648f72b7369':
Remove @NonNull attribute [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:32:55 +0000 (20:32 +0000)]

am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '704954c96a797e45d421b8d910ca2426d19f6b37':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:30:53 +0000 (20:30 +0000)]

am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '28f550f010045d5df9e7762a567fb0351499b846':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:30:50 +0000 (20:30 +0000)]

am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE]

* commit '083af20d9dc0d14eadd2ba03951579f88cd1f671':
Remove @NonNull attribute [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:28:48 +0000 (20:28 +0000)]

am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '5f56ea8d802b3a7ce5ba8992a84dd3b462676e0e':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:25:51 +0000 (20:25 +0000)]

am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '03a832669ded18a99d4ac37f047a82d2b198302a':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:25:48 +0000 (20:25 +0000)]

am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE]

* commit '531bdb5b57a7a903cea16baedb914e34df941651':
Remove @NonNull attribute [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:24:25 +0000 (20:24 +0000)]

am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit 'f48ab8feec71419e574a2d2f08a29be87743ef07':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:21:12 +0000 (20:21 +0000)]

am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '08d2007b33838570a96c8df890f0757fa920904c':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:21:10 +0000 (20:21 +0000)]

am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '3b7c09b4336f421c489523c10278ecfbfb0708a7':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:21:08 +0000 (20:21 +0000)]

am fe6f3049: Remove @NonNull attribute [DO NOT MERGE]

* commit 'fe6f30491f8506a4b2ad895a0f3e68de180e4243':
Remove @NonNull attribute [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 15 May 2014 16:32:12 +0000 (09:32 -0700)]

Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

Mark the menus in the ActionBar and the ones in the Overflow popup
separately. This enables the IDE to differentiate between the two and
enable gestures such as double-click to open the menu xml for menus in
the ActionBar and single click for the menus in the Overflow popup.

Change-Id: I7a23f87d34d618a134ffbe3a665be695915d4bae
(cherry picked from commit 03c0735017a34bac9ea69600b8cf980775331f0e)

commit | commitdiff | tree

Deepanshu Gupta [Fri, 16 May 2014 00:37:34 +0000 (17:37 -0700)]

LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

?attr/foo in platform files wasn't resolved properly. The IDE checked
the app namespace for the attribute even though it is being referenced
from a platform file.

Change-Id: I7db6dfef5b540d99804c298120578da9d060b886
(cherry picked from commit 08d2007b33838570a96c8df890f0757fa920904c)

commit | commitdiff | tree

Deepanshu Gupta [Thu, 15 May 2014 16:32:12 +0000 (09:32 -0700)]

commit | commitdiff | tree

Deepanshu Gupta [Fri, 16 May 2014 00:37:34 +0000 (17:37 -0700)]

commit | commitdiff | tree

Deepanshu Gupta [Fri, 30 May 2014 19:18:26 +0000 (12:18 -0700)]

Remove @NonNull attribute [DO NOT MERGE]

The tools prebuilt in this branch doesn't have the annotation.

Change-Id: I852f91c5202ed5f4c393d1226a4fa0b6fa4d63c1

commit | commitdiff | tree

Deepanshu Gupta [Thu, 15 May 2014 16:32:12 +0000 (09:32 -0700)]

commit | commitdiff | tree

Deepanshu Gupta [Fri, 16 May 2014 00:37:34 +0000 (17:37 -0700)]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 14 May 2014 00:05:38 +0000 (00:05 +0000)]

am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev

* commit 'f33a2f62a54ef966375a7fe8706ce713386d843e':
Fix build due to incorrect merges [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 14 May 2014 00:05:35 +0000 (00:05 +0000)]

am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build

* commit '90d57721692e45fe6259136296e3cd5b669443fc':
Fix build

commit | commitdiff | tree

Deepanshu Gupta [Wed, 14 May 2014 00:00:08 +0000 (00:00 +0000)]

am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev

* commit 'f5af9a4a9a0c0a3bab43235659e3adfa2cebb52f':
Fix build due to incorrect merges [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 14 May 2014 00:00:05 +0000 (00:00 +0000)]

am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build

* commit '209745a32f0a68584aba57acf7c8d1de633b1cda':
Fix build

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 23:55:20 +0000 (23:55 +0000)]

am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev

* commit '273c5c3c4c74d29a127e614726ce2e5c5e274c20':
Fix build due to incorrect merges [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 23:55:17 +0000 (23:55 +0000)]

am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build

* commit 'c251147a2b6f461427b1ce49f7066fadc97c1faf':
Fix build

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 23:54:21 +0000 (23:54 +0000)]

am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev

* commit '9ca7a039f73e5cf84f85282cf05d637517be2a17':
Fix build due to incorrect merges [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 23:50:44 +0000 (23:50 +0000)]

am 85ec1445: am f266873c: am 1c55797d: Fix build

* commit '85ec144538de6c27b22dff1bd45491a334f626ef':
Fix build

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 23:48:31 +0000 (16:48 -0700)]

resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 23:45:30 +0000 (23:45 +0000)]

am f266873c: am 1c55797d: Fix build

* commit 'f266873c8059e78410bf43c83fb8f0fd5bfe3362':
Fix build

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 23:40:37 +0000 (23:40 +0000)]

am 40bfb60e: Fix build due to incorrect merges [DO NOT MERGE]

* commit '40bfb60efa0e92259a417a5cbfd6095759c678b7':
Fix build due to incorrect merges [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 23:40:34 +0000 (23:40 +0000)]

am 1c55797d: Fix build

* commit '1c55797d0e786b6594e769c2fa424e1b8386648e':
Fix build

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 22:52:39 +0000 (15:52 -0700)]

Fix build due to incorrect merges [DO NOT MERGE]

Change-Id: Ib3b4dafeed6ba4c07450d13d9908fb05a1a4542f

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 22:46:28 +0000 (15:46 -0700)]

Fix build

remove a line that shouldn't have been merged into this branch.

The build will still be broken for this branch, but this will fix it for
many branches downstream.

Change-Id: I2f556636640eb823dc2834afae7b536e79b79607

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 21:07:45 +0000 (21:07 +0000)]

am d10ca17d: am 8921409a: am 10fb4fe4: am d99dd3e7: am 70efbad0: am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp

* commit 'd10ca17d6feefd449595df1cb11d161c8f10dd57':
resolve conflicts for merge 5a7b3b65 correctly

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 21:07:40 +0000 (21:07 +0000)]

am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev

* commit '900954e3cd135bf43db975961056e7661f26a6c6':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 21:07:38 +0000 (21:07 +0000)]

am 7b9cc710: (-s ours) am 9c7e3064: am 1b0f6056: am c1847b54: am 5454be00: am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]

* commit '7b9cc71063869a98f35b49c2e072750dfa46e0b9':
Support actionProviderClass attribute for menus [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 21:07:35 +0000 (21:07 +0000)]

am b7e1bef1: am b607cb82: am 27c9b568: am e969ee5e: resolved conflicts for merge of d388afad to jb-mr1.1-dev

* commit 'b7e1bef1835bdb224d6ed09c3c219662e1db1f56':
Add special system view cookie to OverflowButton. [DO NOT MERGE]

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help