47035 Commits

Author SHA1 Message Date
Griff Hazen
c15d315aeb am a9cb1e66: Add full screen size preset to WearableExtender
* commit 'a9cb1e66737f816d643bca03832af719cbdd0f20':
  Add full screen size preset to WearableExtender
2014-05-28 00:18:03 +00:00
Griff Hazen
be5898b198 am 6f72ac5d: Doc fixes for Notification.WearableExtender
* commit '6f72ac5d5f4b7bae34bb3dab7821f3dbcbf02bcd':
  Doc fixes for Notification.WearableExtender
2014-05-27 22:44:28 +00:00
Griff Hazen
a9cb1e6673 Add full screen size preset to WearableExtender
For custom display notifications.

Bug: 14838838
Change-Id: Id038d994d61d3c89dba08232a424a5b1b934e5db
2014-05-27 15:40:09 -07:00
Griff Hazen
6f72ac5d5f Doc fixes for Notification.WearableExtender
Change-Id: I22947e30d329e667079555ac4ac5f9b25d6bd3fa
2014-05-27 11:28:45 -07:00
Etienne Le Grand
7326defe2d am d7439d8c: Merge "Add confidence to the heart rate monitor definition and clarify onAccuracyChange" into klp-modular-dev
* commit 'd7439d8c59e4c5a82ad94a5080436cc94f72e0be':
  Add confidence to the heart rate monitor definition and clarify onAccuracyChange
2014-05-27 18:06:13 +00:00
Etienne Le Grand
af80510e85 Add confidence to the heart rate monitor definition and clarify onAccuracyChange
Change-Id: I686d07dcd603bf3c3be3c1471de8be3b4e240855
2014-05-23 19:14:33 -07:00
Christopher Tate
8c0660c257 am d6d7587a: am a0166b58: Merge "Activity chooser "Always" button is not working"
* commit 'd6d7587ab09e4a0eae9252e11ab59ad27af68823':
  Activity chooser "Always" button is not working
2014-05-23 02:27:17 +00:00
Christopher Tate
d6d7587ab0 am a0166b58: Merge "Activity chooser "Always" button is not working"
* commit 'a0166b58de38e0d2d67f9d847d307cf3ce7bf633':
  Activity chooser "Always" button is not working
2014-05-23 02:22:40 +00:00
Christopher Tate
a0166b58de Merge "Activity chooser "Always" button is not working" 2014-05-23 02:17:33 +00:00
Andrew Solovay
59f61cc23d am 768a899f: am b5960898: am 9562863c: doc: Updated branding guidelines per request from @deniseamling.
* commit '768a899f214dd2fcf4bf3857549fee81b22debc4':
  doc: Updated branding guidelines per request from @deniseamling.
  Noted that OnSharedPreferenceChangeListener does not store a strong reference to the listener.
2014-05-22 22:50:45 +00:00
Andrew Solovay
768a899f21 am b5960898: am 9562863c: doc: Updated branding guidelines per request from @deniseamling.
* commit 'b59608981ff464b85a26987b8822913e41e72291':
  doc: Updated branding guidelines per request from @deniseamling.
  Noted that OnSharedPreferenceChangeListener does not store a strong reference to the listener.
2014-05-22 22:45:06 +00:00
Vinod Krishnan
eae1e09459 am 810ed89c: Merge "Adding activity enter/exit animations for wearables" into klp-modular-dev
* commit '810ed89c244060beefa91470e0fa3d50d679caba':
  Adding activity enter/exit animations for wearables
2014-05-22 22:44:53 +00:00
Griff Hazen
e5b73ae234 am c3104157: Api updates for wearable extensions to notifications
* commit 'c3104157d8f12238b0ac8cf6c6f963dadb44167c':
  Api updates for wearable extensions to notifications
2014-05-22 22:44:35 +00:00
Andrew Solovay
b59608981f am 9562863c: doc: Updated branding guidelines per request from @deniseamling.
* commit '9562863cf184fe99be223aff9700b3ceb8559e1a':
  doc: Updated branding guidelines per request from @deniseamling.
  Noted that OnSharedPreferenceChangeListener does not store a strong reference to the listener.
2014-05-22 22:41:55 +00:00
Vinod Krishnan
810ed89c24 Merge "Adding activity enter/exit animations for wearables" into klp-modular-dev 2014-05-22 22:39:42 +00:00
Griff Hazen
c3104157d8 Api updates for wearable extensions to notifications
1. Move Extender outside of Builder
2. Rename apply/applyTo to extend
3. Move Wearable extenders into Notification.java
4. Collapse Builder model into single classes
5. Use Bundle for storage: no new parcelable types.

Minor fix to RemoteInput to use flags int for boolean options.

Change-Id: I40012fd0458ec103eabf75ed4c91f636e02f4c8f
2014-05-22 14:38:36 -07:00
Vinod Krishnan
87224df175 Adding activity enter/exit animations for wearables
Bug: 14939877
Bug: 15022424

Change-Id: Id230066c675254a63c5222719a05f86c6b897fa5
2014-05-22 10:55:45 -07:00
Sebastien Hertz
0f29390564 am b2db356d: am fc1ffe89: Merge "Report runtime information to DDMS"
* commit 'b2db356dc8514e8b7546a04907217f02cd8b19e1':
  Report runtime information to DDMS
2014-05-22 14:57:28 +00:00
Sebastien Hertz
b2db356dc8 am fc1ffe89: Merge "Report runtime information to DDMS"
* commit 'fc1ffe89db4bfe51856dadead2ed9c856a96ca65':
  Report runtime information to DDMS
2014-05-22 14:53:22 +00:00
Sebastien Hertz
fc1ffe89db Merge "Report runtime information to DDMS" 2014-05-22 14:47:14 +00:00
Xiong Li
e88b042d1d Activity chooser "Always" button is not working
When ResolverActivity is created with a custom list of matching
applications (rList) as in NFC case, and the alwaysUseOption is
set to true, the prferredActivity is not saved even if the user
presses the "always" button.

When a list is provided the variable mBaseResolveList will be
!= null. This will set mOrigResolveList = null.

When an activity is choosen and one of the buttons are pressed
onIntentSelected is called. The first thing this method does
is to check mAdapter.mOrigResolveList != null, however in this
case mOrigResolveList is always null, and the value is not
saved as PreferredActivity.

This problem was introduced in
6d8dfbd8149942f25f2b9643a12f1fb38f3be834.

Change-Id: I9eac41b7861b5e68ad3978af0dc0285f2a34eb88
2014-05-22 11:58:41 +02:00
Sebastien Hertz
e901dbdee2 Report runtime information to DDMS
Reports runtime's ABI and internal flags to be displayed by DDMS.

Bug: 14888999
Bug: 14888124
Change-Id: I8a2d3f22f84a093be2fbc74464af6aa7b2a2bebb
2014-05-22 10:28:12 +02:00
Baligh Uddin
74e7e2d844 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-05-22 03:04:49 +00:00
Mindy Pereira
246f907b54 am a718943d: Merge "Make a smaller cliff for dismissing cards" into klp-modular-dev
* commit 'a718943d422876488f8723bfe6f35f352ffcb586':
  Make a smaller cliff for dismissing cards
2014-05-21 22:38:06 +00:00
Mindy Pereira
a718943d42 Merge "Make a smaller cliff for dismissing cards" into klp-modular-dev 2014-05-21 21:54:38 +00:00
Baligh Uddin
89f6dace62 Import translations. DO NOT MERGE
Change-Id: I0d1bfc06ee6a3f8a0f75eaa37a055f0b6f887076
Auto-generated-cl: translation import
2014-05-21 13:56:23 -07:00
Vinod Krishnan
82fa124c3a am 4f65a545: Merge "Adding more DeviceDefault for CTS tests" into klp-modular-dev
* commit '4f65a5456159b64185bb99c193bcff93b07770f8':
  Adding more DeviceDefault for CTS tests
2014-05-21 17:46:16 +00:00
Vinod Krishnan
9b8e4d01f6 Adding more DeviceDefault for CTS tests
Bug: 15091518
Change-Id: Iddabacbd023f031c9c4ec6fd4c4f60ce17b606c4
2014-05-21 10:28:57 -07:00
Jeff Sharkey
fce708d285 am 9ef2117f: am bc06158a: Merge "Check for null in LocalSocketImpl.SocketInputStream.available()"
* commit '9ef2117f0e65db60cb3f9708174bcaca4db813b2':
  Check for null in LocalSocketImpl.SocketInputStream.available()
2014-05-21 16:13:18 +00:00
Jeff Sharkey
9ef2117f0e am bc06158a: Merge "Check for null in LocalSocketImpl.SocketInputStream.available()"
* commit 'bc06158a78297747605981702c8e41956ea1aa2d':
  Check for null in LocalSocketImpl.SocketInputStream.available()
2014-05-21 16:05:34 +00:00
Jeff Sharkey
bc06158a78 Merge "Check for null in LocalSocketImpl.SocketInputStream.available()" 2014-05-21 16:03:08 +00:00
Baligh Uddin
ef2b35cc2e Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-05-21 15:34:11 +00:00
Jeff Brown
fcc4fed3c1 am 6fb904bf: Merge "Make power button behavior configurable." into klp-modular-dev
* commit '6fb904bfd1f943547d6e5bc6f199ffec2290da01':
  Make power button behavior configurable.
2014-05-21 08:40:33 +00:00
Jeff Brown
6fb904bfd1 Merge "Make power button behavior configurable." into klp-modular-dev 2014-05-21 04:28:34 +00:00
Jeff Brown
6d8fd27e51 Make power button behavior configurable.
Allow power button to be used to either go to sleep as usual,
which may doze, or skip that completely and really go to sleep.
May also really go to sleep and go home all at once.

Bug: 14406056
Change-Id: Ia19e2551b9c2a72271bb2eddd5c0d1749761e019
2014-05-20 21:24:38 -07:00
Griff Hazen
08a8c2ca45 am ef6aae62: Merge "Fixes to WearableActionExtensions" into klp-modular-dev
* commit 'ef6aae62f6c92bc9413db60c28cc4b3230f4d2fa':
  Fixes to WearableActionExtensions
2014-05-21 02:44:16 +00:00
Griff Hazen
ef6aae62f6 Merge "Fixes to WearableActionExtensions" into klp-modular-dev 2014-05-21 02:41:02 +00:00
Jeff Brown
8f120dd6d6 am 0702786d: Merge "Allow display timeouts to be set in config.xml." into klp-modular-dev
* commit '0702786d81eb9f9bf47c3a0827d3f2824c3f4228':
  Allow display timeouts to be set in config.xml.
2014-05-21 02:38:07 +00:00
Jeff Brown
0702786d81 Merge "Allow display timeouts to be set in config.xml." into klp-modular-dev 2014-05-21 02:34:25 +00:00
Griff Hazen
4ae73202c3 Fixes to WearableActionExtensions
* Add missing parcelable creator.
* Review fixes.
* Minor doc fixes.
* Kill SIZE_FULLSCREEN

Change-Id: Iaf6458fdd3482202aa416ebaf2302f79cb48635e
2014-05-20 18:46:16 -07:00
Jeff Brown
27736f5c0a Allow display timeouts to be set in config.xml.
Bug: 13671523
Change-Id: I79fc21999bc62743178d2d22071455a0c11070c9
2014-05-20 17:17:10 -07:00
Griff Hazen
cbe69ec18d am 7ea18e1c: Add wearable notification extensions to frameworks/base.
* commit '7ea18e1c92ab84d1a0d00087e6e3784646661fe8':
  Add wearable notification extensions to frameworks/base.
2014-05-20 23:21:01 +00:00
Griff Hazen
7ea18e1c92 Add wearable notification extensions to frameworks/base.
Change-Id: Ic312cec7dc11e637002ff2be3975940a93a6babf
2014-05-20 13:50:06 -07:00
Jeff Brown
9777fdb7af am b0a7f84b: am 63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown"
* commit 'b0a7f84b6de20edc6337163a4a07e3c524991ddb':
  Fix NullException in QwertyKeyListener.KeyDown
2014-05-20 20:44:21 +00:00
Jeff Brown
b0a7f84b6d am 63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown"
* commit '63bf04d88bcc00876c30c9f2848da8c44b42185b':
  Fix NullException in QwertyKeyListener.KeyDown
2014-05-20 20:40:20 +00:00
Jeff Brown
63bf04d88b Merge "Fix NullException in QwertyKeyListener.KeyDown" 2014-05-20 20:37:44 +00:00
Griff Hazen
7ba69dd8bd am 9e1379f1: Fix sdk docs build for framework from remote input api addition.
* commit '9e1379f1126c1101f69445572bd441b2211791fa':
  Fix sdk docs build for framework from remote input api addition.
2014-05-20 20:07:32 +00:00
Griff Hazen
9e1379f112 Fix sdk docs build for framework from remote input api addition.
Change-Id: I6a6f3df06d924fe72f67466d67d9feced8d8719f
2014-05-20 12:51:29 -07:00
Griff Hazen
8f1e7aded3 am 5cadc3b0: Add RemoteInput, Grouping, and Extender to Notification api.
* commit '5cadc3b00aa775a63518383046c902b130e09b4c':
  Add RemoteInput, Grouping, and Extender to Notification api.
2014-05-20 18:41:46 +00:00
Mindy Pereira
56e533a5f6 Make a smaller cliff for dismissing cards
Fixes b/14997474 swipe to dismiss cliff guard may be too big

Change-Id: I3e681f1c6dc3eaac37a0e840b36f4c7041e86e62
2014-05-20 10:19:03 -07:00