OSDN Git Service
Deepanshu Gupta [Fri, 2 May 2014 19:28:14 +0000 (19:28 +0000)]
am
789f7ada: am
27f0cf0b: (-s ours) am
10fd7f6b: am
ca2c6307: am
87be67f9: Fix layoutlib [DO NOT MERGE]
* commit '
789f7ada71ba7c3c228027d26f4c24d8ee420d0c':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:28:11 +0000 (19:28 +0000)]
am
cc5e933f: am
5c7a844c: (-s ours) am
23726255: am
77d1eca7: am
7b5d54f0: Fix ClassCastException when rendering ListView [DO NOT MERGE]
* commit '
cc5e933f39ab07561edc46070d2fa94e322b0732':
Fix ClassCastException when rendering ListView [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:28:09 +0000 (19:28 +0000)]
am
ffba5739: am
d60d0c1c: (-s ours) am
f5512973: am
fe675441: am
ce22440d: Fix text rendering [DO NOT MERGE]
* commit '
ffba573994c160f38a497ddc16552cfdc1f60063':
Fix text rendering [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:28:06 +0000 (19:28 +0000)]
am
519e77bb: am
44cc867f: (-s ours) am
9a1f13a4: am
afc623e3: am
bd9e181b: Fix layout rendering for RTL locales [DO NOT MERGE]
* commit '
519e77bbf26e0a6ea10f6e94c5b86c4c2d57c633':
Fix layout rendering for RTL locales [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:28:04 +0000 (19:28 +0000)]
am
64d1c57a: am
11976058: (-s ours) am
b80247d3: am
811b331a: am
d4875e19: Add orientation to configuration for layoutlib. [DO NOT MERGE]
* commit '
64d1c57a269002af44143dbe4619d30d96d434ca':
Add orientation to configuration for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:27:54 +0000 (19:27 +0000)]
am
175a1e60: am
e821d0cc: (-s ours) am
b27d8814: am
21cf9843: am
d1084cc0: Add missing native methods. [DO NOT MERGE]
* commit '
175a1e60366df522b3146d8ade9cb2b895a29cf9':
Add missing native methods. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:24:00 +0000 (19:24 +0000)]
am
465cb53b: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit '
465cb53ba4b4a5edff9e9a63eb97d396b94d6568':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:23:57 +0000 (19:23 +0000)]
am
b5cdfd97: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
* commit '
b5cdfd97a5bbc2c52dec907467362550aff8afc4':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:23:54 +0000 (19:23 +0000)]
am
20e0695b: Action bar rendering in layoutlib [DO NOT MERGE]
* commit '
20e0695b554e883b095f5223be10b6e1097db49f':
Action bar rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:23:50 +0000 (19:23 +0000)]
am
3c00b28b: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit '
3c00b28bf60ab01b449e16df045238f4bae4d700':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:23:47 +0000 (19:23 +0000)]
am
b85d30a2: Add missing dependency in layoutlib build file [DO NOT MERGE]
* commit '
b85d30a2c88b6a23e251347b14a75456c4daeca9':
Add missing dependency in layoutlib build file [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:23:44 +0000 (19:23 +0000)]
am
f8144032: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
* commit '
f8144032d1fb7319bfd24914b12597505cfcc91f':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:23:42 +0000 (19:23 +0000)]
am
89fdc0c5: Layoutlib tests now check methods return value [DO NOT MERGE]
* commit '
89fdc0c556cf0fe2562fb8f0476e03cd51045164':
Layoutlib tests now check methods return value [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:23:39 +0000 (19:23 +0000)]
am
27f0cf0b: (-s ours) am
10fd7f6b: am
ca2c6307: am
87be67f9: Fix layoutlib [DO NOT MERGE]
* commit '
27f0cf0b135917b52fea14406e806b35e721949e':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:23:39 +0000 (19:23 +0000)]
am
d4f0073f: Remove references to java package class Objects. [DO NOT MERGE]
* commit '
d4f0073f4805cd1036218f243d9b7c7c5bb90e41':
Remove references to java package class Objects. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:23:36 +0000 (19:23 +0000)]
am
5c7a844c: (-s ours) am
23726255: am
77d1eca7: am
7b5d54f0: Fix ClassCastException when rendering ListView [DO NOT MERGE]
* commit '
5c7a844ca19873a03bac861ed021bdeea3712ca8':
Fix ClassCastException when rendering ListView [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:23:33 +0000 (19:23 +0000)]
am
d60d0c1c: (-s ours) am
f5512973: am
fe675441: am
ce22440d: Fix text rendering [DO NOT MERGE]
* commit '
d60d0c1ce70a83263daa91d7c4c44d73878e6696':
Fix text rendering [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:23:29 +0000 (19:23 +0000)]
am
44cc867f: (-s ours) am
9a1f13a4: am
afc623e3: am
bd9e181b: Fix layout rendering for RTL locales [DO NOT MERGE]
* commit '
44cc867f7d4ca212b7003057148b8cdabb8f85fb':
Fix layout rendering for RTL locales [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:23:26 +0000 (19:23 +0000)]
am
11976058: (-s ours) am
b80247d3: am
811b331a: am
d4875e19: Add orientation to configuration for layoutlib. [DO NOT MERGE]
* commit '
1197605876d8c3029238ca9b93a95f9c41ed3266':
Add orientation to configuration for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:23:23 +0000 (19:23 +0000)]
am
e821d0cc: (-s ours) am
b27d8814: am
21cf9843: am
d1084cc0: Add missing native methods. [DO NOT MERGE]
* commit '
e821d0cc549923d0e3d2535acfa5b70fc89a1ebe':
Add missing native methods. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:19:52 +0000 (19:19 +0000)]
am
10fd7f6b: am
ca2c6307: am
87be67f9: Fix layoutlib [DO NOT MERGE]
* commit '
10fd7f6b4192fdbd847106fb0d9ec87095092ee3':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:19:48 +0000 (19:19 +0000)]
am
23726255: am
77d1eca7: am
7b5d54f0: Fix ClassCastException when rendering ListView [DO NOT MERGE]
* commit '
237262558b818ce52ec53281f2270be3e4f1ee28':
Fix ClassCastException when rendering ListView [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:19:46 +0000 (19:19 +0000)]
am
f5512973: am
fe675441: am
ce22440d: Fix text rendering [DO NOT MERGE]
* commit '
f55129731005f6939d40d7c8a0c0f8c93b472f98':
Fix text rendering [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:19:42 +0000 (19:19 +0000)]
am
9a1f13a4: am
afc623e3: am
bd9e181b: Fix layout rendering for RTL locales [DO NOT MERGE]
* commit '
9a1f13a47bfe29e344efc05f0ecabbfcb5671e06':
Fix layout rendering for RTL locales [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:19:39 +0000 (19:19 +0000)]
am
b80247d3: am
811b331a: am
d4875e19: Add orientation to configuration for layoutlib. [DO NOT MERGE]
* commit '
b80247d351b88f69192260a661dbf3d4d71e9527':
Add orientation to configuration for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:19:36 +0000 (19:19 +0000)]
am
b27d8814: am
21cf9843: am
d1084cc0: Add missing native methods. [DO NOT MERGE]
* commit '
b27d881467869539a5c8ec2510e8415912abb617':
Add missing native methods. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:15:56 +0000 (19:15 +0000)]
am
ca2c6307: am
87be67f9: Fix layoutlib [DO NOT MERGE]
* commit '
ca2c6307263b3857ba688c80277fef402215db18':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:15:52 +0000 (19:15 +0000)]
am
77d1eca7: am
7b5d54f0: Fix ClassCastException when rendering ListView [DO NOT MERGE]
* commit '
77d1eca7d2acf68f246970e59a50e8a6e1c03e20':
Fix ClassCastException when rendering ListView [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:15:50 +0000 (19:15 +0000)]
am
fe675441: am
ce22440d: Fix text rendering [DO NOT MERGE]
* commit '
fe67544161d44d54c8462c44c78fe290f2195f2e':
Fix text rendering [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:15:46 +0000 (19:15 +0000)]
am
afc623e3: am
bd9e181b: Fix layout rendering for RTL locales [DO NOT MERGE]
* commit '
afc623e34e5a2bd375da00a52c3c393d5049a1d1':
Fix layout rendering for RTL locales [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:15:43 +0000 (19:15 +0000)]
am
811b331a: am
d4875e19: Add orientation to configuration for layoutlib. [DO NOT MERGE]
* commit '
811b331ae2334161c6082f666d7b3bab788f69a3':
Add orientation to configuration for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:15:40 +0000 (19:15 +0000)]
am
21cf9843: am
d1084cc0: Add missing native methods. [DO NOT MERGE]
* commit '
21cf98438b77ab58d6c781e09aecb8ad0f682042':
Add missing native methods. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:12:30 +0000 (19:12 +0000)]
am
87be67f9: Fix layoutlib [DO NOT MERGE]
* commit '
87be67f91719234cbd381ff0242b5efc8b6aa257':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:12:27 +0000 (19:12 +0000)]
am
7b5d54f0: Fix ClassCastException when rendering ListView [DO NOT MERGE]
* commit '
7b5d54f05be61a7ab40021644a91c466e2897627':
Fix ClassCastException when rendering ListView [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:12:23 +0000 (19:12 +0000)]
am
ce22440d: Fix text rendering [DO NOT MERGE]
* commit '
ce22440d4ca94009a4fb22c3d4f924cfbf422a66':
Fix text rendering [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:12:18 +0000 (19:12 +0000)]
am
bd9e181b: Fix layout rendering for RTL locales [DO NOT MERGE]
* commit '
bd9e181b291af34f9d70db42715136f3c16ddbde':
Fix layout rendering for RTL locales [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:12:16 +0000 (19:12 +0000)]
am
d4875e19: Add orientation to configuration for layoutlib. [DO NOT MERGE]
* commit '
d4875e19f5b7c69226783b0a6590831466159f84':
Add orientation to configuration for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:12:12 +0000 (19:12 +0000)]
am
d1084cc0: Add missing native methods. [DO NOT MERGE]
* commit '
d1084cc02549dc9ee67c879f78ae929095ec19b6':
Add missing native methods. [DO NOT MERGE]
Deepanshu Gupta [Thu, 17 Oct 2013 03:27:51 +0000 (20:27 -0700)]
Fix layoutlib [DO NOT MERGE]
Fix a NPE.
The cherry-pick differs slightly from the original to remove changes not
relevant to the current branch.
Bug:
11140701
Change-Id: Id92fc5359acf6dde1bcdbc781aaf637fdb6eecbf
(cherry-picked from
28873c1f008f4fe24441923e14f30e55d6f0967a)
Deepanshu Gupta [Tue, 10 Sep 2013 22:39:41 +0000 (15:39 -0700)]
Fix ClassCastException when rendering ListView [DO NOT MERGE]
Bug: b.android.com/59300
Change-Id: Ia350adb3308daa8170bff755302760790163c811
(cherry picked from commit
54d88f7678387a6eb871ec2dccd36af4ff35b1fe)
Deepanshu Gupta [Fri, 12 Jul 2013 18:38:05 +0000 (11:38 -0700)]
Fix text rendering [DO NOT MERGE]
There are still some errors
1. Little vertical clippping for extra tall glyphs.
2. Breaking into scripts isn't perfect which results in incorrect layout
of text.
Change-Id: I54de3c05eca5e8affb1135c120eea24c3afe8a47
(cherry picked from commit
92a169fa2e1bab7d93089196c33c2de12f9eae82)
Deepanshu Gupta [Thu, 20 Jun 2013 00:29:12 +0000 (17:29 -0700)]
Fix layout rendering for RTL locales [DO NOT MERGE]
This changeset adds the framework resources for RTL locales and mirrors
the layout if the application is RTL aware.
Use ICU to check the character orientation of the locale - right to left
or left to right. Set the layout direction on the top level layout
accordingly. Also, load the RTL resources for Nav Bar when the locale is
RTL.
Change-Id: I1ed0d516ab64120a0abca413ba678036661508f8
(cherry picked from commit
eee0ea7a0b85ea6345eb7b8da5dbf17306c7339c)
Deepanshu Gupta [Fri, 12 Jul 2013 22:24:51 +0000 (15:24 -0700)]
Add orientation to configuration for layoutlib. [DO NOT MERGE]
Update the configuration with the device orientation before rendering.
Change-Id: Icd40901204fd13f90b18353e53a15e25e5b2176c
(cherry picked from commit
d97d60c0fa4613a47d591d45736299702be1cc7a)
Deepanshu Gupta [Thu, 23 May 2013 22:20:04 +0000 (15:20 -0700)]
Add missing native methods. [DO NOT MERGE]
Also contains fixes for native methods specific to the branch.
Change-Id: I7b34e2ec0164520efc658053a80f307791a992b1
(cherry-picked from commit:
279c00e8e0abb20f7e10577c77937c058da080bf)
Deepanshu Gupta [Sat, 26 Apr 2014 03:47:16 +0000 (20:47 -0700)]
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
When running in edit mode, do not use the application info to get the
icon, since it will be null.
Change-Id: I174e6126ddca341d06c5f04939470ef52f0e771c
Deepanshu Gupta [Thu, 13 Feb 2014 01:37:46 +0000 (17:37 -0800)]
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
In addition to the cherrypicked changes, appropriate changes due to
changes to com.android.internal.widget.ActionBarView are made.
The icon used in the Action Bar may not always be the right one due to
the above resolution.
Change-Id: Ib7cc314079099c010f7d53849e204db36c410357
(cherry-picked from commit
1b87390c9426c4bc9119829e9375d712dfde11c3)
Deepanshu Gupta [Thu, 12 Dec 2013 20:16:24 +0000 (12:16 -0800)]
Action bar rendering in layoutlib [DO NOT MERGE]
This also makes a couple of changes to the framework:
1. ShareActionProvider - Use edit mode to execute activity chooser code.
2. ActionBarImpl - add a new constructor for use by layoutlib.
This also relies on some changes to the plugin to pass the correct params.
Change-Id: Ia30fef816afd91ec1e439734d56b59b1323bfee2
(cherry-picked from
4ccc4bd54f85d86818f61d728c6361d2003ddd8e)
Deepanshu Gupta [Wed, 12 Mar 2014 01:02:44 +0000 (18:02 -0700)]
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
Cherry picked from klp-dev from
Change-Id: If1e7187645f0b0388f7b97d742395efd228b347a which was
cherrypicked from master with the following
Change-Id: Icfb91e566666408802dadc0e2070991151b16b9d
(cherry picked from commit
f1e7187645f0b0388f7b97d742395efd228b347a)
Deepanshu Gupta [Mon, 31 Mar 2014 23:11:13 +0000 (16:11 -0700)]
Add missing dependency in layoutlib build file [DO NOT MERGE]
Add missing dependency on built_ext_data
Change-Id: I4e7cca7f6cbc7f5b7416ac9b85a9aec01e61ecd4
(cherry-picked from commit
e345507ca4b7b83c6e0446788f4404eb697f945b)
Deepanshu Gupta [Tue, 1 Apr 2014 01:59:45 +0000 (18:59 -0700)]
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
The bug caused some classes to be missed when computing the dependencies
of the existing classes.
Change-Id: I7285ff67e016ce5d73a8550501f49acc73cfadfa
(cherry-picked from
6f9baea47757fef4745de434e09bd552fddc1f03)
Deepanshu Gupta [Wed, 16 Apr 2014 02:30:35 +0000 (19:30 -0700)]
Layoutlib tests now check methods return value [DO NOT MERGE]
The change is a cherry-pick from klp-dev.
The change also fixes the errors found by fixing the tests.
Change-Id: I87cef323c4eaee4e9f60475f01156b276593fa50
(cherry-picked from commit
bdd0ad79b9b027280bd371c7b6795b04ed89ac8f)
Deepanshu Gupta [Fri, 18 Oct 2013 03:06:44 +0000 (20:06 -0700)]
Remove references to java package class Objects. [DO NOT MERGE]
Remove references to Java 7 class java.util.Objects and replace it with
a new class that can be loaded on Java 6.
Change-Id: Ibbd9b20b8bc89e247f1d0c48d743d06d1a4f0704
(cherry-picked from commit
45f5cd49fa898a59484edfd8e291dbe10df82db2)
Kenny Root [Fri, 18 Apr 2014 22:50:12 +0000 (22:50 +0000)]
am
6888bee5: am
5a0cc789: am
2ed5f771: am
47231936: am
02bc4b04: am
4a62a6dc: am
451ed5f0: am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
6888bee598b8c88f7a93ef2da06dd5659cc92dc6':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 22:43:08 +0000 (22:43 +0000)]
am
5a0cc789: am
2ed5f771: am
47231936: am
02bc4b04: am
4a62a6dc: am
451ed5f0: am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
5a0cc78929bf56c153696ffa16b602acfcc40089':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 22:37:38 +0000 (22:37 +0000)]
am
2ed5f771: am
47231936: am
02bc4b04: am
4a62a6dc: am
451ed5f0: am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
2ed5f771c47c16e9c2be1f2025ef0a826f0290c3':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 22:31:08 +0000 (22:31 +0000)]
am
47231936: am
02bc4b04: am
4a62a6dc: am
451ed5f0: am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
47231936c0593b87c3c9898767327f1516a7ec22':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 22:26:03 +0000 (22:26 +0000)]
am
02bc4b04: am
4a62a6dc: am
451ed5f0: am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
02bc4b04239c437f88fdb82633b41cdc8a8eff6b':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 22:21:37 +0000 (22:21 +0000)]
am
4a62a6dc: am
451ed5f0: am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
4a62a6dce9a4b48f1c1c64e47a22d2319b852acd':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 22:14:14 +0000 (22:14 +0000)]
am
451ed5f0: am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
451ed5f077b9f95deae809ae620bc210c253b922':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 21:33:04 +0000 (21:33 +0000)]
am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
3ecaa88d83d04a0fd55b494829badbb41016f5a1':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 18:14:32 +0000 (18:14 +0000)]
am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
ecb013dbff5e33b95c49015fa375579e055911ae':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 17:12:40 +0000 (17:12 +0000)]
Merge "Use hidden API to validate APK chains" into jb-dev
Kenny Root [Thu, 17 Apr 2014 21:03:31 +0000 (14:03 -0700)]
Use hidden API to validate APK chains
Bug:
13678484
Change-Id: I28dedab74b0e24d47ab9f2190298156c909e9d54
Deepanshu Gupta [Wed, 16 Apr 2014 18:37:02 +0000 (18:37 +0000)]
am
5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev
* commit '
5a1250532f159842c364accf02bcfd111a6b900b':
Improve text rendering and measurement. [DO NOT MERGE]
Fix the measurement of text bounds. [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:36:58 +0000 (18:36 +0000)]
am
04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev
* commit '
04b4f8d11406c64b94797af67dd7530435187129':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:36:55 +0000 (18:36 +0000)]
am
fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev
* commit '
fb120acd841f7d8d0e1845f5bdd98abf35cb25b4':
Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:36:52 +0000 (18:36 +0000)]
am
b7fd6315: Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
b7fd6315328c3a38fd7928f3dbb43f44227eb78b':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:36:48 +0000 (18:36 +0000)]
am
f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev
* commit '
f14cbb26edcf0838cee333bf0d6ee686bf6de333':
Optimize layout rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:34:11 +0000 (18:34 +0000)]
Merge changes I66792c4d,I203b6783 into jb-mr2-dev
* changes:
Improve text rendering and measurement. [DO NOT MERGE]
Fix the measurement of text bounds. [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:34:04 +0000 (18:34 +0000)]
Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Wed, 16 Apr 2014 18:33:47 +0000 (18:33 +0000)]
Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Wed, 16 Apr 2014 18:33:31 +0000 (18:33 +0000)]
Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Wed, 16 Apr 2014 18:33:10 +0000 (18:33 +0000)]
Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev
Robert Greenwalt [Mon, 7 Apr 2014 20:21:52 +0000 (20:21 +0000)]
am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
2676e36ff6fc3f779cb6f1b0db13e26d734dcbab':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:16:15 +0000 (20:16 +0000)]
am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
3e604b1198fcab0e3bf2fd29043e4172193db2b5':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:12:56 +0000 (20:12 +0000)]
am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
53691e39dca8be5dbe19bfef05b1c3e294d6c0bd':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:09:33 +0000 (20:09 +0000)]
am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
2c90609c0bddb6fbe255e5632a1e6639e760290f':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:07:10 +0000 (20:07 +0000)]
am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
128e937108035b77537f279dc0bc85a116906819':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:03:55 +0000 (20:03 +0000)]
am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
339cfdbde333984d02d189249f46e7b13317baed':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:00:33 +0000 (20:00 +0000)]
am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
106627e07cecfa8a9bcc43578fde78652fc59eba':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:57:32 +0000 (19:57 +0000)]
am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
72f9b3084cf8bf0ca01ba52a853faeeb74acdad4':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:54:13 +0000 (19:54 +0000)]
am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
e42ce676f54742f2d47c26adaa90407c2cb8cec8':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:51:34 +0000 (19:51 +0000)]
am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
4bc58bd255f3a0cd9bb3a8f7a916a3cccb96ce6b':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:48:39 +0000 (19:48 +0000)]
am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
ebf23a8d9ef7eb2d14ef19bff5525eb16604da7c':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:47:49 +0000 (19:47 +0000)]
am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
c0d94e7ac6353757b7fa4d7f6fce75c5719c7e6e':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:42:49 +0000 (19:42 +0000)]
am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
f52d1a56af8cc769c1019fbb0d8b7a2254fcc01b':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:42:32 +0000 (19:42 +0000)]
am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
74acf23a1eef75628c8fa9e2ff7ba08ed4258558':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:36:54 +0000 (19:36 +0000)]
am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
fe38ff8d36c4fa2e18f4c786692eeea5ebd94e9f':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:36:44 +0000 (19:36 +0000)]
am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
3c417fbf21133340cbbe3539d87c453f81ae3a9d':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:30:10 +0000 (19:30 +0000)]
Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
Deepanshu Gupta [Fri, 4 Apr 2014 01:54:13 +0000 (01:54 +0000)]
am
c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev
* commit '
c07a48bed2c772dc548423396b208331b22a679a':
Fix a bug in Nine Patch library. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 01:54:10 +0000 (01:54 +0000)]
am
70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
70dfe865013f0c8fedf2c9468360a41b02fcce0a':
Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 01:54:08 +0000 (01:54 +0000)]
am
2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev
* commit '
2eb5f9e5b25dc769e5ba205237097c67fa212fd6':
Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 01:54:05 +0000 (01:54 +0000)]
am
b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
b6588c522451f5015c2cbc902d5a72566f979f2b':
Fix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 01:54:03 +0000 (01:54 +0000)]
am
3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev
* commit '
3bc5b23f8dbb6ecc4eeac4334f94682056d0cb3b':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 01:54:00 +0000 (01:54 +0000)]
am
ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev
* commit '
ba0ce05688ff7ebf91e16f5cb741701feb706fc2':
Fix text size in Fake Action Bar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 00:45:44 +0000 (00:45 +0000)]
Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Fri, 4 Apr 2014 00:45:29 +0000 (00:45 +0000)]
Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Fri, 4 Apr 2014 00:45:13 +0000 (00:45 +0000)]
Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Fri, 4 Apr 2014 00:44:01 +0000 (00:44 +0000)]
Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
OSDN Git Service
