123524 Commits

Author SHA1 Message Date
Scott Main
c138c82207 am e5c9c92c: am a4c95869: am 1f1bb9d0: Merge "add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav." into klp-docs
* commit 'e5c9c92c23196269ccf50024f76f84779b821c32':
  add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav.
2014-05-23 21:57:57 +00:00
Scott Main
e5c9c92c23 am a4c95869: am 1f1bb9d0: Merge "add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav." into klp-docs
* commit 'a4c95869ed2727ecc471e218b204657b7eaf8b5c':
  add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav.
2014-05-23 21:52:43 +00:00
Scott Main
a4c95869ed am 1f1bb9d0: Merge "add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav." into klp-docs
* commit '1f1bb9d06830552269c68bf3bd1e7184f1a7bb9d':
  add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav.
2014-05-23 21:49:15 +00:00
Scott Main
1f1bb9d068 Merge "add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav." into klp-docs 2014-05-23 21:45:33 +00:00
Eric Laurent
5231cb4bfb am b928b7c2: am ba64d298: Merge "AudioService: fix cross deadlock in VolumeStreamState"
* commit 'b928b7c2bf12a5dbd31b08d244b0ff8d2a9851c1':
  AudioService: fix cross deadlock in VolumeStreamState
2014-05-23 21:41:47 +00:00
Eric Laurent
b928b7c2bf am ba64d298: Merge "AudioService: fix cross deadlock in VolumeStreamState"
* commit 'ba64d298bee228b8e27ea17fb31fbff4b4188304':
  AudioService: fix cross deadlock in VolumeStreamState
2014-05-23 21:37:54 +00:00
Eric Laurent
ba64d298be Merge "AudioService: fix cross deadlock in VolumeStreamState" 2014-05-23 21:34:25 +00:00
Eric Laurent
fdbee869be AudioService: fix cross deadlock in VolumeStreamState
Synchronize modifications of volume index by VolumeStreamState
class mutex instead of using synchronized methods.
This avoids possible cross deadlock when modifying volume on
two stream types simultaneously and one is slave to the other.

Bug: 13730145.

Change-Id: I13406c71010ce0c2e2f08f660b6101f310396c98
2014-05-23 21:32:06 +00:00
Griff Hazen
1e5746c682 am 00389a46: Fix build: CheckBuild line for removed wearable package
* commit '00389a46ea6c9d1a9557fe648ffec64aaf5e95e0':
  Fix build: CheckBuild line for removed wearable package
2014-05-23 08:37:01 +00:00
Griff Hazen
00389a46ea Fix build: CheckBuild line for removed wearable package
Change-Id: I26e39dc11add182e07bcc13456a166c86c911210
2014-05-23 05:10:05 +00:00
Dmitriy Ivanov
190ed5db4a am 2137d6a8: am d5ee4144: Merge "Increase start timeout for wrapped process"
* commit '2137d6a843b82996e08f0e03376e48860919d8bc':
  Increase start timeout for wrapped process
2014-05-23 02:40:42 +00:00
Dmitriy Ivanov
2137d6a843 am d5ee4144: Merge "Increase start timeout for wrapped process"
* commit 'd5ee4144c4beae54219e1b8eb10418b02dd4a63b':
  Increase start timeout for wrapped process
2014-05-23 02:35:42 +00:00
Dmitriy Ivanov
d5ee4144c4 Merge "Increase start timeout for wrapped process" 2014-05-23 02:31:37 +00: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
Aravind Akella
c7153377cf am 73da981f: Merge "Remove getRequiredPermission from NDK." into klp-modular-dev
* commit '73da981fd60f9dc855a04ea53e9fff59a011577e':
  Remove getRequiredPermission from NDK.
2014-05-22 22:44:49 +00:00
Nick Vaccaro
1af1371e1b am 117df282: Don\'t grab wakelock if Wifi feature not supported on device
* commit '117df282017945f3b3f05dc43a6f436d19d3f071':
  Don't grab wakelock if Wifi feature not supported on device
2014-05-22 22:44:44 +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
Aravind Akella
73da981fd6 Merge "Remove getRequiredPermission from NDK." into klp-modular-dev 2014-05-22 22:01:23 +00:00
Andrew Solovay
9562863cf1 doc: Updated branding guidelines per request from @deniseamling.
Per her team's request, I also removed the AI version of the Google
Play Store icon, and replaced it with a high-rez PNG version.

Current version of doc is staged at:

http://asolovay.mtv:9010/distribute/tools/promote/brand.html

(Denise gave me a LGTM via email.)

Bug: 14621461

Change-Id: Id44a0dc73c7ef2f2bde595a1e98b75083d126176
2014-05-22 21:54:27 +00:00
Nick Vaccaro
117df28201 Don't grab wakelock if Wifi feature not supported on device
Only grab the suspend wakelock when handling screen on/off
transitions if the device actually supports Wifi.

Bug: 14250726
Change-Id: Ic332cf84e40622ab6bbe60a2288ee478f1cabb2a
2014-05-22 21:48:22 +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
Aravind Akella
8bcdd9b7a5 Remove getRequiredPermission from NDK.
Change-Id: Ieb1e97e44ef335e6087ba9164058fe3535e9998a
2014-05-22 13:33:52 -07:00
Andrew Solovay
7f24adf19b Merge "Noted that OnSharedPreferenceChangeListener does not store a strong reference to the listener." into klp-docs 2014-05-22 20:23:50 +00:00
Dmitriy Ivanov
c774dcee9d Increase start timeout for wrapped process
* apparently 300*1000 for valgrind is not enough
   (hammerhead aosp tot).

Change-Id: Ia3f26cb67d3aa0ebdec68f3c1a764bad5e7f4f95
2014-05-22 12:40:25 -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
15685632e0 am adb0a906: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'adb0a906dc71a0133b9345031dd88682e49a519a':
  Import translations. DO NOT MERGE
2014-05-22 03:11:14 +00:00
Baligh Uddin
48137740b8 am b9c1e5a8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'b9c1e5a82947e13a10b407a1d4f81967c9af99b4':
  Import translations. DO NOT MERGE
2014-05-22 03:11:11 +00:00
Baligh Uddin
25fe41b8e0 am 74e7e2d8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '74e7e2d844c8f3d8d8e102ad5f05cddc94b230ca':
  Import translations. DO NOT MERGE
2014-05-22 03:11:08 +00:00
Baligh Uddin
a83b42cb40 am 5938757f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '5938757f5154b956f119042ee97b3ac8417a1ac2':
  Import translations. DO NOT MERGE
2014-05-22 03:11:04 +00:00
Baligh Uddin
b8cc0ed838 am 675b4871: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '675b48712ecd0de46d6d3828890b8ca25f1df2bf':
  Import translations. DO NOT MERGE
2014-05-22 03:11:00 +00:00
Baligh Uddin
adb0a906dc Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-05-22 03:06:14 +00:00
Baligh Uddin
b9c1e5a829 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-05-22 03:04:53 +00:00
Baligh Uddin
74e7e2d844 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-05-22 03:04:49 +00:00
Baligh Uddin
5938757f51 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-05-22 03:04:46 +00:00
Baligh Uddin
675b48712e Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-05-22 03:04:44 +00:00
Quddus Chong
c370f03c4f am b11a52cb: am a3c773e8: am 539f9e31: docs: Update the sample Gradle dependency declaration to reflect GMS K version.
* commit 'b11a52cb6f7db5e1b78582649801632b8d32b978':
  docs: Update the sample Gradle dependency declaration to reflect GMS K version.
2014-05-21 23:43:25 +00:00
Quddus Chong
b11a52cb6f am a3c773e8: am 539f9e31: docs: Update the sample Gradle dependency declaration to reflect GMS K version.
* commit 'a3c773e836dcb97c7f1045c8347dc7267bd21936':
  docs: Update the sample Gradle dependency declaration to reflect GMS K version.
2014-05-21 23:39:46 +00:00
Quddus Chong
a3c773e836 am 539f9e31: docs: Update the sample Gradle dependency declaration to reflect GMS K version.
* commit '539f9e31726dc780f26901de06c35a4b2446c37a':
  docs: Update the sample Gradle dependency declaration to reflect GMS K version.
2014-05-21 23:23:33 +00:00