drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
120,574 Commits 1 Branch 0 Tags
Commit Graph

120574 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
1c3f332c3f Declare VersionCodes.KITKAT_WATCH. 
The constant does not have a final value yet but is useful for
documentation purposes during development.

Change-Id: Iddd9b956eff822a9a25e9df483b5bd3979189023
 2014-04-16 13:27:00 -07:00
Craig Mautner
2fd3cb9544 Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev 2014-04-16 20:05:31 +00:00
Craig Mautner
e3a00d745f Fix ActivityContainer callback parcelling. 
The Binder interface for passing a callback was not implemented
properly. Also the callback for ActivityContainer now has a new
API.

Change-Id: I6b719be0cb57542f022a3cc14e8f4efde60b1a50
 2014-04-16 13:03:26 -07:00
Mark Salyzyn
2760778d70 jni: liblog reading error API incorrect 
- return value contains -errno on error.

(cherry pick from commit b519aeca47a7b798926c00ce5c8cf730e26e75fd)

Bug: 13907124
Change-Id: I91f12db5749fac2ae8ed5b0f033d4eaf83e666f5
 2014-04-16 12:33:41 -07:00
Deepanshu Gupta
97114e6062 am 13ed576e: am cda504f2: am 0aea4684: am 91f2a7cb: am 5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev 
* commit '13ed576e8ec9914f65234d1616b029bdfb4e86ed':
  Improve text rendering and measurement. [DO NOT MERGE]
  Fix the measurement of text bounds. [DO NOT MERGE]
 2014-04-16 19:16:47 +00:00
Deepanshu Gupta
985bb326a6 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]
 2014-04-16 19:16:43 +00:00
Deepanshu Gupta
884f3b14c6 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]
 2014-04-16 19:16:40 +00:00
Deepanshu Gupta
0cffa9fe6c 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]
 2014-04-16 19:16:37 +00:00
Deepanshu Gupta
38f2b1ea41 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]
 2014-04-16 19:16:33 +00:00
Deepanshu Gupta
16191f8c4f resolved conflicts for merge of 0e2049cd to klp-modular-dev 
Change-Id: I518e18d0c769a4cb5d325fc22165a8ead36e11de
 2014-04-16 11:58:32 -07:00
Deepanshu Gupta
13ed576e8e am cda504f2: am 0aea4684: am 91f2a7cb: am 5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev 
* commit 'cda504f2d54d849fe90924b0d0bf3f817c2a93d7':
  Improve text rendering and measurement. [DO NOT MERGE]
  Fix the measurement of text bounds. [DO NOT MERGE]
 2014-04-16 18:47:26 +00:00
Deepanshu Gupta
fa20612315 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]
 2014-04-16 18:47:23 +00:00
Deepanshu Gupta
925b911f53 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]
 2014-04-16 18:47:20 +00:00
Deepanshu Gupta
43f1fe7e5e 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]
 2014-04-16 18:47:17 +00:00
Deepanshu Gupta
30ab17dde6 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]
 2014-04-16 18:47:15 +00:00
Deepanshu Gupta
cda504f2d5 am 0aea4684: am 91f2a7cb: am 5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev 
* commit '0aea46840f5a520e511fdbd8561046ac9c665fcb':
  Improve text rendering and measurement. [DO NOT MERGE]
  Fix the measurement of text bounds. [DO NOT MERGE]
 2014-04-16 18:43:50 +00:00
Deepanshu Gupta
502c83f409 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]
 2014-04-16 18:43:47 +00:00
Deepanshu Gupta
013af337bc 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]
 2014-04-16 18:43:44 +00:00
Deepanshu Gupta
5016f7694f 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]
 2014-04-16 18:43:40 +00:00
Deepanshu Gupta
289f1ffb33 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]
 2014-04-16 18:43:38 +00:00
Deepanshu Gupta
ec6676ddf6 am 86384880: am f1e71876: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit '863848808d005fe1d2fd84a2982adfc02a3fbb9f':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-04-16 18:40:55 +00:00
Deepanshu Gupta
e5d0fce7ae 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]
 2014-04-16 18:40:51 +00:00
Deepanshu Gupta
0aea46840f am 91f2a7cb: am 5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev 
* commit '91f2a7cb303a3225f68f571ea101078eed1c1f94':
  Improve text rendering and measurement. [DO NOT MERGE]
  Fix the measurement of text bounds. [DO NOT MERGE]
 2014-04-16 18:40:41 +00:00
Deepanshu Gupta
00312846e1 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]
 2014-04-16 18:40:37 +00:00
Deepanshu Gupta
4eeaa61f6b 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]
 2014-04-16 18:40:34 +00:00
Deepanshu Gupta
b03e1176df 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]
 2014-04-16 18:40:30 +00:00
Deepanshu Gupta
90b0b69cd4 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]
 2014-04-16 18:40:25 +00:00
Deepanshu Gupta
0e2049cd39 am bdd0ad79: Layoutlib tests now check methods return value [DO NOT MERGE] 
* commit 'bdd0ad79b9b027280bd371c7b6795b04ed89ac8f':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-04-16 18:37:13 +00:00
Deepanshu Gupta
863848808d am f1e71876: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit 'f1e7187645f0b0388f7b97d742395efd228b347a':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-04-16 18:37:10 +00:00
Deepanshu Gupta
685b7d4165 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]
 2014-04-16 18:37:06 +00:00
Deepanshu Gupta
91f2a7cb30 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]
 2014-04-16 18:37:02 +00:00
Deepanshu Gupta
0fe634737b 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]
 2014-04-16 18:36:58 +00:00
Deepanshu Gupta
87e1418711 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]
 2014-04-16 18:36:55 +00:00
Deepanshu Gupta
533a52fe3b 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]
 2014-04-16 18:36:52 +00:00
Deepanshu Gupta
014ac85fec 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]
 2014-04-16 18:36:48 +00:00
Deepanshu Gupta
d023360aa0 am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE] 
* commit '484c88c3655991759dc64276404d0cf7e33b455f':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-04-16 18:36:46 +00:00
Deepanshu Gupta
2aee07124c am e75477cb: am acf0bce0: Support custom views using TimePickerDialog [DO NOT MERGE] 
* commit 'e75477cb3bf0f2e18c1f0bb743a6189fbc07c2a2':
  Support custom views using TimePickerDialog [DO NOT MERGE]
 2014-04-16 18:36:40 +00:00
Deepanshu Gupta
5a1250532f 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]
 2014-04-16 18:34:12 +00:00
Deepanshu Gupta
04b4f8d114 Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev 2014-04-16 18:34:04 +00:00
Deepanshu Gupta
fb120acd84 Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev 2014-04-16 18:33:47 +00:00
Deepanshu Gupta
b7fd631532 Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev 2014-04-16 18:33:32 +00:00
Deepanshu Gupta
f14cbb26ed Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev 2014-04-16 18:33:11 +00:00
Deepanshu Gupta
484c88c365 am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE] 
* commit '4ccc4bd54f85d86818f61d728c6361d2003ddd8e':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-04-16 18:33:00 +00:00
Deepanshu Gupta
e75477cb3b am acf0bce0: Support custom views using TimePickerDialog [DO NOT MERGE] 
* commit 'acf0bce09fec2cabe871d7146aa62e9258fbf06d':
  Support custom views using TimePickerDialog [DO NOT MERGE]
 2014-04-16 18:32:55 +00:00
Baligh Uddin
f104f676e3 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-16 15:28:29 +00:00
Deepanshu Gupta
bdd0ad79b9 Layoutlib tests now check methods return value [DO NOT MERGE] 
The change is a cherry-pick of relevant fixes from the following
commits on master branch:
the followning commits:
9be03c4e980d3058aeb3fd730da5f7d4a4a4f8a8 and
e05bb956ce429618fd4f971a9dc708b9313c59ea

Change-Id: I87cef323c4eaee4e9f60475f01156b276593fa50
 2014-04-15 20:03:20 -07:00
Deepanshu Gupta
f1e7187645 Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
Change-Id: Icfb91e566666408802dadc0e2070991151b16b9d
(cherry picked from commit bfec73c2db5a34ced248213edf5519c80727a65f)

Conflicts:
	core/java/android/content/res/Resources.java
	tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
 2014-04-15 20:03:19 -07:00
Deepanshu Gupta
1b87390c94 Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE] 
Adds MenuBuilderAccessor in addition to the cherry-picked changes.

Change-Id: Ib7cc314079099c010f7d53849e204db36c410357
(cherry-picked from commit 929eea6bc1824bf98d244550c0984ecf8ea98811)
 2014-04-15 20:02:49 -07:00
Deepanshu Gupta
4ccc4bd54f 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 14bf0cef7eeed572a67c29a328581afac4decc20)
 2014-04-15 20:02:48 -07:00
Deepanshu Gupta
acf0bce09f Support custom views using TimePickerDialog [DO NOT MERGE] 
Bug: http://b.android/com/61515

Change-Id: I0dc3357be0c058adde9d3ea5b6796004b786fd34
(cherry picked from commit 86e5218220a0e01f7eb574a2480bd91f9ebfae35)
 2014-04-15 19:53:54 -07:00