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

128638 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sailesh Nepal
b84663ff34 Merge "Add audio mode APIs" into master-nova 2014-03-25 00:17:01 +00:00
Winson Chung
5f6f6f71fd am 75c549c5: Merge "Moving task view layout into resource." 
* commit '75c549c537cf44d1f1bb13422a950637f7f5c489':
  Moving task view layout into resource.
 2014-03-24 16:09:26 -07:00
Winson Chung
75c549c537 Merge "Moving task view layout into resource." 2014-03-24 23:03:37 +00:00
John Spurlock
09a6d47b84 am 66c49bc9: am c3b7a671: (-s ours) am e2cae0a6: am 2b45d84e: Merge "Unhide Notification kind, rename to category." into klp-modular-dev 
* commit '66c49bc99d3e33c00c3f674fca9cba06d1abc199':
  Unhide Notification kind, rename to category.
 2014-03-24 16:00:43 -07:00
Winson Chung
37c8d8ef85 Moving task view layout into resource. 
- Using new activity icon/labels

Change-Id: If27bf60d2df75813213e9f3095baeb03085da8f7
 2014-03-24 15:55:39 -07:00
John Spurlock
66c49bc99d am c3b7a671: (-s ours) am e2cae0a6: am 2b45d84e: Merge "Unhide Notification kind, rename to category." into klp-modular-dev 
* commit 'c3b7a6718290dfc0cbd63039e76292f2ba35e43b':
  Unhide Notification kind, rename to category.
 2014-03-24 22:54:20 +00:00
John Reck
b09249f914 am 78ce1c52: Add back clobbered cleanup 
* commit '78ce1c5247de60a4247d81d168fd9fa97c7591d0':
  Add back clobbered cleanup
 2014-03-24 15:53:35 -07:00
John Reck
78ce1c5247 Add back clobbered cleanup 
Change-Id: I418b612710850bbc3033c4bd0143fb0f0befd2cb
 2014-03-24 15:43:49 -07:00
Jose Lima
3be15cb39b am 41c2d2ce: Merge "resolved conflicts for merge of 6c45157c to master" 
* commit '41c2d2cec3f46b28f535e9cd7f5b9da02280ccfe':
  Added isGame application tag to the manifest
 2014-03-24 15:38:02 -07:00
John Reck
ba46ce4e2a am 2ddf5166: Merge "Add stagingProperties" 
* commit '2ddf5166ea1da32f7ac63392f369f8a3c36a16df':
  Add stagingProperties
 2014-03-24 15:37:59 -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
Ricardo Cervera
1d6046fcf8 am ae5d7d5d: docs: Added new sensor types. Bug: 10674725 
* commit 'ae5d7d5d61def1c7af9d69d3e72a0f5f4a8a6414':
  docs: Added new sensor types. Bug: 10674725
 2014-03-24 15:32:33 -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
bfed773eb1 am 852472d9: Fix build. 
* commit '852472d9aa39eb4591eac43487ac3e0944e1daf6':
  Fix build.
 2014-03-24 15:00:00 -07:00
Dianne Hackborn
852472d9aa Fix build. 
Change-Id: I1dd79e932a551bd537d2c71e8fca29a299c9312f
 2014-03-24 14:53:39 -07:00
Mark Renouf
372542f666 am de02cdc1: am 7390d4ab: am 3796594c: am a63cd9f4: Merge "Run finalizers before counting for StrictMode." into klp-modular-dev 
* commit 'de02cdc1e95cea19b2ddef26d60ad1d109bd507c':
  Run finalizers before counting for StrictMode.
 2014-03-24 14:30:51 -07:00
Craig Mautner
1f1b52e971 am 452fd493: am 5332706b: am b98ee1eb: am 103ed355: am 557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown." 
* commit '452fd49369da80a460d43fcb7e71d8549268f378':
  Set ScreenshotSurface secure if any secure content is shown.
 2014-03-24 14:30:42 -07:00
Jinsuk Kim
e25ad4fbe7 am 1c855178: am 775a097f: am 3c34e5db: am c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev 
* commit '1c855178e497f7ba788dadb87167f1e6735d10cb':
  Add HdmiCecManager
 2014-03-24 14:30:39 -07:00
Chris Craik
58de1c2b7e am 76c30ce3: Merge "Rework Outline API, remove isolatedZVolume remnants" 
* commit '76c30ce3c1d8f1a818502aaea2c42c84d6bd3f92':
  Rework Outline API, remove isolatedZVolume remnants
 2014-03-24 14:27:11 -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
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