121593 Commits

Author SHA1 Message Date
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
Adam Powell
50d7bfd822 DO NOT MERGE Refactoring of fitSystemWindows to applyWindowInsets for views
Applying insets is now handled by:

* WindowInsets class - Encapsulate system insets and local decor
  insets into a single object, written specifically so that new inset
  categories may be added later. Apps cannot construct their own
  WindowInsets, only clone with optional modifications. This is to
  prevent losing data in the event of new insets added in the future.

* onApplyWindowInsets - Actually perform the application of insets.

* OnApplyWindowInsetsListener - Allow an app to use a separate
  Listener object to apply insets to a View. This allows for things
  like support lib integration in custom views written for older
  versions where the verifier would otherwise complain about the use
  of the new WindowInsets class as a method parameter. It also allows
  for applying insets in a custom way without writing a custom view.

* dispatchApplyWindowInsets - Dispatch the call to self and children
  in turn, if applicable. An OnApplyWindowInsetsListener will override
  the behavior of the view's default onApplyWindowInsets method; a
  listener wishing to call down to the 'superclass' implementation as
  part of its own operation should call view.onApplyWindowInsets. App
  code should generally not override this method and instead override
  onApplyWindowInsets or provide a listener.

Compatibility support with the existing fitSystemWindows method has
been provided in both directions: for code that previously called
fitSystemWindows on arbitrary views and also for code that overrode
the fitSystemWindows method in custom views. A view that supports the
newer onApplyWindowInsets mechanism should not mix that behavior with
other calls to fitSystemWindows or vice versa. Support lib-style code
should take care to consistently use one mechanism or the other at
runtime.

Change-Id: Ie88b96e0382beb5d3c3f6cd013f7043acbc0a105
2014-04-15 10:30:25 -07:00
quddusc
fe0996b7c0 am 60095240: docs: Updated the gradle build number to 4.3.23. Bug: 14043082
* commit '60095240e2a1b1c96ee4caf6cd7e9e1fa38acbb8':
  docs: Updated the gradle build number to 4.3.23. Bug: 14043082
2014-04-15 17:12:03 +00:00
quddusc
60095240e2 docs: Updated the gradle build number to 4.3.23.
Bug: 14043082

Change-Id: I8068f34b2533631b16dbaeaae3a0465088cc5aaf
2014-04-15 16:57:40 +00:00
Katie McCormick
2b4d89b7dc am eca07bfa: Merge "Doc change: Update CCS doc with new quota info." into klp-docs
* commit 'eca07bfaaf89d5c0280dbc44b165ee1e3ca13498':
  Doc change: Update CCS doc with new quota info.
2014-04-15 16:55:32 +00:00
Katie McCormick
eca07bfaaf Merge "Doc change: Update CCS doc with new quota info." into klp-docs 2014-04-15 16:52:44 +00:00
quddusc
99c3605c1d am 66e99c46: am 0bd51600: am 41fb2be0: docs: Updated name of API to "Google Maps Android API v2". Bug: 13666553
* commit '66e99c46546bf34fb8806dbefdbd71df1d41c814':
  docs: Updated name of API to "Google Maps Android API v2". Bug: 13666553
2014-04-14 22:56:44 +00:00
quddusc
66e99c4654 am 0bd51600: am 41fb2be0: docs: Updated name of API to "Google Maps Android API v2". Bug: 13666553
* commit '0bd516001988517aade19feb087de5cb03820805':
  docs: Updated name of API to "Google Maps Android API v2". Bug: 13666553
2014-04-14 22:51:45 +00:00
quddusc
0bd5160019 am 41fb2be0: docs: Updated name of API to "Google Maps Android API v2". Bug: 13666553
* commit '41fb2be0f2cb0f1a09b05f475ebb89fe4d975a68':
  docs: Updated name of API to "Google Maps Android API v2". Bug: 13666553
2014-04-14 22:47:51 +00:00
Katie McCormick
b642f672f0 Doc change: Update CCS doc with new quota info.
Fix for:

b/12665669

Change-Id: I08f812d37ab6f4347f6401b3a9682c45d96adb81
2014-04-14 15:05:02 -07:00
Christopher Lane
381ac08054 am 62538940: Merge "Add support for custom TXT records in NSD" into klp-modular-dev
* commit '62538940de1755c71c56b0e5d81e12397e5de58a':
  Add support for custom TXT records in NSD
2014-04-14 21:16:27 +00:00
Christopher Lane
62538940de Merge "Add support for custom TXT records in NSD" into klp-modular-dev 2014-04-14 21:13:09 +00:00
Jin Zhebin
28a5c59357 EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested.
OpenGL ES have 3 configuration: 1(EGL10.EGL_RENDERABLE_TYPE),
2(EGL_OPENGL_ES2_BIT), 3(EGL_OPENGL_ES3_BIT_KHR). The driver
should be get the according configuration parameter.
Now 1 is set to driver when Configuration 3 is set from user.
Specification EGL_OPENGL_ES3_BIT_KHR is set to driver when a OpenGL
ES 3 context is requested in setEGLContextClientVersion().

Change-Id: I980d9d8dbe5754295f8329fcf9378962d669fa89
Signed-off-by: Jin Zhebin <zhebinx.jin@intel.com>
Signed-off-by: bdeng3X <bingx.deng@intel.com>
2014-04-15 05:11:58 +08:00
Christopher Lane
b72d8b4091 Add support for custom TXT records in NSD
Change-Id: I8e6dc9852ad4d273c71ad6a63a7fbd28a206806d
2014-04-14 14:10:36 -07:00
Raph Levien
f6ee7e3f47 am 202d1ec7: Fix text shadow attributes in textAppearance
* commit '202d1ec753ff9401f3a1ea93a09a7419e76b7f91':
  Fix text shadow attributes in textAppearance
2014-04-14 19:30:22 +00:00
quddusc
41fb2be0f2 docs: Updated name of API to "Google Maps Android API v2".
Bug: 13666553

Change-Id: I6de26da064fcda4a64e29d35c7d75140c5a4e048
2014-04-14 11:57:33 -07:00
Raph Levien
202d1ec753 Fix text shadow attributes in textAppearance
The various text shadow attributes were not being properly applied
because they were being retrieved from the wrong TypedArray.

This is the proper fix for bug 13525033 Shadow* attributes in a style
not being applied in textAppearance.

Change-Id: I57a8f498bf6059c5c5c74c1072edb277a24ea053
2014-04-14 18:27:30 +00:00
Baligh Uddin
8343a20437 Import translations. DO NOT MERGE
Change-Id: I06501e9574457274ef7b0a3951a1d76b8c50fdac
Auto-generated-cl: translation import
2014-04-14 10:06:45 -07:00
Narayan Kamath
964570044e am 549ae327: am aa19a2f6: Merge "Don\'t compare String8s to NULL."
* commit '549ae327245a844862065dc9bb0562544e8c3beb':
  Don't compare String8s to NULL.
2014-04-14 08:46:17 +00:00