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

128589 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
d8f1b22e26 am f114a5c4: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" 
* commit 'f114a5c4d123af574dbae89befc3be61a01d1382':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
 2014-03-24 13:57:47 -07:00
Craig Mautner
f114a5c4d1 Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" 2014-03-24 20:52:14 +00:00
Dianne Hackborn
5ead8196fd am 43111e89: Merge "Battery stats: wake locks, radio active, cleanup." 
* commit '43111e897be9f79ababb0ecf99f155695416d956':
  Battery stats: wake locks, radio active, cleanup.
 2014-03-24 13:46:08 -07:00
Dianne Hackborn
43111e897b Merge "Battery stats: wake locks, radio active, cleanup." 2014-03-24 20:42:31 +00:00
Dianne Hackborn
4590e52f3d Battery stats: wake locks, radio active, cleanup. 
- Improve wake lock work source updates to also update the current
  history tag, in case the new work source gets recorded in the
  history.

- Fix bug in recording radio active time that was not distributing
  any time to apps.

- No longer hold a wake lock while dispatching data conn active call,
  since it comes with its own timestamp.

- Fix issue where the top app was not being cleared while the screen
  was off.

- Remove obsolete STATS_LAST stats type.

- Fix bug that was not clearing the total run time when resetting
  the stats.

Change-Id: Iabe17a9edf34f762374ae09fcffb8a819cf72e30
 2014-03-24 13:36:46 -07:00
Will Haldean Brown
144de5a5da am 48a5dbd3: Update current.txt for offset attributes. 
* commit '48a5dbd3cc5dd8a919983455757dc4c7b82500ab':
  Update current.txt for offset attributes.
 2014-03-24 13:31:08 -07:00
Will Haldean Brown
48a5dbd3cc Update current.txt for offset attributes. 
Change-Id: I0f88a6f327edfc207c081e424e3c97edd1451c90
 2014-03-24 13:23:42 -07:00
quddusc
add5c55c5f am 370cd467: am 87eac093: am 5771d425: am 5b2e92e3: am 529d47ac: am e9863dbe: Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs 
* commit '370cd4677b8ee6c8b97291b02fb0c28fd275965e':
  docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.
 2014-03-24 12:45:14 -07:00
quddusc
be16cef837 am 0d828311: am ce6307d3: am 3ee70ca4: am 9c1eaeb0: am ff2599f9: am 0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs 
* commit '0d828311ba0bc40245bc5a20a15258d8621f0245':
  docs: Added Javadoc for Gcore Jarlsberg release.
 2014-03-24 12:45:10 -07:00
Selim Cinek
2810daa220 am 4c01eccb: am 38fc02d4: am d9e5761a: am 04ea3ca0: am 50ac19e9: am ba126c09: Disable Set Wallpaper button while loading image 
* commit '4c01eccb0c06fb83532cad00cbf9a4b47b6dc1f8':
  Disable Set Wallpaper button while loading image
 2014-03-24 12:45:07 -07:00
Chad Brubaker
7e14cba064 am 87f738d2: am 51e93804: am 05e4dc96: am 850eb678: am eb3c0d9a: am 1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev 
* commit '87f738d2787444854cd15695b599b84b25027167':
  Fix support for simultaneous VPN tuns
 2014-03-24 12:45:04 -07:00
Chad Brubaker
7a30a143d2 am ff3bb2fe: am 7f623d6b: am 9506e84b: am c7726147: am 1fce89d9: am de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev 
* commit 'ff3bb2fe95a7d0158f5a456368eb7fa91069bc23':
  Include the interface for clearDnsInterfaceForUidRange
 2014-03-24 12:45:01 -07:00
Ricardo Cervera
9b1b01c1e4 am b7fe3363: am 1575e1a1: (-s ours) am 419b17ec: am 1d77a874: am 588300cb: am 2e929658: Merge "docs: Added new sensor types. Bug: 10674725" into klp-docs 
* commit 'b7fe33633b49924c35751d4e5796f8add4ad623c':
  docs: Added new sensor types. Bug: 10674725
 2014-03-24 12:44:58 -07:00
quddusc
370cd4677b am 87eac093: am 5771d425: am 5b2e92e3: am 529d47ac: am e9863dbe: Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs 
* commit '87eac09358a49473549fa30e4acbf93c66b8915e':
  docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.
 2014-03-24 19:36:50 +00:00
quddusc
0d828311ba am ce6307d3: am 3ee70ca4: am 9c1eaeb0: am ff2599f9: am 0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs 
* commit 'ce6307d3c84ebf200e35cabf70cf49712ac14e04':
  docs: Added Javadoc for Gcore Jarlsberg release.
 2014-03-24 19:36:45 +00:00
Selim Cinek
4c01eccb0c am 38fc02d4: am d9e5761a: am 04ea3ca0: am 50ac19e9: am ba126c09: Disable Set Wallpaper button while loading image 
* commit '38fc02d4efa9e943ab38306d466c5fe2786f1bb7':
  Disable Set Wallpaper button while loading image
 2014-03-24 19:36:14 +00:00
Chad Brubaker
87f738d278 am 51e93804: am 05e4dc96: am 850eb678: am eb3c0d9a: am 1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev 
* commit '51e938041e72f29c4e776a8627ea9d8a70d62728':
  Fix support for simultaneous VPN tuns
 2014-03-24 19:35:25 +00:00
Chad Brubaker
ff3bb2fe95 am 7f623d6b: am 9506e84b: am c7726147: am 1fce89d9: am de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev 
* commit '7f623d6b9459bc982c49f0a74aa2c9911f8e1dd8':
  Include the interface for clearDnsInterfaceForUidRange
 2014-03-24 19:35:20 +00:00
Ricardo Cervera
b7fe33633b am 1575e1a1: (-s ours) am 419b17ec: am 1d77a874: am 588300cb: am 2e929658: Merge "docs: Added new sensor types. Bug: 10674725" into klp-docs 
* commit '1575e1a1f5c6a0e1d870af88cba8d54023dfbcab':
  docs: Added new sensor types. Bug: 10674725
 2014-03-24 19:35:11 +00:00
Chris Wren
5a340a406c am 8ed3b587: Merge "add more dump info for heads up notifications" 
* commit '8ed3b587f00ccb1b4264d2ee3590af32464428c9':
  add more dump info for heads up notifications
 2014-03-24 12:00:43 -07:00
Chris Wren
8ed3b587f0 Merge "add more dump info for heads up notifications" 2014-03-24 18:57:06 +00:00
John Reck
962cd213cf am 1e1f4d70: am 02e99e27: am ae316643: am aff40e25: am fc603ca6: am abf701e6: Merge "Eliminate mHasAlpha" into klp-dev 
* commit '1e1f4d705edaad3700b49c730bc8a22c522cb46b':
  Eliminate mHasAlpha
 2014-03-24 11:48:42 -07:00
John Reck
1e1f4d705e am 02e99e27: am ae316643: am aff40e25: am fc603ca6: am abf701e6: Merge "Eliminate mHasAlpha" into klp-dev 
* commit '02e99e272dbfedf5d9ba1ae91fa2b83cab5b3d07':
  Eliminate mHasAlpha
 2014-03-24 18:44:01 +00:00
Dianne Hackborn
e2f970a239 am 48600b95: Merge "Fix issue #13564072: Back button no longer dismisses IME after voice usage" 
* commit '48600b95cad8d49772ca5634a317b893d2346f42':
  Fix issue #13564072: Back button no longer dismisses IME after voice usage
 2014-03-24 11:43:17 -07:00
Dianne Hackborn
35d6ab9289 am 7d867342: Merge "Get rid of not specifying a user errors in bluetooth." 
* commit '7d86734297bf6c2f71404498567cc92576591b8c':
  Get rid of not specifying a user errors in bluetooth.
 2014-03-24 11:43:14 -07:00
Dianne Hackborn
48600b95ca Merge "Fix issue #13564072: Back button no longer dismisses IME after voice usage" 2014-03-24 18:37:51 +00:00
Dianne Hackborn
7d86734297 Merge "Get rid of not specifying a user errors in bluetooth." 2014-03-24 18:37:19 +00:00
Yorke Lee
730793bb19 Merge "Add gateway support to frameworks/base/telecomm" into master-nova 2014-03-24 18:35:57 +00:00
Dianne Hackborn
6b6b3fdbf5 Fix issue #13564072: Back button no longer dismisses IME after voice usage 
Calling identity wasn't being cleared in an incoming code path.

Change-Id: Ib32060a91bf81531de049fafde69835b5382a25f
 2014-03-24 11:28:27 -07:00
Unsuk Jung
bf6ffef5bc am 1d22bd19: am 8ae2ce76: am 7bde0fc7: am 2270ac96: am 8114c3d0: am 1a70f391: Merge "Change wallpaper sizing" into klp-dev 
* commit '1d22bd1986ced3c5396dea83d2d04f84457953ee':
  Change wallpaper sizing
 2014-03-24 10:39:02 -07:00
Will Haldean Brown
b51f5112fb am bdb78d82: am ede2a729: am ccd55a92: am f8c78b50: Update current.txt to include windowSwipeToDismiss 
* commit 'bdb78d8261c61e8b1c30af7ff2a39cc91026aa02':
  Update current.txt to include windowSwipeToDismiss
 2014-03-24 10:38:54 -07:00
Alex Klyubin
092876b3fa am f96bfe86: am 7ae93b1d: am 92ec0a0c: am d8c32164: am 88517170: Merge "Adjust to the change in the private SSLParameterImpl API." 
* commit 'f96bfe86a68bfd0491a76cf6dfa515dc58f027bb':
  Adjust to the change in the private SSLParameterImpl API.
 2014-03-24 10:38:51 -07:00
Jeff Sharkey
f60e41f103 am 6640f6be: am b8846c81: am cf0c4a59: am 4868da52: am c620ec36: am 3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev 
* commit '6640f6be412e7454bfa7d457670e83aba46ea28c':
  Lock down MANAGE_DOCUMENTS permission.
 2014-03-24 10:38:48 -07:00
Will Haldean Brown
25e062a232 am 02893315: am d3e33cc2: am aa0fa8eb: am cedbfad4: Fix link in documentation for SWIPE_TO_DISMISS. 
* commit '0289331500457837f8ec20eea42f7bbbc2c3f479':
  Fix link in documentation for SWIPE_TO_DISMISS.
 2014-03-24 10:38:45 -07:00
Will Haldean Brown
56ff23af6b am 125f2155: am e3d4f6c1: (-s ours) am 8f2c3252: am 496e8178: Merge "Make windowSwipeToDismiss a public attribute." into klp-modular-dev 
* commit '125f2155bedf37841d7c9a9b59fb2680e41cfcef':
  Make windowSwipeToDismiss a public attribute.
 2014-03-24 10:38:42 -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
92c154594b am 70d78bbe: Make windowSwipeToDismiss a public attribute. 
* commit '70d78bbeecc491ebb0a30ee650d2445145992514':
  Make windowSwipeToDismiss a public attribute.
 2014-03-24 10:29:01 -07: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
02c40fdab7 am fea8d956: Merge "Fix null ActivityOptions when starting an Activity in a new Process." 
* commit 'fea8d956649589f1cfd378571cc9ad61a92cd480':
  Fix null ActivityOptions when starting an Activity in a new Process.
 2014-03-24 09:51:55 -07:00
George Mount
8fc8b5707c am 07e1b900: Merge "Fix problem on Animator with a start delay." 
* commit '07e1b9002a51032a7dc782178d3c29d3417ab266':
  Fix problem on Animator with a start delay.
 2014-03-24 09:51:52 -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
ea8aa10d63 am 7638b1f3: Merge "Do not reset language in case of the TTS service reconnect." 
* commit '7638b1f3b56d8176e401a4067b18749682635f0c':
  Do not reset language in case of the TTS service reconnect.
 2014-03-24 05:28:44 -07:00
Mathew Inwood
2fd1031460 am a73b0c54: Merge "Fix log spam from View.toString()." 
* commit 'a73b0c54b3f8c00028ff9b39aa1e0f5556d7c6f2':
  Fix log spam from View.toString().
 2014-03-24 05:28:40 -07:00
Przemyslaw Szczepaniak
7638b1f3b5 Merge "Do not reset language in case of the TTS service reconnect." 2014-03-24 10:08:37 +00:00