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

112584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
f4490f4018 am e82f1ce5: am 631228b0: Merge "Re-@hide activity-level FLAG_IMMERSIVE and helpers." into klp-dev 
* commit 'e82f1ce53e51b129eddbc3fea27fe72cb402736b':
  Re-@hide activity-level FLAG_IMMERSIVE and helpers.
 2013-09-04 19:14:42 -07:00
John Spurlock
e82f1ce53e am 631228b0: Merge "Re-@hide activity-level FLAG_IMMERSIVE and helpers." into klp-dev 
* commit '631228b0249de11b5dad37e7a09a251a5558430a':
  Re-@hide activity-level FLAG_IMMERSIVE and helpers.
 2013-09-04 19:11:51 -07:00
John Spurlock
631228b024 Merge "Re-@hide activity-level FLAG_IMMERSIVE and helpers." into klp-dev 2013-09-05 02:09:29 +00:00
John Spurlock
2dd417de0f am 82dda7b0: am a6fdd7f2: Merge "SystemUI asset update." into klp-dev 
* commit '82dda7b0c666c5772c9b604d947793ea84f8fe7d':
  SystemUI asset update.
 2013-09-04 19:07:55 -07:00
John Spurlock
82dda7b0c6 am a6fdd7f2: Merge "SystemUI asset update." into klp-dev 
* commit 'a6fdd7f2eae0d30c36f0eb9f8eac53d3b64b6827':
  SystemUI asset update.
 2013-09-04 19:05:05 -07:00
John Spurlock
a6fdd7f2ea Merge "SystemUI asset update." into klp-dev 2013-09-05 02:02:53 +00:00
John Spurlock
7436f07eb5 SystemUI asset update. 
Plus a few framework resources used as status icons.

Bug:10502089
Change-Id: I66d3bcbb408a8e008cbb383cb3a1a55f97d3d64c
 2013-09-04 21:52:37 -04:00
Todd Poynor
2e9992583c Merge "BatteryProperty: Add average current property" 2013-09-05 01:37:29 +00:00
Ruben Brunk
8e8393aea4 am 92d7ed1d: am f267dd1d: Merge "Fix CameraService error flag when running HAL1 with API2." into klp-dev 
* commit '92d7ed1d5962557a13a24f740ac89afd0afccf37':
  Fix CameraService error flag when running HAL1 with API2.
 2013-09-04 18:32:19 -07:00
Dianne Hackborn
1703c54a0e am 021a138b: am 8144585c: Merge "Fix issue #10422349: Limit/change the battery history data in batterystats" into klp-dev 
* commit '021a138bdc0a8d1561cd7a429936afb8983c68b0':
  Fix issue #10422349: Limit/change the battery history data in batterystats
 2013-09-04 18:32:16 -07:00
Wink Saville
125b2f8d09 am 4a18be9e: am e4bcd1b7: am 323af8b4: am aa5b0f8b: am ce1e3798: Add provisioning apn timeout. 
* commit '4a18be9edc88caa329c2beb7180fabc26d46f76b':
  Add provisioning apn timeout.
 2013-09-04 18:32:11 -07:00
Ruben Brunk
92d7ed1d59 am f267dd1d: Merge "Fix CameraService error flag when running HAL1 with API2." into klp-dev 
* commit 'f267dd1d794237229fe71f37d54896ce54c9750d':
  Fix CameraService error flag when running HAL1 with API2.
 2013-09-04 18:28:05 -07:00
Dianne Hackborn
021a138bdc am 8144585c: Merge "Fix issue #10422349: Limit/change the battery history data in batterystats" into klp-dev 
* commit '8144585c5853d5f2dd5f30e4ab9c0abe7457d556':
  Fix issue #10422349: Limit/change the battery history data in batterystats
 2013-09-04 18:24:36 -07:00
Ruben Brunk
f267dd1d79 Merge "Fix CameraService error flag when running HAL1 with API2." into klp-dev 2013-09-05 01:23:40 +00:00
Dianne Hackborn
8144585c58 Merge "Fix issue #10422349: Limit/change the battery history data in batterystats" into klp-dev 2013-09-05 01:21:32 +00:00
Todd Poynor
be7d9e399e BatteryProperty: Add average current property 
Change-Id: I48907708024bddae9770bc1a3f0149ad901075c4
 2013-09-04 18:20:22 -07:00
Wink Saville
4a18be9edc am e4bcd1b7: am 323af8b4: am aa5b0f8b: am ce1e3798: Add provisioning apn timeout. 
* commit 'e4bcd1b71408216cc5cdaf8d74001da611828f00':
  Add provisioning apn timeout.
 2013-09-04 18:19:58 -07:00
Wink Saville
e4bcd1b714 am 323af8b4: am aa5b0f8b: am ce1e3798: Add provisioning apn timeout. 
* commit '323af8b49df3535977b5aa7f5b31c429d8a50f10':
  Add provisioning apn timeout.
 2013-09-04 18:17:15 -07:00
Wink Saville
323af8b49d am aa5b0f8b: am ce1e3798: Add provisioning apn timeout. 
* commit 'aa5b0f8bdadcfa1ddb041e09b815ea4b5986e901':
  Add provisioning apn timeout.
 2013-09-04 18:14:07 -07:00
Sandeep Siddhartha
d49f2fa854 am 454cf31d: am 228b3510: Merge "Move the hotword code to KeyguardHostView" into klp-dev 
* commit '454cf31dbd367a815f6f32c97dc32af98ce94bdd':
  Move the hotword code to KeyguardHostView
 2013-09-04 18:14:02 -07:00
Sandeep Siddhartha
454cf31dbd am 228b3510: Merge "Move the hotword code to KeyguardHostView" into klp-dev 
* commit '228b35109a6b8d75f1963178f3eff262a06db411':
  Move the hotword code to KeyguardHostView
 2013-09-04 18:11:10 -07:00
Wink Saville
aa5b0f8bda am ce1e3798: Add provisioning apn timeout. 
* commit 'ce1e37981caec29df2671a6e2909f00da7f24a00':
  Add provisioning apn timeout.
 2013-09-04 18:11:07 -07:00
Sandeep Siddhartha
228b35109a Merge "Move the hotword code to KeyguardHostView" into klp-dev 2013-09-05 01:08:23 +00:00
Dianne Hackborn
49021f5f79 Fix issue #10422349: Limit/change the battery history data in batterystats 
Don't include history in real checkins; have a new compact option
for bug reports.

Change-Id: I077f9218b365154f6bae9cc685c2c6b378e0283a
 2013-09-04 18:03:40 -07:00
Dianne Hackborn
3facfed942 am a7a8cdfa: am 7f71206d: Merge "Fix issue #10461600: KLP API Review: UndoManager" into klp-dev 
* commit 'a7a8cdfab3af29d4bdec95abd6bde96824129e4e':
  Fix issue #10461600: KLP API Review: UndoManager
 2013-09-04 17:58:58 -07:00
Dianne Hackborn
a7a8cdfab3 am 7f71206d: Merge "Fix issue #10461600: KLP API Review: UndoManager" into klp-dev 
* commit '7f71206d009e737e91c4c767183befe6006497c6':
  Fix issue #10461600: KLP API Review: UndoManager
 2013-09-04 17:56:11 -07:00
Dianne Hackborn
7f71206d00 Merge "Fix issue #10461600: KLP API Review: UndoManager" into klp-dev 2013-09-05 00:53:27 +00:00
Sandeep Siddhartha
eec83dcadd Move the hotword code to KeyguardHostView 
- Try hotword detection on Pattern unlock screen as well - disabled in
  this CL
- Explicitly stop hotword detection when starting the assist intent.

Change-Id: I3d22a9029abf888431113b86e4410ea9e9866c57
 2013-09-04 17:47:34 -07:00
Dianne Hackborn
b811e64cb3 Fix issue #10461600: KLP API Review: UndoManager 
Hide, hide, hide!

Change-Id: Ie04825723d9392a4258e2d738828201ee387f7c6
 2013-09-04 17:43:56 -07:00
Chet Haase
4918e7ad66 resolved conflicts for merge of 09ed0720 to master 
Change-Id: I1ce1b48a9fb954caf4fd15237f2f608ac9c478fe
 2013-09-04 17:19:44 -07:00
Chet Haase
09ed072028 am 49ee555f: Merge "Transition API changes from API council recommendations" into klp-dev 
* commit '49ee555f239c79871b661e5ff135061f26665e1c':
  Transition API changes from API council recommendations
 2013-09-04 16:49:39 -07:00
Chet Haase
49ee555f23 Merge "Transition API changes from API council recommendations" into klp-dev 2013-09-04 23:47:45 +00:00
Alan Viverette
79a5feff95 Fix the build, use viscous fluid interpolator in OverScroller 
Change-Id: I175a220d1d915161896b9b223acfee08e0face2c
 2013-09-04 16:37:57 -07:00
Scott Main
448835aef1 am 465b36d8: am 52ea7f57: am f56076ee: am 966b9d46: am 002057bf: Merge "update dashboards for 9/13" into jb-mr2-docs 
* commit '465b36d82206facfc0c36079b1b45acd543f8f60':
  update dashboards for 9/13
 2013-09-04 15:51:21 -07:00
Scott Main
465b36d822 am 52ea7f57: am f56076ee: am 966b9d46: am 002057bf: Merge "update dashboards for 9/13" into jb-mr2-docs 
* commit '52ea7f57ed08ea982dcb125b564b5509ef8dc3b6':
  update dashboards for 9/13
 2013-09-04 15:46:50 -07:00
Michael Wright
a1d09177ce am 7e0eecc4: am 9f8c2d22: Merge "Fix keymap build dependencies and variable name collisions" into klp-dev 
* commit '7e0eecc436970d8e67d09b11e36cbbdd55e3aaba':
  Fix keymap build dependencies and variable name collisions
 2013-09-04 15:44:24 -07:00
Scott Main
52ea7f57ed am f56076ee: am 966b9d46: am 002057bf: Merge "update dashboards for 9/13" into jb-mr2-docs 
* commit 'f56076eefba47dad9b66b3011f487dc9a22e2756':
  update dashboards for 9/13
 2013-09-04 15:43:40 -07:00
Scott Main
f56076eefb am 966b9d46: am 002057bf: Merge "update dashboards for 9/13" into jb-mr2-docs 
* commit '966b9d467dbb21d7bbc0a49067110ff4ddaffb89':
  update dashboards for 9/13
 2013-09-04 15:40:27 -07:00
Michael Wright
7e0eecc436 am 9f8c2d22: Merge "Fix keymap build dependencies and variable name collisions" into klp-dev 
* commit '9f8c2d229febff3a331afd26137ba5abb173a84d':
  Fix keymap build dependencies and variable name collisions
 2013-09-04 15:39:52 -07:00
Michael Wright
9f8c2d229f Merge "Fix keymap build dependencies and variable name collisions" into klp-dev 2013-09-04 22:37:05 +00:00
Scott Main
966b9d467d am 002057bf: Merge "update dashboards for 9/13" into jb-mr2-docs 
* commit '002057bf0452168fd88eb81c2d36f02cfb260769':
  update dashboards for 9/13
 2013-09-04 15:36:59 -07:00
Glenn Kasten
7bb90e9a0b am 44b4fd2c: am 04c58e9e: Merge "Java API for AudioTrack timestamps" into klp-dev 
* commit '44b4fd2cb9440dfbd5eca5758d9cabcdeaab0a1b':
  Java API for AudioTrack timestamps
 2013-09-04 15:35:32 -07:00
Scott Main
002057bf04 Merge "update dashboards for 9/13" into jb-mr2-docs 2013-09-04 22:35:04 +00:00
Glenn Kasten
44b4fd2cb9 am 04c58e9e: Merge "Java API for AudioTrack timestamps" into klp-dev 
* commit '04c58e9ec12c65c15738ba456f18a1f36416b0cc':
  Java API for AudioTrack timestamps
 2013-09-04 15:33:20 -07:00
Glenn Kasten
04c58e9ec1 Merge "Java API for AudioTrack timestamps" into klp-dev 2013-09-04 22:29:19 +00:00
Glenn Kasten
948c2e6ff4 Java API for AudioTrack timestamps 
This change adds android.media.AudioTimestamp and
android.media.AudioTrack.getTimestamp, with implementation, but hidden.

Change-Id: Ic314f04ff775baca05c57d19b5ea91133dbd0be1
 2013-09-04 15:23:27 -07:00
Chong Zhang
9a465a92f0 am 411af374: am dbb0b824: Merge "wifi-display: add a global setting to force WPS config method" into klp-dev 
* commit '411af374f9a2fbfb8a88565afdc8fa9ddb7148a9':
  wifi-display: add a global setting to force WPS config method
 2013-09-04 15:14:32 -07:00
Chong Zhang
0df62d47c7 am 954b3b86: am 919559d4: Merge "wifi-display: disable WFD IE when Wifi display is turned off" into klp-dev 
* commit '954b3b86610ee2df6161ee96afb9df66d98abb9c':
  wifi-display: disable WFD IE when Wifi display is turned off
 2013-09-04 15:14:29 -07:00
Chong Zhang
411af374f9 am dbb0b824: Merge "wifi-display: add a global setting to force WPS config method" into klp-dev 
* commit 'dbb0b824a7e1dc6909988ec06a46158c05d26a92':
  wifi-display: add a global setting to force WPS config method
 2013-09-04 15:11:33 -07:00
Chong Zhang
954b3b8661 am 919559d4: Merge "wifi-display: disable WFD IE when Wifi display is turned off" into klp-dev 
* commit '919559d447a47257531fbe47e32cd9f4889457ea':
  wifi-display: disable WFD IE when Wifi display is turned off
 2013-09-04 15:11:31 -07:00