Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
126,181 Commits 3 Branches 0 Tags
913487ceca69ef785fc2d78ee09389deca1dde54
Commit Graph

126181 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
George Mount
913487ceca Allow opaque windows to become translucent. 
Bug 13624779

Change-Id: I0c4885f227751edf96091d852c4bd3a729f1f5a7
 2014-03-24 13:44:33 -07:00
Unsuk Jung
1d22bd1986 am 8ae2ce76: am 7bde0fc7: am 2270ac96: am 8114c3d0: am 1a70f391: Merge "Change wallpaper sizing" into klp-dev 
* commit '8ae2ce76e3d44f9b25f8121c693a1e21fef3bbe0':
  Change wallpaper sizing
 2014-03-24 17:34:22 +00:00
Will Haldean Brown
bdb78d8261 am ede2a729: am ccd55a92: am f8c78b50: Update current.txt to include windowSwipeToDismiss 
* commit 'ede2a729c394461e5b3ea674e4762e7e6feed81d':
  Update current.txt to include windowSwipeToDismiss
 2014-03-24 17:34:18 +00:00
Alex Klyubin
f96bfe86a6 am 7ae93b1d: am 92ec0a0c: am d8c32164: am 88517170: Merge "Adjust to the change in the private SSLParameterImpl API." 
* commit '7ae93b1d0cd1eb43b5fc8248dfc2703608a461f3':
  Adjust to the change in the private SSLParameterImpl API.
 2014-03-24 17:34:11 +00:00
Jeff Sharkey
6640f6be41 am b8846c81: am cf0c4a59: am 4868da52: am c620ec36: am 3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev 
* commit 'b8846c819e43535250b004dde593892fa305b7e7':
  Lock down MANAGE_DOCUMENTS permission.
 2014-03-24 17:34:02 +00:00
Will Haldean Brown
0289331500 am d3e33cc2: am aa0fa8eb: am cedbfad4: Fix link in documentation for SWIPE_TO_DISMISS. 
* commit 'd3e33cc25d638cced9c17822db21e6c32e00f461':
  Fix link in documentation for SWIPE_TO_DISMISS.
 2014-03-24 17:33:58 +00:00
Will Haldean Brown
125f2155be am e3d4f6c1: (-s ours) am 8f2c3252: am 496e8178: Merge "Make windowSwipeToDismiss a public attribute." into klp-modular-dev 
* commit 'e3d4f6c19bb21dd20d95446def9a8872ecab2721':
  Make windowSwipeToDismiss a public attribute.
 2014-03-24 17:33:55 +00:00
Will Haldean Brown
70d78bbeec Make windowSwipeToDismiss a public attribute. 
resolved conflicts for merge of e3d4f6c1 to master

Bug: 13348970
Change-Id: I695139376fc7f38b3438ab38659ca15490ce8f7c
 2014-03-24 10:22:38 -07:00
George Mount
fea8d95664 Merge "Fix null ActivityOptions when starting an Activity in a new Process." 2014-03-24 16:47:09 +00:00
George Mount
07e1b9002a Merge "Fix problem on Animator with a start delay." 2014-03-24 16:46:59 +00:00
Przemyslaw Szczepaniak
7638b1f3b5 Merge "Do not reset language in case of the TTS service reconnect." 2014-03-24 10:08:37 +00:00
Mathew Inwood
a73b0c54b3 Merge "Fix log spam from View.toString()." 2014-03-24 09:46:24 +00:00
Craig Mautner
296f1a9130 Merge "Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks."" 2014-03-23 01:20:42 +00:00
Craig Mautner
9cf34e2ee4 Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks." 
This reverts commit f7ad855718.

After careful consideration this would prove to be a security leak to leave it in. Tasks could deliberately launch dialog activities that don't want to be seen in an unsecure setting. These would then be visible over the task background.

Change-Id: Ia7e984bc9616573af6c7772f6ea0f2dd588bb85d
 2014-03-23 00:10:33 +00:00
Craig Mautner
61ada5d330 Merge "Add Activity methods for icons and labels." 2014-03-22 23:44:37 +00:00
Craig Mautner
2fbd754180 Add Activity methods for icons and labels. 
New Activity methods setRecentsLabel(CharSequence) and
setRecentsIcon(Bitmap) have been added. The topmost
activity with either of these set will be returned in
RecentTaskInfo members activityLabel and activityIcon.

Fixes bug 13562992.

Change-Id: Ic15d1d27b733b892a2a940063b105ac48f1ffee5
 2014-03-22 16:39:33 -07:00
John Spurlock
9ae0c8ffba Merge "Add notification category for recommendations." 2014-03-22 01:35:46 +00:00
John Spurlock
0a69c8c4bd Add notification category for recommendations. 
Change-Id: I3718b8273c3f901aee1b2c2cdc4fcdae25fadcad
 2014-03-21 21:33:37 -04:00
Dianne Hackborn
e9c9c44134 Merge "Battery stats: track actually running time" 2014-03-22 00:26:19 +00:00
Christopher Tate
18a65ad09d Merge "Cap the size of app-defined permission trees" 2014-03-21 23:32:59 +00:00
George Mount
2c92c9700c Fix null ActivityOptions when starting an Activity in a new Process. 
Bug 13563265

Change-Id: Ie56cd6d55f13dbf68bafb82ab4bd6b27fde60df6
 2014-03-21 16:25:08 -07:00
Dianne Hackborn
a1bd79268b Battery stats: track actually running time 
Use the uptime while creating the battery stats history to
generate a new event indicating when the CPU is actually running.
We can do this in combination with the new event reporting when
the CPU comes awake, looking at the difference between the
uptime and elapsed time at that point to determine when it last
when to sleep.

Also use this information to generate a new set of aggregated
states, the uptime caused by each wake reason.

Finally use new radio down timestamp to adjust the times we
compute for radio use.  Note that this information is not (yet)
being used to adjust how these are recorded in the history.

Change-Id: I723b3b526c8e7d64de0cac9d1193e04132d5a3e4
 2014-03-21 16:14:59 -07:00
George Mount
2ed16ac623 Fix problem on Animator with a start delay. 
Bug 13589060

Change-Id: I05b9421fa141466bdbfe19f1bd5d993fa23982cb
 2014-03-21 16:13:37 -07:00
Winson Chung
e9c77aee60 Merge "Fixing crash with multiple touch pointers" 2014-03-21 23:03:16 +00:00
Winson Chung
4c71aefcbd Fixing crash with multiple touch pointers 
- Adding support for force-reloading certain thumbnails (in prep for fix to Bug. 13587139)
- Use withLayer and withEndAction on ViewPropertyAnimator animations
- Ensuring that we close the notifications panel when we toggle recents

Change-Id: Ied2d841de42046fcb09fffb615156b07b4a67136
 2014-03-21 16:00:18 -07:00
Christopher Tate
c55f9c0442 Cap the size of app-defined permission trees 
Bug 13529742

Change-Id: I46c2ebc39caf4a9eacbffbb35fc386c2a1cedc12
 2014-03-21 15:16:14 -07:00
Matthew Williams
cde7086b90 Merge "Downgrade expedited to normal on reschedule." 2014-03-21 21:59:07 +00:00
Paul Lawrence
717e0f5db7 Merge "Don't prompt at boot if we already did that when decrypting" 2014-03-21 20:40:46 +00:00
Jinsuk Kim
a7efb93c1b am a10958f1: am cfba284a: am d73e66cc: Fix broken build 
* commit 'a10958f1c386851dc69a5dae2c32b899b9f29277':
  Fix broken build
 2014-03-21 20:23:45 +00:00
Colin Cross
8a60ded026 Merge "resolved conflicts for merge of a67e34c8 to master" 2014-03-21 20:19:54 +00:00
Colin Cross
a42cb8b0e2 resolved conflicts for merge of a67e34c8 to master 
Change-Id: I597525886260884c9b2dfc7945e01eb8138a58c2
 2014-03-21 13:11:02 -07:00
Bo Liu
caf947737d Merge "Convert a attach/detach functor in ViewRootImpl to x64" 2014-03-21 20:00:35 +00:00
Adam Cohen
fb40d78c57 Merge "Catch exceptions if Exif is malformed" 2014-03-21 19:55:54 +00:00
Adam Cohen
146af201d3 Merge "Catching security exception when activity destroyed" 2014-03-21 19:54:55 +00:00
John Spurlock
3daafcd7ba Merge "Annotate framework vibrate calls with stream hints." 2014-03-21 19:51:44 +00:00
Selim Cinek
a4c1ccf3e0 Merge "Disable Set Wallpaper button while loading image" 2014-03-21 19:39:38 +00:00
Selim Cinek
5ab7d37d90 Catch exceptions if Exif is malformed 
Bug: 11650650
Change-Id: Ie1680220fdb235a166a0eaa0a2309729f861865c
 2014-03-21 20:32:34 +01:00
Selim Cinek
d6901a95d8 Catching security exception when activity destroyed 
Fixed a bug where an asynctask tried to load an image
even after the activity was destroyed leading to a
security exception since the permission could not be granted anymore.

Bug: 12760267
Change-Id: Ieffb10b1007f349371647512ffe4fe72433344e7
 2014-03-21 20:24:55 +01:00
Craig Mautner
f7ad855718 Apply FLAG_SHOW_WHEN_LOCKED within tasks. 
If the bottommost fullscreen window of a task has FLAG_SHOW_WHEN_LOCKED
set then show all windows of the task that are above that window.

Fixes bug 13558398.

Change-Id: Ied8ada54efbb079eaf375470b2eae749e5551c24
 2014-03-21 12:24:07 -07:00
Unsuk Jung
8ae2ce76e3 am 7bde0fc7: am 2270ac96: am 8114c3d0: am 1a70f391: Merge "Change wallpaper sizing" into klp-dev 
* commit '7bde0fc751192fd70f6e42ddffe7f1513fc67b71':
  Change wallpaper sizing
 2014-03-21 19:23:46 +00:00
Unsuk Jung
7bde0fc751 am 2270ac96: am 8114c3d0: am 1a70f391: Merge "Change wallpaper sizing" into klp-dev 
* commit '2270ac96d5d8ab6c2d1601f8dd5d8409762fb35f':
  Change wallpaper sizing
 2014-03-21 19:17:01 +00:00
Unsuk Jung
2270ac96d5 am 8114c3d0: am 1a70f391: Merge "Change wallpaper sizing" into klp-dev 
* commit '8114c3d02d6bf72c0627aea6ecf738074ac3f232':
  Change wallpaper sizing
 2014-03-21 19:11:01 +00:00
Chris Wren
386fff993a Merge "lower the heads up threshold to exactly PRIORITY_HIGH" 2014-03-21 19:10:50 +00:00
Will Haldean Brown
ede2a729c3 am ccd55a92: am f8c78b50: Update current.txt to include windowSwipeToDismiss 
* commit 'ccd55a924a51e5ad7a503b3bde4b3038152217e4':
  Update current.txt to include windowSwipeToDismiss
 2014-03-21 19:08:57 +00:00
Chris Wren
5d9b153db3 lower the heads up threshold to exactly PRIORITY_HIGH 
Bug: 13452562
Change-Id: I945ce22fa7253ff84fcc3d72f4cb732921ba3489
 2014-03-21 15:08:42 -04:00
Bo Liu
845535a76d Convert a attach/detach functor in ViewRootImpl to x64 
Change-Id: I93c1df8abd0ecd1686e392cada099f9864926d33
 2014-03-21 12:06:23 -07:00
Unsuk Jung
8114c3d02d am 1a70f391: Merge "Change wallpaper sizing" into klp-dev 
* commit '1a70f391608e82fcc5550c76ccc7bf8bac5bbc10':
  Change wallpaper sizing
 2014-03-21 19:05:40 +00:00
Will Haldean Brown
ccd55a924a am f8c78b50: Update current.txt to include windowSwipeToDismiss 
* commit 'f8c78b50fc9f6c81c7ad5d76c81445653dcf3cd9':
  Update current.txt to include windowSwipeToDismiss
 2014-03-21 19:02:16 +00:00
Unsuk Jung
1a70f39160 Merge "Change wallpaper sizing" into klp-dev 2014-03-21 19:01:08 +00:00
Alex Klyubin
7ae93b1d0c am 92ec0a0c: am d8c32164: am 88517170: Merge "Adjust to the change in the private SSLParameterImpl API." 
* commit '92ec0a0c7a568a77696964c16f4e44292c633ef1':
  Adjust to the change in the private SSLParameterImpl API.
 2014-03-21 18:53:20 +00:00