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

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

Baligh Uddin [Sat, 5 Jul 2014 22:40:58 +0000 (15:40 -0700)]

Import translations. DO NOT MERGE

Change-Id: I7fc09c4e2f022c81a461d7228727ddc84ad6bb96
Auto-generated-cl: translation import

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.

This commit is a combination of 5 commits:
e0660d31c256e02e5f5e2967508a7205d1f62f86
7e149f02c4e4403101e7e0e88af36cd4ab6f3554
66d3314301a8983c7070a15ea68daacc7300b7f2
c6364fd90de1600526d3431ce0740b6b856e48f0
2d8c52dc4502b8407705d5b6efe628cb657b20b4

Change-Id: I675a98db39fea4525e3673656af1764eb7e5bb96

commit | commitdiff | tree

Robert Ly [Tue, 10 Jun 2014 02:39:28 +0000 (02:39 +0000)]

am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore

* commit 'f3cecfa2185ef5622992b21da8204b8b6590ef2d':
Add documentation for AndroidKeyStore

commit | commitdiff | tree

Robert Ly [Tue, 10 Jun 2014 02:36:10 +0000 (02:36 +0000)]

am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore

* commit '55d525b26b716351625798675afe69c6cf43cf5a':
Add documentation for AndroidKeyStore

commit | commitdiff | tree

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

commit | commitdiff | tree

Amit Mahajan [Fri, 6 Jun 2014 23:53:34 +0000 (16:53 -0700)]

Handle provisioning APN by turning off/on radio.

The change is specific to AT&T as they want no signaling from device during provisioning.
I've tested following cases:
- expired AT&T SIM to make sure provisioning flow works as expected.
- airplane mode on/off with both active and expired AT&T SIM.
- wifi <-> mobile transitions work okay.
- LTE with Verizon SIM (basic sanity).

bug: 13190133

Change-Id: I215963174ae6000ae71d1dda693f95413f3d6e81

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:41:47 +0000 (20:41 +0000)]

am dcfba78f: am ed5ab0f0: 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 'dcfba78fbb4dad6792113383b2d32eff7f2c1f88':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:38:25 +0000 (20:38 +0000)]

am ed5ab0f0: 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 'ed5ab0f01eac6686165f67fe0e9dec3bb48bbb4b':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

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]

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:20:52 +0000 (20:20 +0000)]

am 328b1f92: (-s ours) am 5d3e3851: 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 '328b1f92787bb4d793398ba6d8aa9b2025c62ca1':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

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

Merge branch 'klp-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev

commit | commitdiff | tree

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

am 2983ee55: (-s ours) am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev

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

commit | commitdiff | tree

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

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

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:15:37 +0000 (20:15 +0000)]

am 5d3e3851: 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 '5d3e3851bbe1ab0b30e593b371e98f02f5ed2f5d':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:15:33 +0000 (20:15 +0000)]

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

* commit '12b657d74961ba5a6175162b7548cce4e77c9bbc':
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: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]

commit | commitdiff | tree

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]

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 21:06:02 +0000 (21:06 +0000)]

am 2a57694d: (-s ours) am e2edd753: 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 '2a57694d0ae30eeca7239c7efae4e6bf478b781a':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 21:02:55 +0000 (21:02 +0000)]

am e2edd753: 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 'e2edd753e8a58de5958b5145f9ea7d2f5484a6ca':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

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]

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:47:34 +0000 (20:47 +0000)]

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

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

commit | commitdiff | tree

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

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

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

commit | commitdiff | tree

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

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

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

commit | commitdiff | tree

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

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

* commit 'dd46bfd09522fa7450293bbcb2f3ae5ecc85b882':
Remove @NonNull attribute [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: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]

commit | commitdiff | tree

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]

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:57 +0000 (20:30 +0000)]

am 661e158b: (-s ours) am 2ac96a09: am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '661e158b0a754f1123485673ac050e388e8056a2':
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:27:08 +0000 (20:27 +0000)]

am 2ac96a09: am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '2ac96a093b12883c44327edba899e6c79ee71a7b':
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: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]

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 [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

Jim Miller [Fri, 25 Apr 2014 19:52:00 +0000 (12:52 -0700)]

Fix crash in widget pager - DO NOT MERGE

Fixes bug 14299491

Change-Id: I3c94cbd7f7923dc5a429c9929bc432a5dd29d04f

commit | commitdiff | tree

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

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

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

commit | commitdiff | tree

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

am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build

* commit 'b5b4756565a5f74c6eb2ca7f90ac839a4289daae':
Fix build

commit | commitdiff | tree

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

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

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

commit | commitdiff | tree

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

am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build

* commit '98822f0eba746b4f8c8a622f21c2d32dad08453f':
Fix build

commit | commitdiff | tree

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]

commit | commitdiff | tree

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

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

* commit '6e923e1b51c87e7b20a98dfc2fff52ca9115c9d4':
Fix build

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:23:50 +0000 (21:23 +0000)]

am 3450dc32: am 06018d92: 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 '3450dc325670cc8e7855c93193cf6f59cf7be430':
resolve conflicts for merge 5a7b3b65 correctly

commit | commitdiff | tree

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

am fcfb8801: am 18b1525a: 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 'fcfb8801b27fd40ff27c380b8bad9b9a210effca':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]

commit | commitdiff | tree

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

am 6fd1703e: (-s ours) am 0d33f604: 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 '6fd1703eb96669bb5c985c9de8d08107e800824c':
Support actionProviderClass attribute for menus [DO NOT MERGE]

commit | commitdiff | tree

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

am 2322a910: am 75fc74d6: am 203964c0: am b7e1bef1: am b607cb82: am 27c9b568: am e969ee5e: resolved conflicts for merge of d388afad to jb-mr1.1-dev

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

commit | commitdiff | tree

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

am eb5b38b1: (-s ours) am a350f96e: 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 'eb5b38b167dd5f094acc085ede494966ed0024c5':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

commit | commitdiff | tree

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

am b520cc45: am cf2af661: am 752b90f2: am 919ce205: am 03bf747f: am 858ab06a: am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev

* commit 'b520cc45996de4a172147d4e934768ec6c417666':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 21:18:06 +0000 (21:18 +0000)]

am 06018d92: 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 '06018d92e8eedecc8b567f5d4c797cd8096cfffa':
resolve conflicts for merge 5a7b3b65 correctly

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 21:18:03 +0000 (21:18 +0000)]

am 18b1525a: 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 '18b1525ac7666933befd6085461391ad1087b19a':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 21:18:00 +0000 (21:18 +0000)]

am 0d33f604: 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 '0d33f604d61b843a988d1bf5b9e6b421f553808b':
Support actionProviderClass attribute for menus [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 21:17:57 +0000 (21:17 +0000)]

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

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

commit | commitdiff | tree

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

am a350f96e: 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 'a350f96ec97ce5ea6c61683f85f4e39fe45fa42b':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help