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

150628 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
fa09657c09 am 2beddd4d: Merge "Ensuring that the ActivityInfo cache accounts for the task\'s user id. (Bug 17314317)" into lmp-dev 
* commit '2beddd4d78f6028b4b32058bd48c1d7f5955e09f':
  Ensuring that the ActivityInfo cache accounts for the task's user id. (Bug 17314317)
 2014-08-28 21:42:05 +00:00
Alan Viverette
9d139d2d8a am dceb15b2: Merge "Update action bar item widths, overflow menu, button, and spinner styles" into lmp-dev 
* commit 'dceb15b22ea3d229f29aec762b58c6ce06c4eca9':
  Update action bar item widths, overflow menu, button, and spinner styles
 2014-08-28 21:16:48 +00:00
Shaohan Zou
209dcc68f0 am 77bc1cef: Merge "Add Media Player Streaming Tests" into lmp-dev 
* commit '77bc1cefe5af85da8ef9e7f8fd9248b1ee335345':
  Add Media Player Streaming Tests
 2014-08-28 21:16:44 +00:00
Winson Chung
bb6c033351 Merge "Ensuring that the ActivityInfo cache accounts for the task's user id. (Bug 17314317)" into lmp-dev 2014-08-28 21:14:22 +00:00
Alan Viverette
b1b267114c Merge "Update action bar item widths, overflow menu, button, and spinner styles" into lmp-dev 2014-08-28 21:05:04 +00:00
Christopher Tate
aa53436928 am 2c85f54f: Merge "Correct misleading javadoc for BackupHelper" into lmp-dev 
* commit '2c85f54ff783957f889aa67ea9cd0e4a6d611ae9':
  Correct misleading javadoc for BackupHelper
 2014-08-28 21:03:24 +00:00
Chris Craik
7f2de62043 am 7732c066: Merge "Force translucency for inset windows" into lmp-dev 
* commit '7732c066f33c270ac48fdd5b1fb9438fb7260e82':
  Force translucency for inset windows
 2014-08-28 21:03:20 +00:00
Shaohan Zou
18b80d2a0d Merge "Add Media Player Streaming Tests" into lmp-dev 2014-08-28 21:00:33 +00:00
Kenny Guy
a734fc1ece Ensuring that the ActivityInfo cache accounts for the task's user id. (Bug 17314317) 
Change-Id: I10bcb60abe3450f2ecfb3ee305be505e13e0be3b
 2014-08-28 13:58:29 -07:00
Alan Viverette
f023c2530a Update action bar item widths, overflow menu, button, and spinner styles 
Manually modifies the overflow button hotspot bounds so that the ripple
appears to be centered on the overflow icon. Adds styleable and parsing
for list popup window offsets. Updates spinner text appearance to be
consistent with drop down item text appearance. Also updates horizontal
inner padding in buttons.

BUG: 17305079
BUG: 17304391
BUG: 17302567
Change-Id: Iafddfef290078de968894a3b443ba9f60f84c6d4
 2014-08-28 13:55:18 -07:00
Christopher Tate
a43e2409ad Merge "Correct misleading javadoc for BackupHelper" into lmp-dev 2014-08-28 20:53:36 +00:00
Chris Craik
12b500959d Merge "Force translucency for inset windows" into lmp-dev 2014-08-28 20:49:06 +00:00
John Spurlock
b581c097e6 am 6b7a237e: Merge "StatusBar: Allow roaming indicator even when also on wifi." into lmp-dev 
* commit '6b7a237ea55548689664c589b1bb5a205e7538a6':
  StatusBar: Allow roaming indicator even when also on wifi.
 2014-08-28 19:58:56 +00:00
Julia Reynolds
abe3347950 am d266bd44: Merge "Audio/Micrphone user restriction/multiuser updates." into lmp-dev 
* commit 'd266bd44dcf79b14584a3af223d78fe80c4d571a':
  Audio/Micrphone user restriction/multiuser updates.
 2014-08-28 19:46:08 +00:00
Dianne Hackborn
6dd49811ce am f63aa97c: Merge "Fix issue #17289876: startActivityFromRecents appears to launch the wrong task" into lmp-dev 
* commit 'f63aa97c6a7ed27ff99044a09562601d08fedd73':
  Fix issue #17289876: startActivityFromRecents appears to launch the wrong task
 2014-08-28 19:46:01 +00:00
John Spurlock
1a3febe711 Merge "StatusBar: Allow roaming indicator even when also on wifi." into lmp-dev 2014-08-28 19:45:53 +00:00
Julia Reynolds
a8528c6420 Merge "Audio/Micrphone user restriction/multiuser updates." into lmp-dev 2014-08-28 19:41:42 +00:00
John Spurlock
14339c9edc StatusBar: Allow roaming indicator even when also on wifi. 
Bug:14610152
Change-Id: Ia83abe0ae862ed747ee280c61c2fff3b62345b41
 2014-08-28 15:41:29 -04:00
Dianne Hackborn
2db754ac6e Merge "Fix issue #17289876: startActivityFromRecents appears to launch the wrong task" into lmp-dev 2014-08-28 19:33:08 +00:00
Winson Chung
c1520475cd am 62354353: Merge "Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)" into lmp-dev 
* commit '62354353bfee37bc6ea1316f8a521a68131c989c':
  Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)
 2014-08-28 19:26:29 +00:00
Winson Chung
8bd5d69008 Merge "Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)" into lmp-dev 2014-08-28 19:15:10 +00:00
Christoph Studer
e2ba46e989 am 6049c4b7: Merge "NoListener: Factor out ZEN mode API" into lmp-dev 
* commit '6049c4b7ee264585cb4f7720ea628e9c5d389b8d':
  NoListener: Factor out ZEN mode API
 2014-08-28 19:07:23 +00:00
Dianne Hackborn
3077ecee73 am c6273338: Merge "Fix issue #16953886: History and batterystats checkin summary..." into lmp-dev 
* commit 'c6273338e904b1b391757a4604325eea35784931':
  Fix issue #16953886: History and batterystats checkin summary...
 2014-08-28 19:07:19 +00:00
Christoph Studer
45c0d5838f Merge "NoListener: Factor out ZEN mode API" into lmp-dev 2014-08-28 18:59:41 +00:00
Dianne Hackborn
7e7f9a3f7c Merge "Fix issue #16953886: History and batterystats checkin summary..." into lmp-dev 2014-08-28 18:58:16 +00:00
Andrew Lee
14be2fd3ea am 3968fc0e: Merge "Add CallProperties class, and use to on ParcelableCall." into lmp-dev 
* commit '3968fc0e453b206fb94581c4b9b9e34b961d790f':
  Add CallProperties class, and use to on ParcelableCall.
 2014-08-28 18:53:44 +00:00
John Spurlock
764173c1fd am 682806ce: Merge "QS: Don\'t collapse the panel when turning location on." into lmp-dev 
* commit '682806ceafad1389ac78e3df7d39a48ca739af7d':
  QS: Don't collapse the panel when turning location on.
 2014-08-28 18:40:38 +00:00
Andrew Lee
81289efcae Merge "Add CallProperties class, and use to on ParcelableCall." into lmp-dev 2014-08-28 18:39:16 +00:00
Dianne Hackborn
d7c9289f93 Fix issue #17289876: startActivityFromRecents appears to launch the wrong task 
It would be good to actually bring the task to the front.

Also, make the flow when inTask is provided better match what happens when
we go looking for a task on our own.

And this includes another fix that was supposed to be part of a different
change but I forgot this class is part of the framework project now.

Change-Id: I3cf05f2e585c0fd7a0dbb7c7cf9fb1655764dd93
 2014-08-28 11:38:13 -07:00
John Spurlock
832d351ca5 Merge "QS: Don't collapse the panel when turning location on." into lmp-dev 2014-08-28 18:30:29 +00:00
John Spurlock
d21df6076f QS: Don't collapse the panel when turning location on. 
Bug:17127158
Change-Id: Ide92c2bd134a84dea796a62710a9016a679b0b74
 2014-08-28 14:25:05 -04:00
Alan Viverette
e454802769 am a5a9c6e0: Merge "Rename StatusBar.Material styles to Material.Notification" into lmp-dev 
* commit 'a5a9c6e03b11d502c0b1e845611aad0171e51d9f':
  Rename StatusBar.Material styles to Material.Notification
 2014-08-28 18:15:55 +00:00
George Mount
0a0740b9f9 am 077805bf: Merge "Call SharedElementListener#setSharedElementEnd on back." into lmp-dev 
* commit '077805bfb0efe05654d136a2f3986f9f6e5b83ec':
  Call SharedElementListener#setSharedElementEnd on back.
 2014-08-28 18:15:51 +00:00
George Mount
9d039f7f8e am b0333ac9: Merge "Allow arbitrarily-added shared elements." into lmp-dev 
* commit 'b0333ac93c012fc389c3e66b3d6ce3e89f2db022':
  Allow arbitrarily-added shared elements.
 2014-08-28 18:15:46 +00:00
Alan Viverette
b712458362 Merge "Rename StatusBar.Material styles to Material.Notification" into lmp-dev 2014-08-28 18:13:21 +00:00
George Mount
de18420aff Merge "Call SharedElementListener#setSharedElementEnd on back." into lmp-dev 2014-08-28 18:05:40 +00:00
George Mount
01abcaa295 Merge "Allow arbitrarily-added shared elements." into lmp-dev 2014-08-28 18:02:27 +00:00
Nancy Chen
9a966397b9 am 2ead90e0: Merge "Add field for sub_id in call log for sprout database." into lmp-dev 
* commit '2ead90e02a70771d063e58b6ff42500327ddcd28':
  Add field for sub_id in call log for sprout database.
 2014-08-28 18:02:16 +00:00
Jose Lima
3a1c665a0e am 61c45885: Merge "Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()" into lmp-dev 
* commit '61c45885bf335e32cc3509fd79762f72c7a46935':
  Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()
 2014-08-28 18:02:00 +00:00
Nancy Chen
d1a5a46368 Merge "Add field for sub_id in call log for sprout database." into lmp-dev 2014-08-28 17:55:50 +00:00
Jose Lima
d3458a9c34 Merge "Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()" into lmp-dev 2014-08-28 17:49:32 +00:00
Yigit Boyar
7167c1f763 am 129ca22e: Merge "Use a weak observable in AutoCompleteTextView" into lmp-dev 
* commit '129ca22eb526fa875465e06ed0ee39cee0065e51':
  Use a weak observable in AutoCompleteTextView
 2014-08-28 17:44:48 +00:00
Andrew Lee
223ad1455a Add CallProperties class, and use to on ParcelableCall. 
Bug: 17304243
Change-Id: I3ef6862391a9b96c70f4b12412160116e094ed34
 2014-08-28 10:42:01 -07:00
Chris Craik
383d157175 am 19b7a03f: Merge "Update transform isolation to handle command chunks" into lmp-dev 
* commit '19b7a03fa697c8b0b850666ab7a2831ec8eac743':
  Update transform isolation to handle command chunks
 2014-08-28 17:34:34 +00:00
Yigit Boyar
3e92d2ec47 Merge "Use a weak observable in AutoCompleteTextView" into lmp-dev 2014-08-28 17:33:36 +00:00
Christoph Studer
85a384b425 NoListener: Factor out ZEN mode API 
Bug: 17255109
Bug: 17295014
Change-Id: I7e1f6e29b8a23b8e59a8615a8012a86bd5dd22d7
 2014-08-28 19:28:12 +02:00
Chris Craik
bf939b2671 Merge "Update transform isolation to handle command chunks" into lmp-dev 2014-08-28 17:27:24 +00:00
John Reck
4d46ce77e6 am f29b2624: Merge "Fix log line" into lmp-dev 
* commit 'f29b2624f648cde1de186cd6685c4ce67bcb0d53':
  Fix log line
 2014-08-28 17:26:05 +00:00
Winson Chung
48a10a56e9 Change API to return thumbnail size instead of individual dimensions. (Bug 17295512) 
- Fixing issue where we were pulling the thumbnail dimensions too early in AMS. (Bug 17286904)
- Simplifying the Recents code between start & configuration change

Change-Id: I6d667cbf37b844939e5fc466da613bb78ca05082
 2014-08-28 10:23:40 -07:00
John Reck
86469f5962 Merge "Fix log line" into lmp-dev 2014-08-28 17:13:24 +00:00