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

OSDN Git Service

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

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Tom Taylor [Tue, 4 Nov 2014 18:18:16 +0000 (18:18 +0000)]

am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

* commit '44f6d0d5810ce507394cc514481d977315d2496f':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

commit | commitdiff | tree

Tom Taylor [Tue, 4 Nov 2014 18:11:02 +0000 (18:11 +0000)]

am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

* commit '4c5b16d7409bbd947af3e0dadf4b1901b48e4cd7':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

commit | commitdiff | tree

Tom Taylor [Tue, 4 Nov 2014 18:03:07 +0000 (18:03 +0000)]

am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

* commit '66aa87ae0355a4e6c8ed56704fec4fb225ed18f6':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

commit | commitdiff | tree

Tom Taylor [Tue, 4 Nov 2014 17:53:14 +0000 (17:53 +0000)]

am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

* commit '90743d6409eaecdc869fdcf891ffff8b0a5757ec':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

commit | commitdiff | tree

Tom Taylor [Tue, 4 Nov 2014 17:43:41 +0000 (17:43 +0000)]

am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

* commit 'bfb7ffeb3e240784c1ea2a50187c120e6445b20e':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

commit | commitdiff | tree

Tom Taylor [Wed, 15 Oct 2014 16:45:39 +0000 (09:45 -0700)]

Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

Bug 17969135

Use query (instead of rawQuery) and pass in arguments instead of building
the query with a giant string. Add a unit test that fails with the old
code but passes with the new code.

Change-Id: Id04a1db6fb95fcd923e1f36f5ab3b94402590918

commit | commitdiff | tree

Deepanshu Gupta [Fri, 26 Sep 2014 04:37:23 +0000 (04:37 +0000)]

am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]

* commit '1fce990ce9098afe96e75ec1583c771826c50637':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Fri, 26 Sep 2014 04:22:39 +0000 (04:22 +0000)]

am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]

* commit '04861ed488f5aaa62acbaf903e359ea9edd8e9f9':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Fri, 26 Sep 2014 00:59:08 +0000 (00:59 +0000)]

am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]

* commit '91043364b95fe58225437e2220d497ef6e33edf6':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Fri, 26 Sep 2014 00:46:07 +0000 (00:46 +0000)]

am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]

* commit '52be792bad7cbd059daab02a23e28ef1df61f2ce':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Fri, 26 Sep 2014 00:36:41 +0000 (00:36 +0000)]

am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]

* commit '27d3b9264e2dcfb86400a60891a5e39cdf027d55':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Fri, 26 Sep 2014 00:34:21 +0000 (00:34 +0000)]

am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]

* commit '8bf221bd706a1bcb18f2c14cacbe4edbbc0a3a61':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 25 Sep 2014 22:42:15 +0000 (15:42 -0700)]

Fix error when using list as actionBarNavMode. [DO NOT MERGE]

A bug in the framework leads to the wrong argument being passed to
defStyleRes when obtaining styled attributes. The framework however just
ignores the attribute in such a case. LayoutLib logs an error to help
developers find bugs in their code.

The bug was seen when using list as the actionBarNavMode.

This change ignores the attribute if it detects that it's the framework
bug. Also, we change the error to a warning.

Change-Id: I58e1fe4469de0329a27b577d75c0a59c48d0381b

commit | commitdiff | tree

Deepanshu Gupta [Thu, 25 Sep 2014 22:42:15 +0000 (15:42 -0700)]

Fix error when using list as actionBarNavMode. [DO NOT MERGE]

A bug in the framework leads to the wrong argument being passed to
defStyleRes when obtaining styled attributes. The framework however just
ignores the attribute in such a case. LayoutLib logs an error to help
developers find bugs in their code.

The bug was seen when using list as the actionBarNavMode.

This change ignores the attribute if it detects that it's the framework
bug. Also, we change the error to a warning.

Change-Id: I58e1fe4469de0329a27b577d75c0a59c48d0381b

commit | commitdiff | tree

Deepanshu Gupta [Thu, 4 Sep 2014 05:12:31 +0000 (05:12 +0000)]

am 12bbbb2b: am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev

* commit '12bbbb2bb71a532f3b3ec59fd9232902420cf3d2':
Resolve color xml attributes properly. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 4 Sep 2014 05:12:28 +0000 (05:12 +0000)]

am ffd0e8bf: am a6f32d7f: am 64d4ef8c: am 63889480: am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]

* commit 'ffd0e8bf9f803e4881736d1b2e8b54e31888e980':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 4 Sep 2014 04:59:40 +0000 (04:59 +0000)]

am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev

* commit 'd3328343deaff01cfe5eadf57ac27da30832aabe':
Resolve color xml attributes properly. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 4 Sep 2014 04:59:34 +0000 (04:59 +0000)]

am a6f32d7f: am 64d4ef8c: am 63889480: am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]

* commit 'a6f32d7ff19319c5ed61d113672f112a6f54c938':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 4 Sep 2014 04:46:39 +0000 (04:46 +0000)]

am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev

* commit 'f264080d227617d431804e110e65cc154e8a8d17':
Resolve color xml attributes properly. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 4 Sep 2014 04:46:28 +0000 (04:46 +0000)]

am 64d4ef8c: am 63889480: am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]

* commit '64d4ef8cf2f9ec6b7af6795fa9feb18cc07ba3d9':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 4 Sep 2014 04:31:01 +0000 (04:31 +0000)]

am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev

* commit '3ce96efc2ceeb1666db330ad837409fd494ec108':
Resolve color xml attributes properly. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 4 Sep 2014 04:27:43 +0000 (04:27 +0000)]

am 63889480: am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]

* commit '638894803cc8bb57d73ea6aaddd1accbeb52643e':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 4 Sep 2014 03:18:39 +0000 (03:18 +0000)]

am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev

* commit 'd181ffe6881d0a1b49193b5f70dac0cc7cc9aae3':
Resolve color xml attributes properly. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 4 Sep 2014 03:18:27 +0000 (03:18 +0000)]

am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]

* commit '6530cca1edf79ddcd520e2e5bc2695adfb0d3680':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 4 Sep 2014 02:02:20 +0000 (02:02 +0000)]

am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '4f53d92c2f10f774cfdcf17ded82551ea19924be':
Resolve color xml attributes properly. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 4 Sep 2014 02:01:59 +0000 (02:01 +0000)]

am edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev

* commit 'edc8b8579ba9f47bbca0ac0c2f0eb11d0eadab09':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 4 Sep 2014 01:54:08 +0000 (01:54 +0000)]

Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev

commit | commitdiff | tree

Deepanshu Gupta [Thu, 4 Sep 2014 01:53:58 +0000 (01:53 +0000)]

Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev

commit | commitdiff | tree

Deepanshu Gupta [Thu, 4 Sep 2014 01:50:45 +0000 (01:50 +0000)]

Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev

commit | commitdiff | tree

Jean-Michel Trivi [Fri, 29 Aug 2014 17:08:50 +0000 (17:08 +0000)]

am f0336eb8: am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver

* commit 'f0336eb87d32414eb14865044be41ea590e7a6ac':
Do not restore the media button event receiver

commit | commitdiff | tree

Jean-Michel Trivi [Fri, 29 Aug 2014 16:54:22 +0000 (16:54 +0000)]

am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver

* commit '2cb287f9cc79b0cd9e8ea37adf4b3411253eb244':
Do not restore the media button event receiver

commit | commitdiff | tree

Jean-Michel Trivi [Fri, 29 Aug 2014 16:41:10 +0000 (16:41 +0000)]

am 9ea996a3: Do not restore the media button event receiver

* commit '9ea996a330a21af89f308bdf52e02a470643013b':
Do not restore the media button event receiver

commit | commitdiff | tree

Deepanshu Gupta [Tue, 19 Aug 2014 23:15:37 +0000 (16:15 -0700)]

Fix "@null" resource values in LayoutLib. [DO NOT MERGE]

Bug: http://b.android.com/74072
Change-Id: Ib84906d86772ac3df2407e71ad2167797bec4542
(cherry picked from commit c9cd725f1013bed27e6f6594b176c10a6a4c0f16)

commit | commitdiff | tree

Deepanshu Gupta [Tue, 19 Aug 2014 23:15:37 +0000 (16:15 -0700)]

Fix "@null" resource values in LayoutLib. [DO NOT MERGE]

Bug: http://b.android.com/74072
Change-Id: Ib84906d86772ac3df2407e71ad2167797bec4542
(cherry picked from commit c9cd725f1013bed27e6f6594b176c10a6a4c0f16)

commit | commitdiff | tree

Deepanshu Gupta [Sat, 9 Aug 2014 21:14:45 +0000 (14:14 -0700)]

Resolve color xml attributes properly. [DO NOT MERGE]

Color attributes were not being converted to int properly. The
conversion to int was a simple string to int using base 16. This change
resolves the colors as per #RGB, #ARGB, #RRGGBB or #AARRGGBB format
depending on the length of the attribute. All values that begin with '#'
are treated as colors.

Bug: http://b.android.com/73845
Change-Id: I8ad089b821af1e290b9b95771b50213fe2fdd784
(cherry picked from commit 81564dfe60020fa977d39d168f682e9d61825660)

commit | commitdiff | tree

Deepanshu Gupta [Sat, 9 Aug 2014 21:14:45 +0000 (14:14 -0700)]

Resolve color xml attributes properly. [DO NOT MERGE]

Color attributes were not being converted to int properly. The
conversion to int was a simple string to int using base 16. This change
resolves the colors as per #RGB, #ARGB, #RRGGBB or #AARRGGBB format
depending on the length of the attribute. All values that begin with '#'
are treated as colors.

Bug: http://b.android.com/73845
Change-Id: I8ad089b821af1e290b9b95771b50213fe2fdd784
(cherry picked from commit 81564dfe60020fa977d39d168f682e9d61825660)

commit | commitdiff | tree

Jean-Michel Trivi [Mon, 25 Aug 2014 18:23:36 +0000 (11:23 -0700)]

Do not restore the media button event receiver

Do not restore the media button event receiver on behalf of the
application that registered. Prevents reported vulnerability.

Bug 15428797

Change-Id: I507faefd211def0d2ea074706de76c0d06157c5a

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 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: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: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: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: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: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 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)]

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 [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: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 [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 [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 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: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: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: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: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: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)]

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)

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 a0fc1f46264e316449402525fbeb033138ec5f49)

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

commit | commitdiff | tree

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]

commit | commitdiff | tree

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]

commit | commitdiff | tree

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

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

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:54:14 +0000 (20:54 +0000)]

am 70efbad0: am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp

* commit '70efbad0648eb96e9becbd0529cc1f34b6ffb986':
resolve conflicts for merge 5a7b3b65 correctly

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:54:12 +0000 (20:54 +0000)]

am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev

* commit '8bf73eae6c98532c8a597b885b948b9878555441':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:54:09 +0000 (20:54 +0000)]

am 5454be00: am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]

* commit '5454be00b182b206bbc9dcd35b88da63631f7e8e':
Support actionProviderClass attribute for menus [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:51:14 +0000 (20:51 +0000)]

am aab60856: am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

* commit 'aab60856f9df28da8246568621b59ed57bdc424b':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:51:11 +0000 (20:51 +0000)]

am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev

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

commit | commitdiff | tree

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

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:48:06 +0000 (20:48 +0000)]

am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

* commit 'ebd909cca1f69028878f15e6fb0ece6e8c8da584':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:40:14 +0000 (13:40 -0700)]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:38:12 +0000 (20:38 +0000)]

am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev

* commit '85b751949b3d383494523bb98b016157d76787f3':
Add view cookies for action bar menus. [DO NOT MERGE]

commit | commitdiff | tree

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

am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE]

* commit 'a154687620a6d53f17c7abc36d419884cd6df2b7':
Add missing layout params to xlarge action bar. [DO NOT MERGE]

frameworks/base

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.