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

121508 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
82d5f137ed 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]
 2014-04-16 18:43:23 +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
f2d085e867 am d023360a: am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE] 
* commit 'd023360aa03db1a7831a5697d49faa2575e4a9c3':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-04-16 18:39:25 +00:00
Deepanshu Gupta
110a05c6bd am 2aee0712: am e75477cb: am acf0bce0: Support custom views using TimePickerDialog [DO NOT MERGE] 
* commit '2aee07124cad720587a8c51de5650b6b93ae9150':
  Support custom views using TimePickerDialog [DO NOT MERGE]
 2014-04-16 18:39:21 +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
Mark Salyzyn
853940331f frameworks: 64 bit compile issues 
ToDo: core/jni/com_android_internal_net_NetworkStatsFactory.cpp (merge issues)

Change-Id: I5cf0bbb868e6c18e86c97c6491b6ee983a8ee1a2
 2014-04-16 10:43:48 -07:00
Baligh Uddin
e65c292a5e am f104f676: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'f104f676e375c5c53eb049705740ab592b914bda':
  Import translations. DO NOT MERGE
 2014-04-16 15:31:02 +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
Vinod Krishnan
da34482dfc am 56a90cb8: Merge "Set wearable specific strings in framework" into klp-modular-dev 
* commit '56a90cb8e1a136d6367c0006bf8689fcc97211cb':
  Set wearable specific strings in framework
 2014-04-15 23:48:24 +00:00
Vinod Krishnan
56a90cb8e1 Merge "Set wearable specific strings in framework" into klp-modular-dev 2014-04-15 23:45:26 +00:00
Mark Salyzyn
69eb6f57e3 Native Runtime: Add LOG_ID_CRASH 
Change-Id: I4e3a82636901c5169cc6b714a4fec815cd757c58
 2014-04-15 15:22:23 -07:00
Dmitriy Ivanov
5c04c4e7b5 am 6ced3b34: am 0d54e471: Merge "Remove code markers" 
* commit '6ced3b34f02f353c0d3445775132aa9cbf40b160':
  Remove code markers
 2014-04-15 19:26:34 +00:00
Dmitriy Ivanov
6ced3b34f0 am 0d54e471: Merge "Remove code markers" 
* commit '0d54e471fa90c2759e86dc47c642f7af277a50f0':
  Remove code markers
 2014-04-15 19:23:20 +00:00
Dmitriy Ivanov
0d54e471fa Merge "Remove code markers" 2014-04-15 19:19:53 +00:00
Dmitriy Ivanov
b8fdf8421e Remove code markers 
Change-Id: I2defbdeddca39685194751022e6dcb5f1a48a0e9
 2014-04-15 12:11:39 -07:00
quddusc
45f232cf57 am 7ba3b3f4: am fe0996b7: am 60095240: docs: Updated the gradle build number to 4.3.23. Bug: 14043082 
* commit '7ba3b3f4c87d891a2e8b55f68efd169392ff62af':
  docs: Updated the gradle build number to 4.3.23. Bug: 14043082
 2014-04-15 18:34:31 +00:00
Katie McCormick
2aa704133a am 76b66a9a: am 2b4d89b7: am eca07bfa: Merge "Doc change: Update CCS doc with new quota info." into klp-docs 
* commit '76b66a9ae7a894dd30a3bab56dedb537a904157b':
  Doc change: Update CCS doc with new quota info.
 2014-04-15 18:34:27 +00:00
quddusc
7ba3b3f4c8 am fe0996b7: am 60095240: docs: Updated the gradle build number to 4.3.23. Bug: 14043082 
* commit 'fe0996b7c09606fab0c1645d6c329cadf4d82841':
  docs: Updated the gradle build number to 4.3.23. Bug: 14043082
 2014-04-15 18:29:05 +00:00
Katie McCormick
76b66a9ae7 am 2b4d89b7: am eca07bfa: Merge "Doc change: Update CCS doc with new quota info." into klp-docs 
* commit '2b4d89b7dcea13140b64e887b2a36042e8d491e9':
  Doc change: Update CCS doc with new quota info.
 2014-04-15 18:28:59 +00:00
Adam Powell
e107092879 am 50d7bfd8: DO NOT MERGE Refactoring of fitSystemWindows to applyWindowInsets for views 
* commit '50d7bfd8224f9da170dac668888bcf0831373051':
  DO NOT MERGE Refactoring of fitSystemWindows to applyWindowInsets for views
 2014-04-15 17:57:46 +00:00