drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
137,142 Commits 1 Branch 0 Tags
Commit Graph

137142 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
c19a72c447 am 499f4a0a: VolumeZen: Don\'t clear stream type if embedded. 
* commit '499f4a0a4df37558801a712a24daebb91df0b327':
  VolumeZen: Don't clear stream type if embedded.
 2014-05-29 14:23:21 +00:00
John Spurlock
f71205c1ee VolumeZen: Don't clear stream type if embedded. 
Clearing the stream type makes sense if the volume panel is
in dialog mode, but not when embedded.

Bug:15186070
Change-Id: Ice5f547ef987e28ef51050faef682c5dfa5f7604
 2014-05-29 10:19:14 -04:00
John Spurlock
46023ace23 am cd41eb63: QuickSettings: Basic content-resizing for detail panel. 
* commit 'cd41eb6385590fadf63ce1b24cc5bf562f66a305':
  QuickSettings: Basic content-resizing for detail panel.
 2014-05-29 13:05:26 +00:00
Nicolas Prevot
a422a07d29 Merge "Small fix related to Cross-profile intents." 2014-05-29 12:58:39 +00:00
John Spurlock
2684d5e7d7 QuickSettings: Basic content-resizing for detail panel. 
Also remove toggle from zen tile + fix bottom padding.

Bug:15315490
Change-Id: Ib839b9280ce60d2f51e4c0c46e41a7743e7ec8f6
 2014-05-29 08:49:41 -04:00
Lorenzo Colitti
adbb17906e Merge "Don't break things if a network goes back to CONNECTED." 2014-05-29 12:25:46 +00:00
Nicolas Prevot
ad0634c50c Small fix related to Cross-profile intents. 
Change-Id: Id4cadd051c337776451ed807a2edac6d869b372a
 2014-05-29 13:11:31 +01:00
Lorenzo Colitti
51ed158a94 Don't break things if a network goes back to CONNECTED. 
Currently, if a network goes from CONNECTED to some other "live"
state (e.g., CONNECTING, because it's VERIFYING_POOR_LINK) and
back, ConnectivityService treats it as if a new network had
connected.  This causes it to attempt to create the network
(which fails, since a network with that netid already exists), to
trigger verification, and if the verification succeeds, to tear
down the network because the request it's satisfying is already
satisfied by the network itself.

Instead, if creating the network fails, assume it's because the
network had already been created, and bail out.

Also, when validation completes, ignore NetworkRequests that were
being served by the same NetworkAgent as before.

Bug: 15244052
Change-Id: Ifd73558e5be452d9ef88c64cca429d5f302bf354
 2014-05-29 19:19:54 +09:00
Wink Saville
e58d180bf6 am 5d3c9616: am 52b41462: am 9cd3ff7d: Merge "Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change." 
* commit '5d3c96168d3a16c860d9862167097f7d6e66a0fc':
  Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change.
 2014-05-29 10:02:17 +00:00
Wink Saville
5d3c96168d am 52b41462: am 9cd3ff7d: Merge "Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change." 
* commit '52b4146273ea29f6d1ed89e4de79f2d7ff0d71dc':
  Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change.
 2014-05-29 09:56:24 +00:00
Xavier Ducrohet
de5637b9ec am ec9aa23e: Merge "Stopgap fix for layoutlib." into lmp-preview-dev 
* commit 'ec9aa23e1e214c9359e38205495db225560c2753':
  Stopgap fix for layoutlib.
 2014-05-29 09:43:33 +00:00
Brian Carlstrom
30c624c49c am 1240221a: Tracking ActionBarView change 1181f77bdfaa7bf8a8250cdd13c7b7a1d6ee0c44 
* commit '1240221ac9cdc70ce2c79fcc48628d277e00354d':
  Tracking ActionBarView change 1181f77bdfaa7bf8a8250cdd13c7b7a1d6ee0c44
 2014-05-29 09:43:28 +00:00
Brian Carlstrom
4f9c216448 am da1d4828: Tracking IWindowManager change 2ea3814083f27567ae07a1b449da3d596dd4d9d5 
* commit 'da1d48285f2fc992de691a5abaf7c651a86201a2':
  Tracking IWindowManager change 2ea3814083f27567ae07a1b449da3d596dd4d9d5
 2014-05-29 09:43:23 +00:00
Christopher Tate
12eefc9f00 am 45ebf5d1: Merge "Widget restore documentation tweaks" into lmp-preview-dev 
* commit '45ebf5d19b6fc410eaafe1804f265503f585f682':
  Widget restore documentation tweaks
 2014-05-29 09:43:13 +00:00
Selim Cinek
bdcfd05418 am 61ba6af8: Merge "Fixed a bug where the user was unable to pull down statusbar." into lmp-preview-dev 
* commit '61ba6af8ac1b3b613342cbd522b7aa2e11aba8cb':
  Fixed a bug where the user was unable to pull down statusbar.
 2014-05-29 09:43:03 +00:00
Dianne Hackborn
d3a5b916b1 am c2091a1f: Merge "Add system layer for voice interaction services." into lmp-preview-dev 
* commit 'c2091a1fbc463941b3e42db36e369124ac3c1013':
  Add system layer for voice interaction services.
 2014-05-29 09:42:56 +00:00
Christoph Studer
5a2d76c176 am 8fed3095: Merge "SysUI: Fix bug where ZEN notification icon was shown" into lmp-preview-dev 
* commit '8fed3095b2b2342ebf59636b94e68b62ca16fd0d':
  SysUI: Fix bug where ZEN notification icon was shown
 2014-05-29 09:42:44 +00:00
Christopher Tate
415f354134 am ba922631: Merge "Don\'t crash on boot" into lmp-preview-dev 
* commit 'ba9226316df301fb612606f919aa69e109645c82':
  Don't crash on boot
 2014-05-29 09:42:36 +00:00
Griff Hazen
6b5f93e92b am cc212d35: am 339f437d: Additional doc fixes for WearableExtender 
* commit 'cc212d35aa611324e98aa2092c1ab588a0efe794':
  Additional doc fixes for WearableExtender
 2014-05-29 07:24:18 +00:00
Griff Hazen
cc212d35aa am 339f437d: Additional doc fixes for WearableExtender 
* commit '339f437dc3f7c474d9cf1f963819bab2596e6ad3':
  Additional doc fixes for WearableExtender
 2014-05-29 06:34:01 +00:00
Xavier Ducrohet
7ee26070ea Merge "Stopgap fix for layoutlib." into lmp-preview-dev 2014-05-29 05:27:32 +00:00
Jinsuk Kim
3a2f74373a Do not reply with <Feature Abort> to CEC Broadcast message 
Broadcast message is not targeted to a specific device but for
announcement. Individual reponse with <Feature Abort> is neither
necessary nor useful. Changed to send the message back only for
direct messages.

Change-Id: I927aa8e58a9868e158ed945c753492207e7c97f6
 2014-05-29 05:17:16 +00:00
Jinsuk Kim
c3923ea50d Dispatch incoming CEC messages to feature actions 
This CL dispatches incoming CEC messages to feature actions that
the service manages.

Change-Id: I9221d6a25648846327d00fe5404aaf1e8ec786ce
 2014-05-29 05:16:41 +00:00
Jungshik Jang
7d3c979135 Merge "Implement device discovery sequence." 2014-05-29 05:12:44 +00:00
Jungshik Jang
cc5ef8c918 Implement device discovery sequence. 
When device discover is launched it goes through the following step

1. clear all existing devices
2. send <Polling Message> of all logical addresses
  excecpt one of local device
3. Once got all allocated logical addresses, gather physical address of
  them
4. Once got physical address of them, gather display name of them
5. Once got display names, gather vendor id of them
5. Once got vendor id of them, register all gathered info to
  internal device info list.

Change-Id: Ic9aca3b15d88ac7650f10b6d0bfa9c97923975e8
 2014-05-29 14:04:53 +09:00
Wink Saville
52b4146273 am 9cd3ff7d: Merge "Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change." 
* commit '9cd3ff7d61ed65e8b815155747e7bbfc99c1e861':
  Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change.
 2014-05-29 04:57:25 +00:00
Wink Saville
9cd3ff7d61 Merge "Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change." 2014-05-29 04:53:52 +00:00
Brian Carlstrom
312da405eb Tracking ActionBarView change 1181f77bdfaa7bf8a8250cdd13c7b7a1d6ee0c44 
Change-Id: I29a486557428806f26f900974e74f42f3afa4ad4
 2014-05-28 21:43:35 -07:00
Zhang Wei-e7976c
fb61bfa447 Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change. 
Change-Id: Ibe9e68295661f2f2ffaca3057d696df6a1db3f0c
 2014-05-29 04:43:19 +00:00
Brian Carlstrom
8c9360f3aa Tracking IWindowManager change 2ea3814083f27567ae07a1b449da3d596dd4d9d5 
Change-Id: I6945cc9b4be174b55173ac2081edc5ee1bee6e67
 2014-05-28 21:37:52 -07:00
Robert Greenwalt
5acfa70a18 Fix build. 
Add Constant opt/telephony project was requiring.  I suspect there is a change
coming that will add this and perhaps more, but this fixes the build.

Change-Id: I8f994c0cf9ed37f14dc7ae9368da07fe8cd76aec
 2014-05-28 20:25:15 -07:00
Christopher Tate
2ddbbe7b94 Merge "Widget restore documentation tweaks" into lmp-preview-dev 2014-05-29 01:27:51 +00:00
Chris Craik
09daefbb9a am ec67c4b0: Merge "Make ViewPropertyAnimator correctly damage shadow receivers" into lmp-preview-dev 
* commit 'ec67c4b0ac8095c94c424a9fc37d7b11fa098ee9':
  Make ViewPropertyAnimator correctly damage shadow receivers
 2014-05-29 01:08:31 +00:00
Chris Craik
80d55ba8e2 am 9ecf9b12: Merge "Respect Z ordering in touch dispatch, software drawing" into lmp-preview-dev 
* commit '9ecf9b1292d547aebe4588f1051b22f9683e2149':
  Respect Z ordering in touch dispatch, software drawing
 2014-05-29 01:08:26 +00:00
John Spurlock
2fb434857f am 2eb28f87: Merge "QuickSettings: Bind notifications tile to the ringer stream." into lmp-preview-dev 
* commit '2eb28f870bf8c0da42f4d0cceafd17f4d36ca5a6':
  QuickSettings: Bind notifications tile to the ringer stream.
 2014-05-29 01:08:21 +00:00
Christopher Tate
c04e9aa916 Widget restore documentation tweaks 
- Fix broken Javadoc @see directives
- Linkify AppWidgetProvider in the documentation for the new
  ACTION_APPWIDGET_RESTORED broadcast
- Minor content edits

Bug 15022842

Change-Id: Ia7d4ad5be476c260492e1be5d83e21f6943a6847
 2014-05-28 17:56:53 -07:00
Jungshik Jang
bab6ee2fa9 Merge "Add cec message handler to hdmi cec jni implementation" 2014-05-29 00:45:17 +00:00
Zhijun He
d5a8d65b43 am 239ac054: Merge "Camera2: Update spec for thumbnail cropping behavior" into lmp-preview-dev 
* commit '239ac0541bf7e0fc8b301d077b40e3e52cf32161':
  Camera2: Update spec for thumbnail cropping behavior
 2014-05-29 00:42:32 +00:00
Christoph Studer
4b0ea74bb1 am b0d93fb2: Merge "SysUI: Switch to NotificationListenerService" into lmp-preview-dev 
* commit 'b0d93fb29480a77439b28effd34f5806a5a5ea8a':
  SysUI: Switch to NotificationListenerService
 2014-05-29 00:42:23 +00:00
Evan Charlton
68a2ff8174 am 15001a9a: (-s ours) Merge "@hide Telecomm APIs [DO NOT MERGE]" into lmp-preview-dev 
* commit '15001a9a4554c8e4c8a100af3cc84f468edfa60b':
  @hide Telecomm APIs [DO NOT MERGE]
 2014-05-29 00:42:17 +00:00
Eric Laurent
880383de83 am b073e598: (-s ours) Merge "DO NOT MERGE - AudioManager: audio routing extensions" into lmp-preview-dev 
* commit 'b073e59827cb141deeec70e056cd2aaabbbd1624':
  DO NOT MERGE - AudioManager: audio routing extensions
 2014-05-29 00:42:08 +00:00
Adam Cohen
c1011c1d26 Merge "Fix security issue in bindRemoteViewsService" 2014-05-29 00:27:30 +00:00
Selim Cinek
fb816fc701 Merge "Fixed a bug where the user was unable to pull down statusbar." into lmp-preview-dev 2014-05-29 00:20:33 +00:00
Dianne Hackborn
a923758d80 Merge "Add system layer for voice interaction services." into lmp-preview-dev 2014-05-29 00:18:25 +00:00
Dianne Hackborn
e30e02f5d9 Add system layer for voice interaction services. 
New window layer that voice interaction service windows
go in to.  Includes a new voice-specific content rectangle
that voice activities are placed in to.

Add specific animations for this layer, sliding down from
the top (though this can be customized by the voice interaction
service).

Also add the concept of activities running for voice interaction
services for purposes of adjusting the animation used for them,
again sliding from the top, but not (yet?) customizable by the
voice interaction service.

Change-Id: Ic9e0e8c843c2e2972d6abb4087dce0019326155d
 2014-05-28 17:16:51 -07:00
Selim Cinek
3c4635c199 Fixed a bug where the user was unable to pull down statusbar. 
When going to the phone or camera from the lockscreen, touches
where blocked and the statusbar could not be pulled down anymore.

Bug: 15308821
Bug: 15126905
Change-Id: Ic9563346f6a466cb5ada3f4af518fabcd650e9b9
 2014-05-29 02:12:47 +02:00
Deepanshu Gupta
dc62340f18 Stopgap fix for layoutlib. 
This is a temporary fix for changes made to TypedArray regrading theme
attributes.

Change-Id: I173fde6d8d3259479b0654ff331bc27bf2814fb0
 2014-05-28 16:52:01 -07:00
Christoph Studer
3326a8782f Merge "SysUI: Fix bug where ZEN notification icon was shown" into lmp-preview-dev 2014-05-28 23:40:02 +00:00
Christopher Tate
56f2daab14 Merge "Don't crash on boot" into lmp-preview-dev 2014-05-28 23:37:30 +00:00
Christopher Tate
f889ed11d2 Don't crash on boot 
...when removing dangling preferred-activity entries.

Bug 15310848

Change-Id: Ibe9d82a06f8c608b866a2c3c6b286da2ededacca
 2014-05-28 16:31:58 -07:00