OSDN Git Service
Deepanshu Gupta [Wed, 16 Apr 2014 20:26:42 +0000 (20:26 +0000)]
am
79c9285a: am
b873a0a3: (-s ours) am
985bb326: am
fa206123: am
502c83f4: am
00312846: (-s ours) am
0fe63473: am
04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev
* commit '
79c9285a0238dcc931a4145edcac608435dfcece':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 20:26:38 +0000 (20:26 +0000)]
am
911ad51b: am
06f4c8c7: (-s ours) am
884f3b14: am
925b911f: am
013af337: am
4eeaa61f: (-s ours) am
87e14187: am
fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev
* commit '
911ad51b052a0df9e0dde66f83d3ab55e62a3826':
Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 20:26:32 +0000 (20:26 +0000)]
am
36e8b4d3: am
a84a1753: (-s ours) am
0cffa9fe: am
43f1fe7e: am
5016f769: am
b03e1176: (-s ours) am
533a52fe: am
b7fd6315: Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
36e8b4d3cdc7cbd98af1c97f4af3e2524c4cffc2':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 20:26:27 +0000 (20:26 +0000)]
am
c9237950: am
43e229a1: (-s ours) am
38f2b1ea: am
30ab17dd: am
289f1ffb: am
90b0b69c: (-s ours) am
014ac85f: am
f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev
* commit '
c92379506d057f0bf05ebdf0ec4c7a7b81bf22ef':
Optimize layout rendering in layoutlib [DO NOT MERGE]
Evan Charlton [Wed, 16 Apr 2014 20:14:39 +0000 (13:14 -0700)]
resolved conflicts for merge of
8d966e42 to master-nova
Change-Id: Ibcc7d1eb4f0349e90b8e97d5235a08efb8226ef6
Deepanshu Gupta [Wed, 16 Apr 2014 19:49:11 +0000 (19:49 +0000)]
am
b873a0a3: (-s ours) am
985bb326: am
fa206123: am
502c83f4: am
00312846: (-s ours) am
0fe63473: am
04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev
* commit '
b873a0a3abc504b3c6b8db51ea8f3bcb97bc3ac7':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 19:49:08 +0000 (19:49 +0000)]
am
06f4c8c7: (-s ours) am
884f3b14: am
925b911f: am
013af337: am
4eeaa61f: (-s ours) am
87e14187: am
fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev
* commit '
06f4c8c7315956a906d054d52ff7f27bf84db8b9':
Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 19:49:04 +0000 (19:49 +0000)]
am
a84a1753: (-s ours) am
0cffa9fe: am
43f1fe7e: am
5016f769: am
b03e1176: (-s ours) am
533a52fe: am
b7fd6315: Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
a84a175390c91cd57858f4c539243481d530bfc4':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 19:49:00 +0000 (19:49 +0000)]
am
43e229a1: (-s ours) am
38f2b1ea: am
30ab17dd: am
289f1ffb: am
90b0b69c: (-s ours) am
014ac85f: am
f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev
* commit '
43e229a111147eca7c7fb7a4623d2d04a4df4b43':
Optimize layout rendering in layoutlib [DO NOT MERGE]
Baligh Uddin [Wed, 16 Apr 2014 19:45:22 +0000 (19:45 +0000)]
am
3d72c067: Merge "Remove activitystrings.xml from localized resource directories"
* commit '
3d72c067a04a3ef6101e0d3d16d7fb1ba334a908':
Remove activitystrings.xml from localized resource directories
Wink Saville [Wed, 16 Apr 2014 19:45:20 +0000 (19:45 +0000)]
Merge "Add LISTEN_DATA_CONNECTIPON_REAL_TIME_INFO as listen event"
Deepanshu Gupta [Wed, 16 Apr 2014 19:45:17 +0000 (19:45 +0000)]
am
74e14827: am
492090a5: (-s ours) am
16191f8c: resolved conflicts for merge of
0e2049cd to klp-modular-dev
* commit '
74e14827cff43fee85970724ea9e4850316d2e11':
Layoutlib tests now check methods return value [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 19:44:37 +0000 (19:44 +0000)]
am
985bb326: am
fa206123: am
502c83f4: am
00312846: (-s ours) am
0fe63473: am
04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev
* commit '
985bb326a6f2b63ed6ee6041654421fae098bcec':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 19:44:34 +0000 (19:44 +0000)]
am
884f3b14: am
925b911f: am
013af337: am
4eeaa61f: (-s ours) am
87e14187: am
fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev
* commit '
884f3b14c654612f922bb3927e17dfa795939594':
Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 19:44:31 +0000 (19:44 +0000)]
am
0cffa9fe: am
43f1fe7e: am
5016f769: am
b03e1176: (-s ours) am
533a52fe: am
b7fd6315: Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
0cffa9fe6c796c69d143493aede11e3f1321262e':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 19:44:28 +0000 (19:44 +0000)]
am
38f2b1ea: am
30ab17dd: am
289f1ffb: am
90b0b69c: (-s ours) am
014ac85f: am
f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev
* commit '
38f2b1ea4146a52f167d1a73e705590266848336':
Optimize layout rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 19:40:51 +0000 (19:40 +0000)]
am
5a3df66f: am
35d46778: (-s ours) resolved conflicts for merge of
ec6676dd to klp-modular-dev-plus-aosp
* commit '
5a3df66fe887aaa0dfa0a48c289ce3078dc34371':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
Baligh Uddin [Wed, 16 Apr 2014 19:39:46 +0000 (19:39 +0000)]
Merge "Remove activitystrings.xml from localized resource directories"
Deepanshu Gupta [Wed, 16 Apr 2014 19:38:38 +0000 (19:38 +0000)]
am
492090a5: (-s ours) am
16191f8c: resolved conflicts for merge of
0e2049cd to klp-modular-dev
* commit '
492090a55e2fa94745aaf4e0e295845d8bb1351a':
Layoutlib tests now check methods return value [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 19:32:13 +0000 (19:32 +0000)]
am
35d46778: (-s ours) resolved conflicts for merge of
ec6676dd to klp-modular-dev-plus-aosp
* commit '
35d46778f49c962c990cfc17e521aa80b9e0c016':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 19:20:01 +0000 (19:20 +0000)]
am
16191f8c: resolved conflicts for merge of
0e2049cd to klp-modular-dev
* commit '
16191f8c4fe92036c8ff2eecd4e57b4642068b99':
Layoutlib tests now check methods return value [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 19:16:43 +0000 (19:16 +0000)]
am
fa206123: am
502c83f4: am
00312846: (-s ours) am
0fe63473: am
04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev
* commit '
fa206123153a3a8ee48dd6b4e934723f0c2546b8':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 19:16:40 +0000 (19:16 +0000)]
am
925b911f: am
013af337: am
4eeaa61f: (-s ours) am
87e14187: am
fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev
* commit '
925b911f53f0e1484be4232ea6a26e5696c81764':
Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 19:16:37 +0000 (19:16 +0000)]
am
43f1fe7e: am
5016f769: am
b03e1176: (-s ours) am
533a52fe: am
b7fd6315: Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
43f1fe7e5e625f9de515220f375c18db5b5476cd':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 19:16:33 +0000 (19:16 +0000)]
am
30ab17dd: am
289f1ffb: am
90b0b69c: (-s ours) am
014ac85f: am
f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev
* commit '
30ab17dde6fb47505be493cb09983e268f97c1e9':
Optimize layout rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 19:14:34 +0000 (12:14 -0700)]
resolved conflicts for merge of
ec6676dd to klp-modular-dev-plus-aosp
Change-Id: I2fec735ba65f56da7d17022074f8924a259b4bbf
Jeff Davidson [Wed, 16 Apr 2014 19:10:07 +0000 (19:10 +0000)]
am
34de7a83: Merge "Stub APIs for network scoring."
* commit '
34de7a83033c65f28626aaa9762a91a1646d2486':
Stub APIs for network scoring.
Deepanshu Gupta [Wed, 16 Apr 2014 19:10:03 +0000 (19:10 +0000)]
am
9cc58eb9: am
82d5f137: (-s ours) am
e5d0fce7: am
685b7d41: am
1b87390c: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
* commit '
9cc58eb9638a69054d7d601b8c6aafc7a82160e7':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 19:09:58 +0000 (19:09 +0000)]
am
9468826d: am
f2d085e8: (-s ours) am
d023360a: am
484c88c3: am
4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE]
* commit '
9468826db20ff30bcd3b4f9b10b07b48393c0c3a':
Action bar rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 19:09:54 +0000 (19:09 +0000)]
am
f85b903e: am
110a05c6: (-s ours) am
2aee0712: am
e75477cb: am
acf0bce0: Support custom views using TimePickerDialog [DO NOT MERGE]
* commit '
f85b903ec2930c02e28462b9cdafcdf387105739':
Support custom views using TimePickerDialog [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:58:32 +0000 (11:58 -0700)]
resolved conflicts for merge of
0e2049cd to klp-modular-dev
Change-Id: I518e18d0c769a4cb5d325fc22165a8ead36e11de
Jeff Davidson [Wed, 16 Apr 2014 18:56:26 +0000 (18:56 +0000)]
Merge "Stub APIs for network scoring."
Jeff Davidson [Wed, 9 Apr 2014 19:38:15 +0000 (12:38 -0700)]
Stub APIs for network scoring.
NetworkScoreManager defines all interactions between the framework and
the scorer app. An ACTION_SCORE_NETWORKS broadcast is sent to the
default scorer with any unscored networks, which responds by calling
updateScores() with scores for those networks. An app may also check
whether they are currently the default scorer with
getDefaultScorerPackage() and request to become the default via the
ACTION_CHANGE_DEFAULT broadcast.
Bug:
13786258
Change-Id: Id3dc0f7c1109f0e3afd73356e2475b7f34167419
Deepanshu Gupta [Wed, 16 Apr 2014 18:49:33 +0000 (18:49 +0000)]
am
82d5f137: (-s ours) am
e5d0fce7: am
685b7d41: am
1b87390c: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
* commit '
82d5f137ed03dcd1020fb554a1d0f3029a826282':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:47:23 +0000 (18:47 +0000)]
am
502c83f4: am
00312846: (-s ours) am
0fe63473: am
04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev
* commit '
502c83f4098cd964cf0c18474700488282396bcb':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:47:20 +0000 (18:47 +0000)]
am
013af337: am
4eeaa61f: (-s ours) am
87e14187: am
fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev
* commit '
013af337bc804a0b491bd3f1e1cba45d61cbe2ea':
Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:47:17 +0000 (18:47 +0000)]
am
5016f769: am
b03e1176: (-s ours) am
533a52fe: am
b7fd6315: Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
5016f7694fb4400be468fd49aa83d8075f41d3dc':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:47:15 +0000 (18:47 +0000)]
am
289f1ffb: am
90b0b69c: (-s ours) am
014ac85f: am
f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev
* commit '
289f1ffb33d9ab7ed1a7c11bcc70c017b3a1c710':
Optimize layout rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:43:47 +0000 (18:43 +0000)]
am
00312846: (-s ours) am
0fe63473: am
04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev
* commit '
00312846e1e5513b3b32aa4fab399e51daf0c1b3':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:43:44 +0000 (18:43 +0000)]
am
4eeaa61f: (-s ours) am
87e14187: am
fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev
* commit '
4eeaa61f6b4b7b37712e1c385a75aa8a4b89e381':
Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:43:40 +0000 (18:43 +0000)]
am
b03e1176: (-s ours) am
533a52fe: am
b7fd6315: Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
b03e1176df1e66a49a5649faf6994fa9ec1a9bea':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:43:38 +0000 (18:43 +0000)]
am
90b0b69c: (-s ours) am
014ac85f: am
f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev
* commit '
90b0b69cd48067b92a90ea248ef91e473b7f1c10':
Optimize layout rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:43:23 +0000 (18:43 +0000)]
am
e5d0fce7: am
685b7d41: am
1b87390c: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
* commit '
e5d0fce7aeb60c44849cd09815ccecda702422ef':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:41:45 +0000 (18:41 +0000)]
am
f2d085e8: (-s ours) am
d023360a: am
484c88c3: am
4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE]
* commit '
f2d085e867dd59aa2aaff74f6e5b265b1bffbaba':
Action bar rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:41:42 +0000 (18:41 +0000)]
am
110a05c6: (-s ours) am
2aee0712: am
e75477cb: am
acf0bce0: Support custom views using TimePickerDialog [DO NOT MERGE]
* commit '
110a05c6bd2778b37c83ea5b4d9b753be0ac32ba':
Support custom views using TimePickerDialog [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:40:55 +0000 (18:40 +0000)]
am
86384880: am
f1e71876: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit '
863848808d005fe1d2fd84a2982adfc02a3fbb9f':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:40:51 +0000 (18:40 +0000)]
am
685b7d41: am
1b87390c: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
* commit '
685b7d4165c417ce20b1f6c49190eabcfda09940':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:40:37 +0000 (18:40 +0000)]
am
0fe63473: am
04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev
* commit '
0fe634737b24fd8f4dc8d0f49eb15ea176242428':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:40:34 +0000 (18:40 +0000)]
am
87e14187: am
fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev
* commit '
87e14187111254b8842193f4f3514c0dea50967d':
Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:40:30 +0000 (18:40 +0000)]
am
533a52fe: am
b7fd6315: Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
533a52fe3bedc88483a968400cd61110bd29c704':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:40:25 +0000 (18:40 +0000)]
am
014ac85f: am
f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev
* commit '
014ac85fecc969c205a11d1f20afe00cab713629':
Optimize layout rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:39:25 +0000 (18:39 +0000)]
am
d023360a: am
484c88c3: am
4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE]
* commit '
d023360aa03db1a7831a5697d49faa2575e4a9c3':
Action bar rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:39:21 +0000 (18:39 +0000)]
am
2aee0712: am
e75477cb: am
acf0bce0: Support custom views using TimePickerDialog [DO NOT MERGE]
* commit '
2aee07124cad720587a8c51de5650b6b93ae9150':
Support custom views using TimePickerDialog [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:37:13 +0000 (18:37 +0000)]
am
bdd0ad79: Layoutlib tests now check methods return value [DO NOT MERGE]
* commit '
bdd0ad79b9b027280bd371c7b6795b04ed89ac8f':
Layoutlib tests now check methods return value [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:37:10 +0000 (18:37 +0000)]
am
f1e71876: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit '
f1e7187645f0b0388f7b97d742395efd228b347a':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:37:06 +0000 (18:37 +0000)]
am
1b87390c: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
* commit '
1b87390c9426c4bc9119829e9375d712dfde11c3':
Overflow menu popup for Action Bar in Layoutlib [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:36:46 +0000 (18:36 +0000)]
am
484c88c3: am
4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE]
* commit '
484c88c3655991759dc64276404d0cf7e33b455f':
Action bar rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:36:40 +0000 (18:36 +0000)]
am
e75477cb: am
acf0bce0: Support custom views using TimePickerDialog [DO NOT MERGE]
* commit '
e75477cb3bf0f2e18c1f0bb743a6189fbc07c2a2':
Support custom views using TimePickerDialog [DO NOT MERGE]
Jeff Davidson [Wed, 16 Apr 2014 18:36:15 +0000 (18:36 +0000)]
am
6a4a9462: Merge "Data structures for communication with network scorer apps."
* commit '
6a4a946223f4b415a174071aa23af8078a4079e3':
Data structures for communication with network scorer apps.
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
Deepanshu Gupta [Wed, 16 Apr 2014 18:33:00 +0000 (18:33 +0000)]
am
4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE]
* commit '
4ccc4bd54f85d86818f61d728c6361d2003ddd8e':
Action bar rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:32:55 +0000 (18:32 +0000)]
am
acf0bce0: Support custom views using TimePickerDialog [DO NOT MERGE]
* commit '
acf0bce09fec2cabe871d7146aa62e9258fbf06d':
Support custom views using TimePickerDialog [DO NOT MERGE]
Jeff Davidson [Wed, 16 Apr 2014 18:29:22 +0000 (18:29 +0000)]
Merge "Data structures for communication with network scorer apps."
Jeff Davidson [Mon, 7 Apr 2014 22:19:44 +0000 (15:19 -0700)]
Data structures for communication with network scorer apps.
NetworkKey represents the necessary information to identify a network
to be scored. ScoredNetwork contains the key to identify a network as
well as a score to be used when evaluating that network (as a curve
based on RSSI).
Bug:
13767776
Change-Id: I6bfebd105c9381e615513167b4332b767b43a23a
Alan Viverette [Wed, 16 Apr 2014 18:26:11 +0000 (18:26 +0000)]
am
3c24bb4a: Merge "Implement jumpToCurrentState() in VectorDrawable"
* commit '
3c24bb4ae07b44466b146a88276472e0a28d9a03':
Implement jumpToCurrentState() in VectorDrawable
Alan Viverette [Wed, 16 Apr 2014 18:21:35 +0000 (18:21 +0000)]
Merge "Implement jumpToCurrentState() in VectorDrawable"
Christoph Studer [Wed, 16 Apr 2014 17:45:21 +0000 (17:45 +0000)]
am
d67d073b: Merge "Rename basePkg to opPkg"
* commit '
d67d073b9fd110e6b9dfa6af11e8655dcc69f6ef':
Rename basePkg to opPkg
Christoph Studer [Wed, 16 Apr 2014 17:37:19 +0000 (17:37 +0000)]
Merge "Rename basePkg to opPkg"
Baligh Uddin [Wed, 16 Apr 2014 17:35:49 +0000 (10:35 -0700)]
Remove activitystrings.xml from localized resource directories
Change-Id: I57fe2e6f60fcebd77118f15db9d06b0f2df56d7c
Winson Chung [Wed, 16 Apr 2014 17:30:00 +0000 (17:30 +0000)]
am
fe08369d: Merge "Fixing the alternate recents transition on landscape views."
* commit '
fe08369d8cd575f1f1db38f57be4c2a960f4a856':
Fixing the alternate recents transition on landscape views.
Winson Chung [Wed, 16 Apr 2014 17:25:59 +0000 (17:25 +0000)]
Merge "Fixing the alternate recents transition on landscape views."
Winson Chung [Tue, 15 Apr 2014 22:34:44 +0000 (15:34 -0700)]
Fixing the alternate recents transition on landscape views.
- This still assumes that we are taking square thumbnails.
Change-Id: I42a3d1b0505db57f815edf52cd176a3f651d5b37
Christoph Studer [Fri, 11 Apr 2014 21:35:05 +0000 (17:35 -0400)]
Rename basePkg to opPkg
...and actually populate the field correctly.
Change-Id: I3ce52efedb919d6af75dc9c3532e47764c467cac
Baligh Uddin [Wed, 16 Apr 2014 16:12:56 +0000 (16:12 +0000)]
am
3eff39fb: (-s ours) Merge "Revert "Import translations. DO NOT MERGE""
* commit '
3eff39fb0f6425601b67296ee25f0497a70976ae':
Revert "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 16 Apr 2014 16:10:07 +0000 (16:10 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""
Baligh Uddin [Wed, 16 Apr 2014 16:09:58 +0000 (16:09 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
bcf6441e61725a2e6c04d03de43d209311da9d3a.
Change-Id: I8b556dfaeb45434e194503fe5ae77e744637f6c2
Christoph Studer [Wed, 16 Apr 2014 15:54:18 +0000 (15:54 +0000)]
am
97096fd0: Merge "Write eventlog entries for notification visibility"
* commit '
97096fd0e64d5cdce3e24139ed6b13cc76c5047e':
Write eventlog entries for notification visibility
Christoph Studer [Wed, 16 Apr 2014 15:49:54 +0000 (15:49 +0000)]
Merge "Write eventlog entries for notification visibility"
Baligh Uddin [Wed, 16 Apr 2014 15:37:52 +0000 (15:37 +0000)]
am
75534344: (-s ours) am
e65c292a: (-s ours) am
f104f676: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
755343447204575a8efb68769a3e6738987d225d':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 16 Apr 2014 15:34:04 +0000 (15:34 +0000)]
am
e65c292a: (-s ours) am
f104f676: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
e65c292a5e7f4d70a43f965909647f89bb46809d':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 16 Apr 2014 15:32:42 +0000 (15:32 +0000)]
am
3471e803: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
3471e8034975a12cdcdd1b6264ceb6d721031a7e':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 16 Apr 2014 15:32:39 +0000 (15:32 +0000)]
am
da7cc2c4: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
da7cc2c42de5f6bda4a13645ca5d8ad884df6b6a':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 16 Apr 2014 15:32:35 +0000 (15:32 +0000)]
am
cf8aed65: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
cf8aed657ba43c479971badec48770edb8cee886':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 16 Apr 2014 15:31:02 +0000 (15:31 +0000)]
am
f104f676: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
f104f676e375c5c53eb049705740ab592b914bda':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 16 Apr 2014 15:28:28 +0000 (15:28 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 16 Apr 2014 15:27:00 +0000 (15:27 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 16 Apr 2014 15:26:24 +0000 (15:26 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 16 Apr 2014 15:26:20 +0000 (15:26 +0000)]
Merge "Import translations. DO NOT MERGE"
Christoph Studer [Tue, 1 Apr 2014 16:44:40 +0000 (18:44 +0200)]
Write eventlog entries for notification visibility
Keep track of notifications shown in the notification panel
and log them via eventlog.
Added the following eventlog tag:
* notification_visibility_changed
Bug:
13442201
Change-Id: Ifb74ec2492967dc787b4de86db7d7f00be6c7f74
Ben Murdoch [Wed, 16 Apr 2014 12:49:17 +0000 (12:49 +0000)]
am
6f51cd7e: Merge "Revert "Revert "Define new general permission APIs for webview."""
* commit '
6f51cd7ede3abd1bc076a4aa24f6fd78ac3ad0fc':
Revert "Revert "Define new general permission APIs for webview.""
Ben Murdoch [Wed, 16 Apr 2014 12:45:23 +0000 (12:45 +0000)]
Merge "Revert "Revert "Define new general permission APIs for webview."""
Dongwon Kang [Wed, 16 Apr 2014 07:18:22 +0000 (07:18 +0000)]
am
781c55fd: Merge "Handle the failure of session creation request in TvInputManagerService."
* commit '
781c55fda2fe2685209bdbc1d9554e4fb2b855bf':
Handle the failure of session creation request in TvInputManagerService.
Dongwon Kang [Wed, 16 Apr 2014 06:56:22 +0000 (06:56 +0000)]
Merge "Handle the failure of session creation request in TvInputManagerService."
OSDN Git Service
