Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
123,545 Commits 3 Branches 0 Tags
a487fb77dff1a86fbd160694de41e32b74f10cb1
Commit Graph

123545 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
a487fb77df am df0e9ed5: am 862be912: Merge "Updated Trace.h to recognize ATRACE_TAG_BIONIC." 
* commit 'df0e9ed5536e2cab860f3ecf9dab0030a471766e':
  Updated Trace.h to recognize ATRACE_TAG_BIONIC.
 2014-05-28 21:48:46 +00:00
Elliott Hughes
df0e9ed553 am 862be912: Merge "Updated Trace.h to recognize ATRACE_TAG_BIONIC." 
* commit '862be91276ec9532b3ed00d43fc7a750f1e6adb0':
  Updated Trace.h to recognize ATRACE_TAG_BIONIC.
 2014-05-28 21:41:30 +00:00
Elliott Hughes
862be91276 Merge "Updated Trace.h to recognize ATRACE_TAG_BIONIC." 2014-05-28 21:36:33 +00:00
Brigid Smith
461ac24b8c Updated Trace.h to recognize ATRACE_TAG_BIONIC. 
Bug: 15116468
Change-Id: I6aef941c6b6bd59347855f7265e701a3aaa08edc
 2014-05-28 14:21:06 -07:00
Narayan Kamath
f4e0bf9fe1 am 98993813: am b75b3aaa: Merge "Build PacProcessor for 64 bit." 
* commit '98993813b31f20c27f2c0a91daebdaedc382bb5b':
  Build PacProcessor for 64 bit.
 2014-05-28 09:23:21 +00:00
Narayan Kamath
98993813b3 am b75b3aaa: Merge "Build PacProcessor for 64 bit." 
* commit 'b75b3aaac4f0282a99bb4486b5dce51a87bc0dd7':
  Build PacProcessor for 64 bit.
 2014-05-28 08:48:23 +00:00
Narayan Kamath
b75b3aaac4 Merge "Build PacProcessor for 64 bit." 2014-05-28 08:44:36 +00:00
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
d7439d8c59 Merge "Add confidence to the heart rate monitor definition and clarify onAccuracyChange" into klp-modular-dev 2014-05-27 18:03:13 +00:00
Craig Mautner
754a8c4c95 am 1b4bf857: Do not start tasks on ActivityViews unless explicit 
* commit '1b4bf857d34dc58a4ef84f5f0761bb7685051fbb':
  Do not start tasks on ActivityViews unless explicit
 2014-05-27 16:22:39 +00:00
Craig Mautner
1b4bf857d3 Do not start tasks on ActivityViews unless explicit 
New tasks were being started on ActivityViews because they
matched packages. This fix enforces a rule that new tasks
can only be started on ActivityViews if they are explicitly
targeted for that ActivityView.

Fixes bug 15162447.

Change-Id: I9ccb72171b5cda0897a0b9ffe4cbebfbb0d92c2c
 2014-05-27 09:19:28 -07:00
Narayan Kamath
96132a1907 Build PacProcessor for 64 bit. 
external/chromium-libpac can now build for 64 bit.

Change-Id: I0bfd068ef4ea7d57686f11b79c32803e38bab719
 2014-05-27 17:06:18 +01:00
Narayan Kamath
eae7b53d3a am 34c6cb4c: am 6b5beb31: Merge "PacProccesor: Only build for 32-bit" 
* commit '34c6cb4c1af7a7dd8f8658dd401c74076943ffb8':
  PacProccesor: Only build for 32-bit
 2014-05-27 11:06:03 +00:00
Narayan Kamath
34c6cb4c1a am 6b5beb31: Merge "PacProccesor: Only build for 32-bit" 
* commit '6b5beb318b439b0b3aeabf42401bfed63bfbe2e2':
  PacProccesor: Only build for 32-bit
 2014-05-27 11:00:48 +00:00
Narayan Kamath
6b5beb318b Merge "PacProccesor: Only build for 32-bit" 2014-05-27 10:57:20 +00:00
Andreas Gampe
4694175624 PacProccesor: Only build for 32-bit 
PacProcessor relies on libpac from chromium, which is not built
for 64b right now.

(cherry picked from commit f8749200c0)

Change-Id: Ic128e17b7437c130df29eeab3293b9c01f01d70b
 2014-05-27 11:56:22 +01: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
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