OSDN Git Service
Jean-Michel Trivi [Thu, 4 Sep 2014 17:46:04 +0000 (17:46 +0000)]
am
5fb35780: am
daf113b1: am
5c6248c9: am
1310a1cd: (-s ours) am
ec50dfc0: am
20fc473c: am
f0336eb8: am
2cb287f9: am
9ea996a3: Do not restore the media button event receiver
* commit '
5fb35780a53c239e34aec8beccd328cad9145e3d':
Do not restore the media button event receiver
Jean-Michel Trivi [Thu, 4 Sep 2014 17:33:09 +0000 (17:33 +0000)]
am
daf113b1: am
5c6248c9: am
1310a1cd: (-s ours) am
ec50dfc0: am
20fc473c: am
f0336eb8: am
2cb287f9: am
9ea996a3: Do not restore the media button event receiver
* commit '
daf113b118c658a493bac194d3b5ba8ab91dbd62':
Do not restore the media button event receiver
Jean-Michel Trivi [Thu, 4 Sep 2014 17:22:01 +0000 (17:22 +0000)]
am
5c6248c9: am
1310a1cd: (-s ours) am
ec50dfc0: am
20fc473c: am
f0336eb8: am
2cb287f9: am
9ea996a3: Do not restore the media button event receiver
* commit '
5c6248c9321990f0fbe8ac7c061f0e61ba0725f1':
Do not restore the media button event receiver
Jean-Michel Trivi [Thu, 4 Sep 2014 17:14:42 +0000 (17:14 +0000)]
am
1310a1cd: (-s ours) am
ec50dfc0: am
20fc473c: am
f0336eb8: am
2cb287f9: am
9ea996a3: Do not restore the media button event receiver
* commit '
1310a1cdba8a0f5e1c8741a5fbcf81eb76c6c2b2':
Do not restore the media button event receiver
Deepanshu Gupta [Thu, 4 Sep 2014 05:56:35 +0000 (05:56 +0000)]
am
3f1cc48a: (-s ours) am
ae6a52eb: am
1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev
* commit '
3f1cc48ad1f87e8ea35d2d706eafb707743cc662':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 05:56:32 +0000 (05:56 +0000)]
am
b14ab8d4: (-s ours) am
e9ea028b: am
6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
b14ab8d402ac3b001601492d9f989e54f761cc2e':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 05:48:37 +0000 (05:48 +0000)]
am
ae6a52eb: am
1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev
* commit '
ae6a52eb0b02eae92b8800b29dbaf34e647bc3ae':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 05:48:33 +0000 (05:48 +0000)]
am
e9ea028b: am
6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
e9ea028b74950722163560d5dfb97b4403111cc4':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 05:32:41 +0000 (05:32 +0000)]
am
1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev
* commit '
1eb506aa8cd2045f1d7c75d7c9e59df6a103c1e5':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 05:32:32 +0000 (05:32 +0000)]
am
6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
6a9c6c6baedb994a619573388056c95475f84abf':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 01:53:48 +0000 (01:53 +0000)]
Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Thu, 4 Sep 2014 01:53:16 +0000 (01:53 +0000)]
Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-dev
Deepanshu Gupta [Thu, 4 Sep 2014 01:50:05 +0000 (01:50 +0000)]
Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-dev
Jean-Michel Trivi [Fri, 29 Aug 2014 17:34:24 +0000 (17:34 +0000)]
am
ec50dfc0: am
20fc473c: am
f0336eb8: am
2cb287f9: am
9ea996a3: Do not restore the media button event receiver
* commit '
ec50dfc03ca90e4a8528da77297fe141cc62d3ff':
Do not restore the media button event receiver
Jean-Michel Trivi [Fri, 29 Aug 2014 17:21:43 +0000 (17:21 +0000)]
am
20fc473c: am
f0336eb8: am
2cb287f9: am
9ea996a3: Do not restore the media button event receiver
* commit '
20fc473c69ae9c564ceb7fd357acc09c6b9e1aaf':
Do not restore the media button event receiver
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
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
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
Jean-Michel Trivi [Tue, 26 Aug 2014 01:28:30 +0000 (18:28 -0700)]
Do not persist and restore the media button event receiver
Do not persist 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: I7ca3e7fccb165c55b23f471c00e0ed77436f7dc1
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)
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)
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)
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)
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
Deepanshu Gupta [Sat, 16 Aug 2014 00:48:52 +0000 (17:48 -0700)]
Layoutlib: Update wifi and battery icon for KK
Change-Id: Ic5c80e83366bb7672049a6bf726d11cf6717f400
Deepanshu Gupta [Wed, 6 Aug 2014 22:37:10 +0000 (22:37 +0000)]
am
09c3c2ed: am
ba31d628: am
db94ea9e: am
f970d2c2: am
79c3f678: am
206c691b: am
72cf03a2: am
3a544a81: resolved conflicts for merge of
a232a68d to jb-mr1.1-docs
* commit '
09c3c2edb2391d3ffed9a07ec360b9f75b9f7637':
Fix SystemProperties in LayoutLib.
Deepanshu Gupta [Wed, 6 Aug 2014 22:30:06 +0000 (22:30 +0000)]
am
ba31d628: am
db94ea9e: am
f970d2c2: am
79c3f678: am
206c691b: am
72cf03a2: am
3a544a81: resolved conflicts for merge of
a232a68d to jb-mr1.1-docs
* commit '
ba31d628621f3d49195d141dabff30a7665f3b50':
Fix SystemProperties in LayoutLib.
Deepanshu Gupta [Wed, 6 Aug 2014 22:25:50 +0000 (22:25 +0000)]
am
db94ea9e: am
f970d2c2: am
79c3f678: am
206c691b: am
72cf03a2: am
3a544a81: resolved conflicts for merge of
a232a68d to jb-mr1.1-docs
* commit '
db94ea9ed03dbaa0ca075a433a986d7e414e8f8d':
Fix SystemProperties in LayoutLib.
Deepanshu Gupta [Wed, 6 Aug 2014 22:21:54 +0000 (22:21 +0000)]
am
f970d2c2: am
79c3f678: am
206c691b: am
72cf03a2: am
3a544a81: resolved conflicts for merge of
a232a68d to jb-mr1.1-docs
* commit '
f970d2c201649843b8d51d094b865f16b15bc0bc':
Fix SystemProperties in LayoutLib.
Deepanshu Gupta [Wed, 6 Aug 2014 22:18:04 +0000 (22:18 +0000)]
am
79c3f678: am
206c691b: am
72cf03a2: am
3a544a81: resolved conflicts for merge of
a232a68d to jb-mr1.1-docs
* commit '
79c3f678d21f6b3c058623217cbe5dd57a553fe8':
Fix SystemProperties in LayoutLib.
Deepanshu Gupta [Wed, 6 Aug 2014 22:13:18 +0000 (22:13 +0000)]
am
206c691b: am
72cf03a2: am
3a544a81: resolved conflicts for merge of
a232a68d to jb-mr1.1-docs
* commit '
206c691bfdb3a6b78d35c7481365980dd387b8c9':
Fix SystemProperties in LayoutLib.
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.
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.
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
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
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.
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
Deepanshu Gupta [Fri, 18 Jul 2014 22:26:45 +0000 (22:26 +0000)]
am
f2c5a9ee: (-s ours) am
b9efa1e5: am
14a4e69c: am
c7351974: (-s ours) am
a3966c66: am
62743940: am
8c71ff29: am
87234e85: am
9c48ab82: am
ccf7b2aa: am
5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '
f2c5a9ee4944b5ca995d0c6b11ccaddecf6432e1':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 22:22:24 +0000 (22:22 +0000)]
am
b9efa1e5: am
14a4e69c: am
c7351974: (-s ours) am
a3966c66: am
62743940: am
8c71ff29: am
87234e85: am
9c48ab82: am
ccf7b2aa: am
5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '
b9efa1e5a11d1542d0bab9c945ce1e920b819764':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 22:17:00 +0000 (22:17 +0000)]
am
14a4e69c: am
c7351974: (-s ours) am
a3966c66: am
62743940: am
8c71ff29: am
87234e85: am
9c48ab82: am
ccf7b2aa: am
5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '
14a4e69cc656b60c705d2f05229aed2a7049693c':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 22:12:02 +0000 (22:12 +0000)]
am
c7351974: (-s ours) am
a3966c66: am
62743940: am
8c71ff29: am
87234e85: am
9c48ab82: am
ccf7b2aa: am
5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '
c735197420948ffff757dbe6d00028a87ed09c15':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 22:07:40 +0000 (22:07 +0000)]
am
a3966c66: am
62743940: am
8c71ff29: am
87234e85: am
9c48ab82: am
ccf7b2aa: am
5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '
a3966c66ee24109ca4b71f591f0d740ee37987de':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 22:02:14 +0000 (22:02 +0000)]
am
62b81acb: (-s ours) am
2df48bed: am
1bdfeadb: am
610341b3: (-s ours) am
95bbeb96: am
b8e4e8e1: am
d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
62b81acbcad6ceaa269c7f788068bdf32f403040':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 22:01:45 +0000 (22:01 +0000)]
am
62743940: am
8c71ff29: am
87234e85: am
9c48ab82: am
ccf7b2aa: am
5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '
627439401ec86a083eefdc61728d6aa75ce9a4e5':
Fix style resolution for styles with '.' [DO NOT MERGE]
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]
Deepanshu Gupta [Fri, 18 Jul 2014 21:57:16 +0000 (21:57 +0000)]
am
2df48bed: am
1bdfeadb: am
610341b3: (-s ours) am
95bbeb96: am
b8e4e8e1: am
d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
2df48bed6afed4958835b8bdc2c8b44db32919fc':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:57:01 +0000 (21:57 +0000)]
am
99286edc: (-s ours) am
aa0c1c75: am
e83fa180: am
696eb4da: (-s ours) am
c39916f7: am
37f54f4c: am
357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]
* commit '
99286edc3ef164d0d247a86cc58c391e5854aa70':
Fix default level flags for bidi. [DO NOT MERGE]
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]
Deepanshu Gupta [Fri, 18 Jul 2014 21:53:15 +0000 (21:53 +0000)]
am
aa0c1c75: am
e83fa180: am
696eb4da: (-s ours) am
c39916f7: am
37f54f4c: am
357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]
* commit '
aa0c1c755c15fec30f005d53bed6091180c4e521':
Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:53:11 +0000 (21:53 +0000)]
am
1bdfeadb: am
610341b3: (-s ours) am
95bbeb96: am
b8e4e8e1: am
d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
1bdfeadb61343a5331fcfda06b40a0e3042a2ae6':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:52:52 +0000 (21:52 +0000)]
am
a3d2c7e7: (-s ours) am
85c7b209: am
5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev
* commit '
a3d2c7e72b1580ebeffe7b4deaa46103d3d66fa7':
Fix style resolution for styles with '.' [DO NOT MERGE]
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]
Deepanshu Gupta [Fri, 18 Jul 2014 21:49:13 +0000 (21:49 +0000)]
am
e83fa180: am
696eb4da: (-s ours) am
c39916f7: am
37f54f4c: am
357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]
* commit '
e83fa180a874fb9222ae8e87c0d333411decc0c7':
Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:49:11 +0000 (21:49 +0000)]
am
610341b3: (-s ours) am
95bbeb96: am
b8e4e8e1: am
d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
610341b3eb99ef2f070c96d60ca30c28283f1dea':
Fix style resolution for styles with '.' [DO NOT MERGE]
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]
Deepanshu Gupta [Fri, 18 Jul 2014 21:45:20 +0000 (21:45 +0000)]
am
85c7b209: am
5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev
* commit '
85c7b209c3babea164f5bec13352e7f5f262ea58':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:45:19 +0000 (21:45 +0000)]
am
95bbeb96: am
b8e4e8e1: am
d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
95bbeb967243d453bf793cd06dd2dd914667fee9':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:44:52 +0000 (21:44 +0000)]
am
c3a7763b: (-s ours) am
918ca12f: am
10395cbb: Fix default level flags for bidi. [DO NOT MERGE]
* commit '
c3a7763b84a6a20f07ed2b42e58ac0911fac984c':
Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:44:11 +0000 (21:44 +0000)]
am
696eb4da: (-s ours) am
c39916f7: am
37f54f4c: am
357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]
* commit '
696eb4da44097693a18e99e1f38d062ac1f0e147':
Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:41:18 +0000 (21:41 +0000)]
am
b8e4e8e1: am
d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
b8e4e8e1f4fb1139368dc3f36e2d7bcf59dc32e9':
Fix style resolution for styles with '.' [DO NOT MERGE]
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]
Deepanshu Gupta [Fri, 18 Jul 2014 21:39:33 +0000 (21:39 +0000)]
am
c39916f7: am
37f54f4c: am
357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]
* commit '
c39916f7dadb2f8be2e7523c5ceade9f04a94e1e':
Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:39:25 +0000 (21:39 +0000)]
am
5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev
* commit '
5efee91e12420e59214946c526f80961738a9c1d':
Fix style resolution for styles with '.' [DO NOT MERGE]
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]
Deepanshu Gupta [Fri, 18 Jul 2014 21:36:29 +0000 (21:36 +0000)]
am
918ca12f: am
10395cbb: Fix default level flags for bidi. [DO NOT MERGE]
* commit '
918ca12ffc09a96194112edf3540d94c32918a07':
Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:35:21 +0000 (21:35 +0000)]
am
37f54f4c: am
357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]
* commit '
37f54f4c1e2d97b33bdd8abe5f196debecc5437d':
Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:31:33 +0000 (21:31 +0000)]
am
10395cbb: Fix default level flags for bidi. [DO NOT MERGE]
* commit '
10395cbb5cdec35a0ebee1d0b18b58c4803092a1':
Fix default level flags for bidi. [DO NOT MERGE]
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]
Deepanshu Gupta [Fri, 18 Jul 2014 21:33:28 +0000 (21:33 +0000)]
Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into klp-dev
Deepanshu Gupta [Fri, 18 Jul 2014 21:33:40 +0000 (21:33 +0000)]
Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr2-dev
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
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)
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)
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)
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)
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)
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)
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
Deepanshu Gupta [Tue, 8 Jul 2014 23:52:33 +0000 (23:52 +0000)]
am
813e2ac3: (-s ours) am
bda28629: am
1e344694: am
0b487604: (-s ours) am
d53a9fcb: am
979f9c68: am
e30d3fdd: Change font family name. [DO NOT MERGE]
* commit '
813e2ac3a03aec7052f1d9fcd2f53ef51493374c':
Change font family name. [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:48:14 +0000 (23:48 +0000)]
am
bda28629: am
1e344694: am
0b487604: (-s ours) am
d53a9fcb: am
979f9c68: am
e30d3fdd: Change font family name. [DO NOT MERGE]
* commit '
bda28629dd2be00c1fda9a09192aef17f44fc919':
Change font family name. [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:45:05 +0000 (23:45 +0000)]
am
4b84593f: (-s ours) am
b0470a1f: 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 '
4b84593f8b34ecb16cf9ff413d0e4f3d14f0e422':
Add a script to rename fonts for SDK. [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:43:39 +0000 (23:43 +0000)]
am
1e344694: am
0b487604: (-s ours) am
d53a9fcb: am
979f9c68: am
e30d3fdd: Change font family name. [DO NOT MERGE]
* commit '
1e34469469fca5770f9c5f811b592d1f3687ddc5':
Change font family name. [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:39:43 +0000 (23:39 +0000)]
am
b0470a1f: 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 '
b0470a1fce9e496b4812e8d652db20b8af656c02':
Add a script to rename fonts for SDK. [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:38:48 +0000 (23:38 +0000)]
am
0b487604: (-s ours) am
d53a9fcb: am
979f9c68: am
e30d3fdd: Change font family name. [DO NOT MERGE]
* commit '
0b4876043be6eb9c2eaccb8270370b9275d4d899':
Change font family name. [DO NOT MERGE]
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:32:12 +0000 (23:32 +0000)]
am
5414f83d: (-s ours) am
d2829b49: am
432d16f9: Change font family name. [DO NOT MERGE]
* commit '
5414f83d38455fcd8c788ea1b5cf61aaef3d0a5d':
Change font family name. [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:30:20 +0000 (23:30 +0000)]
am
d53a9fcb: am
979f9c68: am
e30d3fdd: Change font family name. [DO NOT MERGE]
* commit '
d53a9fcb7c56d6495e88cc3e39e2892e449a9171':
Change font family name. [DO NOT MERGE]
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:28:32 +0000 (23:28 +0000)]
am
d2829b49: am
432d16f9: Change font family name. [DO NOT MERGE]
* commit '
d2829b490989b595118c7bd17c1dbff6789cacaa':
Change font family name. [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:25:22 +0000 (23:25 +0000)]
am
979f9c68: am
e30d3fdd: Change font family name. [DO NOT MERGE]
* commit '
979f9c685e31a07e9bd1d89c0947b863dd456940':
Change font family name. [DO NOT MERGE]
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:24:15 +0000 (23:24 +0000)]
am
5acf782c: (-s ours) am
d751eed4: am
b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE]
* commit '
5acf782c6822bf6c1b24d3582f52d65a949912f6':
Add a script to rename fonts for SDK. [DO NOT MERGE]
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]
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:19:46 +0000 (23:19 +0000)]
am
d751eed4: am
b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE]
* commit '
d751eed44bcb28461dc853df08b89e5bc8ab6f60':
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 [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)
OSDN Git Service
