121574 Commits

Author SHA1 Message Date
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
Narayan Kamath
549ae32724 am aa19a2f6: Merge "Don\'t compare String8s to NULL."
* commit 'aa19a2f69c33fdb6499d0bc1cfafced9f572da5b':
  Don't compare String8s to NULL.
2014-04-14 08:41:42 +00:00
Narayan Kamath
aa19a2f69c Merge "Don't compare String8s to NULL." 2014-04-14 08:18:25 +00:00
Narayan Kamath
90c75cf02e Don't compare String8s to NULL.
Use String8::isEmpty instead. Note that this code path is hit
only if the zygote calls ::exit, and that never happens unless
the VM invocation fails.

Change-Id: I0e7d3a86a79b12b2174ca3bf0dbe1904e33c041a
2014-04-12 12:25:50 +01:00
Jeff Brown
eaa8a6b7fe am a5c8d586: Fix build break due to layout lib.
* commit 'a5c8d586f6ceff252336f72c6e15efbf4785e794':
  Fix build break due to layout lib.
2014-04-12 08:22:06 +00:00
Jeff Brown
a5c8d586f6 Fix build break due to layout lib.
Change-Id: I87b40125adad0a799214f6ebf0dc04ec7903efbf
2014-04-11 22:09:06 -07:00
Deepanshu Gupta
c76faca60e am e2dc6985: am f1334ccc: am 849a8208: Add DatePickerDialog to layoutlib [DO NOT MERGE]
* commit 'e2dc69856879d41798545b2c113098195bf04fa6':
  Add DatePickerDialog to layoutlib [DO NOT MERGE]
2014-04-12 02:30:31 +00:00
Deepanshu Gupta
e2dc698568 am f1334ccc: am 849a8208: Add DatePickerDialog to layoutlib [DO NOT MERGE]
* commit 'f1334ccc1522241c0efc2449ed8bf472a5b01204':
  Add DatePickerDialog to layoutlib [DO NOT MERGE]
2014-04-12 02:26:09 +00:00
Deepanshu Gupta
f1334ccc15 am 849a8208: Add DatePickerDialog to layoutlib [DO NOT MERGE]
* commit '849a8208c88d38e55ec13a1fa76bf295fde96cb5':
  Add DatePickerDialog to layoutlib [DO NOT MERGE]
2014-04-12 02:23:04 +00:00
Jeff Brown
9e2fde9c8a am d912e1f6: Use the display\'s actual state in the view hierarchy.
* commit 'd912e1f6a111fb33118d116bd72da1a328041bca':
  Use the display's actual state in the view hierarchy.
2014-04-12 01:58:57 +00:00
Jeff Brown
d912e1f6a1 Use the display's actual state in the view hierarchy.
Previously, the view hierarchy would suppress drawing whenever the
PowerManager.isScreenOn() method returned false.  However, this method
really describes the interactive state of the device rather than the
actual display state.  This is especially a problem when there are
multiple displays but it also breaks drawing while in doze mode.

This change makes the view hierarchy consider the actual state of the
display instead on an individual basis.

Bug: 13133142
Change-Id: I69870b6b14a3504607a30562aa48c3452f777c1f
2014-04-11 18:46:22 -07:00
Jeff Tinker
600071ca78 Allow DRM plugins to be destroyed when released
bug: 13411994
Change-Id: I5b4ac137ebfbaa61bc37f8344ab6ff3a7f6c0099
2014-04-11 16:11:15 -07:00
Aravind Akella
8ebd66c259 am cd4c1c71: Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev
* commit 'cd4c1c714c37a1bc7ba35ebd2509eca4f0f6a314':
  Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
2014-04-11 19:34:51 +00:00
Aravind Akella
cd4c1c714c Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev 2014-04-11 19:32:38 +00:00
Jose Lima
9e99cab7d9 am 970417c7: Added getLeanbackLaunchIntentForPackage()
* commit '970417c7d3e33ccbd6918e28d9bc5da24651f5b3':
  Added getLeanbackLaunchIntentForPackage()
2014-04-11 18:58:43 +00:00
Narayan Kamath
88a996455b am 97953b30: am 4f4892d0: Merge "Workaround 64 bit devices that don\'t have zygotes yet."
* commit '97953b308f9159a73061ae047e368eac503c1931':
  Workaround 64 bit devices that don't have zygotes yet.
2014-04-11 18:36:32 +00:00
Narayan Kamath
97953b308f am 4f4892d0: Merge "Workaround 64 bit devices that don\'t have zygotes yet."
* commit '4f4892d00aab13975a8aed000f84ae0320355fd7':
  Workaround 64 bit devices that don't have zygotes yet.
2014-04-11 18:33:00 +00:00
Narayan Kamath
4f4892d00a Merge "Workaround 64 bit devices that don't have zygotes yet." 2014-04-11 18:29:55 +00:00
Narayan Kamath
2d84a406bf Workaround 64 bit devices that don't have zygotes yet.
This can be fixed by tweaking their BoardConfig as well,
but that leads to all sorts of other problems.

For now, fall back to the primary zygote if the secondary
is unavailable. This will fail if shared libraries for the
primary zygote ABI are unavailable, but that won't be the
case just yet.

bug: 13970103
Change-Id: Ifa107e43ca95023d57a0d9c641e4fddaccd9a888
2014-04-11 19:24:53 +01:00
Vinod Krishnan
033ae3abb5 Set wearable specific strings in framework
Change-Id: I81e7d55c53809199a340c9c16070b55ffbaeefc0
2014-04-11 10:58:03 -07:00