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

126268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
bfb07a0377 Move where updateProperties is called 
Change-Id: I27da448996019094c44487ce28c5689d098d6535
 2014-03-24 21:00:18 -07:00
Jose Lima
41c2d2cec3 Merge "resolved conflicts for merge of 6c45157c to master" 2014-03-24 22:35:08 +00:00
John Reck
2ddf5166ea Merge "Add stagingProperties" 2014-03-24 22:34:47 +00:00
Jose Lima
e911813840 resolved conflicts for merge of 6c45157c to master 
Change-Id: I95d7f927f4321405318b44a21172b99f3f16e00a
 2014-03-24 15:33:25 -07:00
John Reck
d0a0b2a314 Add stagingProperties 
Change-Id: Ic7de551f8843fd70a77f738e33028e25c020bb3c
 2014-03-24 15:31:34 -07:00
Ricardo Cervera
ae5d7d5d61 docs: Added new sensor types. Bug: 10674725 
Original SHA-1: Ib378e3a1b3f1812b966c53a0eda6319f1bea464b

Original Conflicts:
	docs/html/guide/topics/sensors/sensors_motion.jd

Change-Id: I8f8632410b2756174ea4dfab8d58486e58cd8db2
 2014-03-24 15:24:43 -07:00
Dianne Hackborn
852472d9aa Fix build. 
Change-Id: I1dd79e932a551bd537d2c71e8fca29a299c9312f
 2014-03-24 14:53:39 -07:00
Mark Renouf
de02cdc1e9 am 7390d4ab: am 3796594c: am a63cd9f4: Merge "Run finalizers before counting for StrictMode." into klp-modular-dev 
* commit '7390d4ab8d12d5ffa5d28341096f4425247204a0':
  Run finalizers before counting for StrictMode.
 2014-03-24 21:25:41 +00:00
Craig Mautner
452fd49369 am 5332706b: am b98ee1eb: am 103ed355: am 557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown." 
* commit '5332706b87c8772b97198e30c7cb4cc4ef3b577f':
  Set ScreenshotSurface secure if any secure content is shown.
 2014-03-24 21:25:37 +00:00
Jinsuk Kim
1c855178e4 am 775a097f: am 3c34e5db: am c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev 
* commit '775a097f01a349548d2124ae9d7dd562c72eaa27':
  Add HdmiCecManager
 2014-03-24 21:25:21 +00:00
Chris Craik
76c30ce3c1 Merge "Rework Outline API, remove isolatedZVolume remnants" 2014-03-24 21:22:36 +00:00
Craig Mautner
f114a5c4d1 Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" 2014-03-24 20:52:14 +00: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
48a5dbd3cc Update current.txt for offset attributes. 
Change-Id: I0f88a6f327edfc207c081e424e3c97edd1451c90
 2014-03-24 13:23:42 -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
8ed3b587f0 Merge "add more dump info for heads up notifications" 2014-03-24 18:57:06 +00: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
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
Chris Craik
b49f446c98 Rework Outline API, remove isolatedZVolume remnants 
Change-Id: I30c2fe832dcb98fa6329b1a595b3d3aafbdcad6b
 2014-03-24 11:37:06 -07: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
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
Jose Lima
6c45157caa am d13d7016: am eb2c85df: Merge "Added isGame application tag to the manifest" into klp-modular-dev 
* commit 'd13d701681220cdcb61b5a62669e88bb77d156aa':
  Added isGame application tag to the manifest
 2014-03-24 15:59:36 +00:00
Jose Lima
d13d701681 am eb2c85df: Merge "Added isGame application tag to the manifest" into klp-modular-dev 
* commit 'eb2c85df4b2d8ea5dd3cd08cb0367d5ff666afe6':
  Added isGame application tag to the manifest
 2014-03-24 15:53:24 +00:00
Jose Lima
eb2c85df4b Merge "Added isGame application tag to the manifest" into klp-modular-dev 2014-03-24 15:49:18 +00:00
Mark Renouf
7390d4ab8d am 3796594c: am a63cd9f4: Merge "Run finalizers before counting for StrictMode." into klp-modular-dev 
* commit '3796594cd76238c46dd79a990ae1797f197dea85':
  Run finalizers before counting for StrictMode.
 2014-03-24 15:33:12 +00:00
Mark Renouf
3796594cd7 am a63cd9f4: Merge "Run finalizers before counting for StrictMode." into klp-modular-dev 
* commit 'a63cd9f424d70a3f8ca059aa8f76b28be1f9fa07':
  Run finalizers before counting for StrictMode.
 2014-03-24 15:27:45 +00:00
Mark Renouf
a63cd9f424 Merge "Run finalizers before counting for StrictMode." into klp-modular-dev 2014-03-24 15:22:55 +00:00
Craig Mautner
5332706b87 am b98ee1eb: am 103ed355: am 557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown." 
* commit 'b98ee1eb50389520fd06255fd38b233c7adf5814':
  Set ScreenshotSurface secure if any secure content is shown.
 2014-03-24 14:44:17 +00:00
Craig Mautner
b98ee1eb50 am 103ed355: am 557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown." 
* commit '103ed3558764f1fd41c9a5399e2030baa4110bfb':
  Set ScreenshotSurface secure if any secure content is shown.
 2014-03-24 14:38:33 +00:00
Craig Mautner
103ed35587 am 557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown." 
* commit '557a93e104f1fec69ed05b2d0ff26c78bca4c5d6':
  Set ScreenshotSurface secure if any secure content is shown.
 2014-03-24 07:34:59 -07:00
Craig Mautner
557a93e104 Merge "Set ScreenshotSurface secure if any secure content is shown." 2014-03-24 14:31:38 +00:00
Jinsuk Kim
775a097f01 am 3c34e5db: am c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev 
* commit '3c34e5dbbb99d3d66f71eea5db6e001cc5495263':
  Add HdmiCecManager
 2014-03-24 12:34:15 +00:00
Jinsuk Kim
3c34e5dbbb am c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev 
* commit 'c01e1aeb0d86bd626684c97d709d4a8e995fddfb':
  Add HdmiCecManager
 2014-03-24 12:26:51 +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