OSDN Git Service
Deepanshu Gupta [Tue, 8 Jul 2014 23:35:09 +0000 (23:35 +0000)]
am
d7ce8452: 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 '
d7ce84528da16ef53eb8e3c9f34a5c7ca90fd1b3':
Add a script to rename fonts for SDK. [DO NOT MERGE]
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]
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]
Deepanshu Gupta [Tue, 8 Jul 2014 23:24:17 +0000 (23:24 +0000)]
am
432d16f9: Change font family name. [DO NOT MERGE]
* commit '
432d16f97adab9d845904e25b50671cf35cfb628':
Change font family name. [DO NOT MERGE]
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]
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]
Deepanshu Gupta [Tue, 8 Jul 2014 23:15:39 +0000 (23:15 +0000)]
am
b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE]
* commit '
b49e21e153c59b31503a376d62257e4fc6e7ce4f':
Add a script to rename fonts for SDK. [DO NOT MERGE]
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)
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
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)
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
c57b410c8ef41e269f82f3b42a8d22a15c08755b)
Robert Ly [Tue, 10 Jun 2014 02:32:29 +0000 (02:32 +0000)]
am
716cc7dc: Add documentation for AndroidKeyStore
* commit '
716cc7dcac1bb9279326ab92a78a246b3a70de4e':
Add documentation for AndroidKeyStore
Deepanshu Gupta [Wed, 4 Jun 2014 20:34:14 +0000 (20:34 +0000)]
am
022d8a9f: am
bad112f2: am
c8235b8e: am
ffcad247: am
904b89c5: am
295184bc: am
8782a120: resolved conflicts for merge of
61fb5784 to jb-mr1-dev
* commit '
022d8a9f4400dc7ec2926b133fc7151d8a5c24a3':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
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]
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]
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]
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]
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]
Deepanshu Gupta [Wed, 4 Jun 2014 20:11:23 +0000 (20:11 +0000)]
am
af3f96e4: 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 '
af3f96e4349f63f862de004853ba8e10e5ee51ae':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:11:19 +0000 (20:11 +0000)]
am
dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev
* commit '
dade24b491c82ff0b96d025c908e7eaf1bab99ba':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
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]
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]
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
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]
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
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]
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]
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]
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
Deepanshu Gupta [Tue, 3 Jun 2014 20:58:41 +0000 (20:58 +0000)]
am
76364c69: 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 '
76364c6970f86bdf67622c14c9f1ebac6883998b':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
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]
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]
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]
Deepanshu Gupta [Tue, 3 Jun 2014 20:39:10 +0000 (20:39 +0000)]
am
236b7164: am
0ab0d875: (-s ours) am
28f550f0: am
03a83266: am
08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
236b71649ce008578cf77557033df322e93a1e17':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:39:08 +0000 (20:39 +0000)]
am
02d88f7b: am
ffbf2447: (-s ours) am
083af20d: am
531bdb5b: am
fe6f3049: Remove @NonNull attribute [DO NOT MERGE]
* commit '
02d88f7b350e166da3b1f480c912351a5c72d00c':
Remove @NonNull attribute [DO NOT MERGE]
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]
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]
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]
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]
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]
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]
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]
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]
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]
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]
Deepanshu Gupta [Tue, 3 Jun 2014 20:21:20 +0000 (20:21 +0000)]
am
a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
a0fc1f46264e316449402525fbeb033138ec5f49':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
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]
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]
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]
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)
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)
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
866d40fc39f7364d95085650244db59f52d4c002)
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
a0fc1f46264e316449402525fbeb033138ec5f49)
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
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
79f45b43db4dfd605d1e7ddd2c71be4ef8285269)
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
8974a5e6d8408b4cd93f1befb05cc9b654b71e4a)
Deepanshu Gupta [Wed, 14 May 2014 00:11:08 +0000 (00:11 +0000)]
am
888dad0d: am
f33a2f62: am
f5af9a4a: am
273c5c3c: am
9ca7a039: resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
* commit '
888dad0df765256f4b47268400425103106894f0':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Wed, 14 May 2014 00:11:06 +0000 (00:11 +0000)]
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]
Deepanshu Gupta [Wed, 14 May 2014 00:05:35 +0000 (00:05 +0000)]
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]
Deepanshu Gupta [Wed, 14 May 2014 00:00:05 +0000 (00:00 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 23:55:17 +0000 (23:55 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 23:50:44 +0000 (23:50 +0000)]
Deepanshu Gupta [Tue, 13 May 2014 23:48:31 +0000 (16:48 -0700)]
resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
Deepanshu Gupta [Tue, 13 May 2014 23:45:30 +0000 (23:45 +0000)]
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]
Deepanshu Gupta [Tue, 13 May 2014 23:40:34 +0000 (23:40 +0000)]
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
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
Deepanshu Gupta [Tue, 13 May 2014 21:12:42 +0000 (21:12 +0000)]
am
f41a380b: 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 '
f41a380bd97a25bee1804e43e8deba74fa100163':
resolve conflicts for merge
5a7b3b65 correctly
Deepanshu Gupta [Tue, 13 May 2014 21:12:39 +0000 (21:12 +0000)]
am
ef24a509: am
900954e3: am
2100476a: am
31a3760a: am
964023c5: am
8bf73eae: am
0ad4f2ce: resolved conflicts for merge of
7377c7be to jb-mr1-dev
* commit '
ef24a5091b63fb512d4ca9eb34df6394c3842d33':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:12:37 +0000 (21:12 +0000)]
am
4dff881b: 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 '
4dff881b997e3e8c871068ae4b237a9e0f4ab2e7':
Support actionProviderClass attribute for menus [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:12:35 +0000 (21:12 +0000)]
am
203964c0: am
b7e1bef1: am
b607cb82: am
27c9b568: am
e969ee5e: resolved conflicts for merge of
d388afad to jb-mr1.1-dev
* commit '
203964c058857d01401c905918d0d64e83e51bab':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:12:32 +0000 (21:12 +0000)]
am
0eb268a0: am
22dabb52: (-s ours) am
c261cb0d: am
f354d01a: am
aab60856: am
ebd909cc: am
ae5e0c7b: am
4eab4e14: am
5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit '
0eb268a0de02b73dd23ab2e672c35a2650a9eea4':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:12:29 +0000 (21:12 +0000)]
am
752b90f2: am
919ce205: am
03bf747f: am
858ab06a: am
ec1b4df6: resolved conflicts for merge of
b161d6ba to jb-mr1.1-dev
* commit '
752b90f2605956e0de880c2a406dc887aeb3d8c2':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
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
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]
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]
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]
Deepanshu Gupta [Tue, 13 May 2014 21:07:31 +0000 (21:07 +0000)]
am
22dabb52: (-s ours) am
c261cb0d: am
f354d01a: am
aab60856: am
ebd909cc: am
ae5e0c7b: am
4eab4e14: am
5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit '
22dabb52820d81744f46d009a27bf9294928bbee':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:07:28 +0000 (21:07 +0000)]
am
919ce205: am
03bf747f: am
858ab06a: am
ec1b4df6: resolved conflicts for merge of
b161d6ba to jb-mr1.1-dev
* commit '
919ce2051595dfa5dd047660946038d23fa688f4':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:02:23 +0000 (21:02 +0000)]
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 '
8921409a05c0e52ba453d3c4f37a9506fde9b321':
resolve conflicts for merge
5a7b3b65 correctly
Deepanshu Gupta [Tue, 13 May 2014 21:02:19 +0000 (21:02 +0000)]
am
2100476a: am
31a3760a: am
964023c5: am
8bf73eae: am
0ad4f2ce: resolved conflicts for merge of
7377c7be to jb-mr1-dev
* commit '
2100476ace68858bc7b7356b33aa525e38795592':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:02:17 +0000 (21:02 +0000)]
am
9c7e3064: am
1b0f6056: am
c1847b54: am
5454be00: am
5dae7fda: am
9359dc2e: am
2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]
* commit '
9c7e3064469e51a10503cfdf3d0215a62a3b6c8d':
Support actionProviderClass attribute for menus [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:02:14 +0000 (21:02 +0000)]
am
b607cb82: am
27c9b568: am
e969ee5e: resolved conflicts for merge of
d388afad to jb-mr1.1-dev
* commit '
b607cb82e0883a755fa6c6f9f5ec573cd79a731b':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:02:11 +0000 (21:02 +0000)]
am
c261cb0d: am
f354d01a: am
aab60856: am
ebd909cc: am
ae5e0c7b: am
4eab4e14: am
5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit '
c261cb0dcd2ea4ca35dbef1973c0a08709ce5ae1':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:02:08 +0000 (21:02 +0000)]
am
03bf747f: am
858ab06a: am
ec1b4df6: resolved conflicts for merge of
b161d6ba to jb-mr1.1-dev
* commit '
03bf747fec291b355af531bf0b04a2b1669bf92e':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:00:22 +0000 (21:00 +0000)]
am
10fb4fe4: am
d99dd3e7: am
70efbad0: am
bd5a3e65: am
1677a9bd: Merge "resolve conflicts for merge
5a7b3b65 correctly" into jb-dev-plus-aosp
* commit '
10fb4fe400625a95b3bc00b10b92814d7bc6f118':
resolve conflicts for merge
5a7b3b65 correctly
Deepanshu Gupta [Tue, 13 May 2014 21:00:19 +0000 (21:00 +0000)]
am
31a3760a: am
964023c5: am
8bf73eae: am
0ad4f2ce: resolved conflicts for merge of
7377c7be to jb-mr1-dev
* commit '
31a3760a49f7495e73f4de1c11f2e3f64ff9a7ff':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:00:16 +0000 (21:00 +0000)]
am
1b0f6056: am
c1847b54: am
5454be00: am
5dae7fda: am
9359dc2e: am
2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]
* commit '
1b0f605667dc286b1a1f423b43c4b6957993daaf':
Support actionProviderClass attribute for menus [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:00:13 +0000 (21:00 +0000)]
am
27c9b568: am
e969ee5e: resolved conflicts for merge of
d388afad to jb-mr1.1-dev
* commit '
27c9b568ed6b24f68aeee0f2a1d7b3fa83bcc056':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:59:25 +0000 (20:59 +0000)]
am
9f5f450d: am
e5c518cb: am
4e8b055b: am
6dad59e1: am
85b75194: resolved conflicts for merge of
cc9e3596 to jb-mr1.1-dev
* commit '
9f5f450dca41bcea94b2abae1c782a84c0387f6d':
Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:56:33 +0000 (20:56 +0000)]
am
f354d01a: am
aab60856: am
ebd909cc: am
ae5e0c7b: am
4eab4e14: am
5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit '
f354d01afde602034e3d531eb7cbfe5fa5c48a21':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:56:31 +0000 (20:56 +0000)]
am
858ab06a: am
ec1b4df6: resolved conflicts for merge of
b161d6ba to jb-mr1.1-dev
* commit '
858ab06a38769aaa05a4b87a600739c9294b382d':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:56:07 +0000 (20:56 +0000)]
am
d99dd3e7: am
70efbad0: am
bd5a3e65: am
1677a9bd: Merge "resolve conflicts for merge
5a7b3b65 correctly" into jb-dev-plus-aosp
* commit '
d99dd3e7322fa0071ca709e71ab34ae54677e3dc':
resolve conflicts for merge
5a7b3b65 correctly
Deepanshu Gupta [Tue, 13 May 2014 20:56:04 +0000 (20:56 +0000)]
am
964023c5: am
8bf73eae: am
0ad4f2ce: resolved conflicts for merge of
7377c7be to jb-mr1-dev
* commit '
964023c5dcd0334cdcf624eff26d791d9c9617a8':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:56:01 +0000 (20:56 +0000)]
am
c1847b54: am
5454be00: am
5dae7fda: am
9359dc2e: am
2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]
* commit '
c1847b54a391857f0871a15e97fbaae0fef0ff33':
Support actionProviderClass attribute for menus [DO NOT MERGE]