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

128441 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jeff Davidson
6a4a946223 Merge "Data structures for communication with network scorer apps." 2014-04-16 18:29:23 +00:00
Jeff Davidson
dc960e21ef 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
 2014-04-16 11:28:51 -07:00
Alan Viverette
3c24bb4ae0 Merge "Implement jumpToCurrentState() in VectorDrawable" 2014-04-16 18:21:36 +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
Christoph Studer
d67d073b9f Merge "Rename basePkg to opPkg" 2014-04-16 17:37:20 +00:00
Baligh Uddin
1723d6fef6 Remove activitystrings.xml from localized resource directories 
Change-Id: I57fe2e6f60fcebd77118f15db9d06b0f2df56d7c
 2014-04-16 10:35:49 -07:00
Winson Chung
fe08369d8c Merge "Fixing the alternate recents transition on landscape views." 2014-04-16 17:25:59 +00:00
Winson Chung
2820c4523c Fixing the alternate recents transition on landscape views. 
- This still assumes that we are taking square thumbnails.

Change-Id: I42a3d1b0505db57f815edf52cd176a3f651d5b37
 2014-04-16 09:56:42 -07:00
Christoph Studer
8fd7f1ed7c Rename basePkg to opPkg 
...and actually populate the field correctly.

Change-Id: I3ce52efedb919d6af75dc9c3532e47764c467cac
 2014-04-16 18:51:25 +02:00
Baligh Uddin
3eff39fb0f Merge "Revert "Import translations. DO NOT MERGE"" 2014-04-16 16:10:08 +00:00
Baligh Uddin
abe94cf196 Revert "Import translations. DO NOT MERGE" 
This reverts commit bcf6441e61725a2e6c04d03de43d209311da9d3a.

Change-Id: I8b556dfaeb45434e194503fe5ae77e744637f6c2
 2014-04-16 16:09:58 +00:00
Christoph Studer
97096fd0e6 Merge "Write eventlog entries for notification visibility" 2014-04-16 15:49:54 +00:00
Baligh Uddin
7553434472 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
 2014-04-16 15:34:04 +00: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
Baligh Uddin
3471e80349 Merge "Import translations. DO NOT MERGE" 2014-04-16 15:27:00 +00:00
Baligh Uddin
da7cc2c42d Merge "Import translations. DO NOT MERGE" 2014-04-16 15:26:24 +00:00
Baligh Uddin
cf8aed657b Merge "Import translations. DO NOT MERGE" 2014-04-16 15:26:20 +00:00
Christoph Studer
92b389da2a 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
 2014-04-16 17:07:49 +02:00
Ben Murdoch
6f51cd7ede Merge "Revert "Revert "Define new general permission APIs for webview.""" 2014-04-16 12:45:24 +00:00
Dongwon Kang
781c55fda2 Merge "Handle the failure of session creation request in TvInputManagerService." 2014-04-16 06:56:22 +00:00
Dongwon Kang
fd5b72f1ed Handle the failure of session creation request in TvInputManagerService. 
Bug: 14073508
Change-Id: Idc9da323bb0000300faf662c7db031214ae6136c
 2014-04-16 14:23:25 +09:00
Wink Saville
070e061a28 Add LISTEN_DATA_CONNECTIPON_REAL_TIME_INFO as listen event 
Also added DataConnectionRealTimeInfo structure which passed as a
parameter to onDataConnectionRealTimeInfoChanged.

Change-Id: Iadcbf9765af57c125bcdf74e3fc652ed6c8f7d42
 2014-04-15 22:04:10 -07: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