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

59376 Commits

Author SHA1 Message Date
Erik Pasternak
9d96c9fa05 am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev 
* commit '4d82c46ef5df06e1b92f3574e41b38a62ec0e607':
  Implement auto-sleep functionality.
 2014-10-02 00:04:16 +00:00
Erik Pasternak
4d82c46ef5 Merge "Implement auto-sleep functionality." into lmp-dev 2014-10-02 00:00:40 +00:00
ztenghui
6d0eaf45a9 am f9033048: Merge "+ correcting shadow visual appearance (b/17610926)" into lmp-dev 
* commit 'f903304896809039430c5e52bd0c24052f51b14f':
  + correcting shadow visual appearance (b/17610926)
 2014-10-01 23:33:51 +00:00
ztenghui
f903304896 Merge "+ correcting shadow visual appearance (b/17610926)" into lmp-dev 2014-10-01 23:29:32 +00:00
ztenghui
8def74de33 + correcting shadow visual appearance (b/17610926) 
+ adjusting spot and ambient shadow opacity constants to achieve desired appearance
+ reducing ambient scale ratio back to 1.0 to address over-lightening at higher elevations
+ partially revert ag/546290

Change-Id: I9d7f664f73a7b9b83df73b739103c97054bd4f6e
 2014-10-01 16:12:28 -07:00
Hui Shu
00207f564d am 4e0ad44f: Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev 
* commit '4e0ad44fcac48b2be77bd116ffdb696cb6490829':
  Revert "Remove WebView DRP Setting from Developer Settings"
 2014-10-01 22:39:00 +00:00
Patrick Tjin
df670e7347 am dea847c2: Skip over directories when iterating tombstones 
* commit 'dea847c2ace8894a595cf9bd87764ce2ca9698ab':
  Skip over directories when iterating tombstones
 2014-10-01 22:38:31 +00:00
John Reck
5451afcae7 am 8786a962: Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev 
* commit '8786a962f0aa9991e0bc668eb7d9eae45645409e':
  Re-allow suppressing onDetachedFromWindow
 2014-10-01 22:37:41 +00:00
Adam Powell
e4275843fe am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev 
* commit 'c6a06d437cf2ee7926a01b2f8ee685555bfb3d81':
  Revert "Fix issue with using locally defined attrs in a shared lib"
 2014-10-01 22:37:27 +00:00
Hui Shu
4979a6ade1 am aee5c9e7: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 
* commit 'aee5c9e7c1f61126c61722a957daedf57cf26e7e':
  Remove WebView DRP Setting from Developer Settings
 2014-10-01 22:37:23 +00:00
Craig Mautner
6f357112f8 am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev 
* commit '245645ca460150b4030d84c88faa931345a90a50':
  Don't clear visible-behind activity if it is top
 2014-10-01 22:36:47 +00:00
Narayan Kamath
1ff5abdbb1 am 7dc7f676: Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev 
* commit '7dc7f676d699c739128dcc7855cbc0dacddaaa57':
  Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS
 2014-10-01 22:35:50 +00:00
Brian Carlstrom
753f08f740 am 7123bd69: Merge "Use VMRuntime.isBootClassPathOnDisk" into lmp-dev 
* commit '7123bd690fa14d0b9e33f5a70c58ea5b5f1b7d32':
  Use VMRuntime.isBootClassPathOnDisk
 2014-10-01 22:35:11 +00:00
Jerome Poichet
8be1828ae9 am 72079f7f: Merge "Make sure cancel is called on tear down." into lmp-dev 
* commit '72079f7f9b644e57169e26597ec7c727786071a1':
  Make sure cancel is called on tear down.
 2014-10-01 22:34:24 +00:00
Hui Shu
4e0ad44fca Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev 2014-10-01 22:10:23 +00:00
Jeff Brown
05af6adb8d Implement auto-sleep functionality. 
Added a new SLEEP_TIMEOUT setting which governs how long the device will
remain awake or dreaming without user activity.  By default this
value is set to -1 which maintains today's existing behavior.

We basically represent the time we are allowed to be dreaming as a new
kind of user activity summary state called DREAM, similar to BRIGHT
and DIM.  When the sleep timeout expires, the state is cleared and
the dream ends.

Bug: 17665809
Change-Id: I59aa7648dcec215f1285464fc1134934a09230e5
 2014-10-01 15:01:10 -07:00
Hui Shu
2267177279 Revert "Remove WebView DRP Setting from Developer Settings" 
This reverts commit eb487c63017ae5cb0f3f35bf8b17c5f3bbb0f456.

Change-Id: Ie38a24efe2ea015b971cb0a05eca321299898538
 2014-10-01 21:41:07 +00:00
Patrick Tjin
dea847c2ac Skip over directories when iterating tombstones 
Bug: 17380601
Change-Id: Idb6e559a89c7438751bd7a52375b9789454e0334
 2014-10-01 21:17:52 +00:00
John Reck
8786a962f0 Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev 2014-10-01 19:11:04 +00:00
Adam Powell
c6a06d437c Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev 2014-10-01 18:31:56 +00:00
Hui Shu
aee5c9e7c1 Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 2014-10-01 18:28:57 +00:00
Adam Powell
908c748096 Revert "Fix issue with using locally defined attrs in a shared lib" 
This reverts commit 5069dd69898bd0d9c69ba2bbd37239ec8d1c9dc6.

The reverted commit caused issues loading resources supplied by static libraries.

Bug 17748356

Change-Id: I860a4f31451ee7c03c02974826472a67226b029f
 2014-10-01 18:11:18 +00:00
Craig Mautner
245645ca46 Merge "Don't clear visible-behind activity if it is top" into lmp-dev 2014-10-01 17:48:14 +00:00
John Reck
77e4a5250f Re-allow suppressing onDetachedFromWindow 
Bug: 17578553

Games seem to be doing this to prevent destruction of their
GL contexts, and they assume it works even if it doesn't. However,
GLSurfaceView is clunky here, so while the app is doing something
questionable we don't really offer a better way. For now revert
back to kitkat behavior.

Change-Id: Icfa9e496279b9cfa47f9bc7f6848d9313caed0d5
 2014-10-01 10:38:07 -07:00
Craig Mautner
64ccb70867 Don't clear visible-behind activity if it is top 
Previously if an activity requested to keep running behind
translucent activities (Activity.requestVisibleBehind()) and then
converted itself to opaque (Activity.convertFromTranslucent()), we
would clear the visible-behind activity. This change tests to see
if the top activity is the visible-behind activity and does not
clear it in that case.

This change also clears the visible-behind activity whenever it
comes back to the front. That forces the activity to call
requestVisibleBehind() each time it is resumed.

Fixes bug 17648436.

Change-Id: Id0fc4d7e2a2b907675305d98bad1b08cb610919e
 2014-10-01 10:14:53 -07:00
Narayan Kamath
7dc7f676d6 Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev 2014-10-01 09:53:34 +00:00
Baligh Uddin
42d0c353ff Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-01 04:25:43 +00:00
Brian Carlstrom
7123bd690f Merge "Use VMRuntime.isBootClassPathOnDisk" into lmp-dev 2014-10-01 04:21:26 +00:00
Jerome Poichet
c1fb6dc1a4 Make sure cancel is called on tear down. 
- Make sure cancel is called when consumer of SpeechRecognizer calls
  destroy.
- If consumer goes away, make sure to call cancel as well.

b/17584947 Pressing mic button in Music hoses audio

Change-Id: Ibe1198b37fe6167493a8694f9089d970f1eb07de
 2014-09-30 17:56:27 -07:00
Amit Mahajan
b3ad87e6b1 am 496aeb1a: Merge "Roaming blacklist" into lmp-dev 
* commit '496aeb1a6156f3c089135a7ce4fab550589eaff7':
  Roaming blacklist
 2014-10-01 00:48:50 +00:00
Adam Lesinski
d388b1fdde am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev 
* commit 'cd8e73817d14798f9d2031ffd301a03a096b7907':
  Fix issue with using locally defined attrs in a shared lib
 2014-10-01 00:44:31 +00:00
Amit Mahajan
496aeb1a61 Merge "Roaming blacklist" into lmp-dev 2014-10-01 00:44:03 +00:00
Adam Lesinski
cd8e73817d Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev 2014-10-01 00:39:57 +00:00
w19976
a902fe5fbf Roaming blacklist 
Bug: 17684236
Change-Id: I3e4a293ed8ae134d77fe3ce0c0cfa3b6012500a8
 2014-10-01 00:37:19 +00:00
Alan Viverette
6a87fb2b29 am c2379e00: Merge "Add activated text colors, update Material preference header" into lmp-dev 
* commit 'c2379e005d3e692d0b725c65fa842459e65ad1dc':
  Add activated text colors, update Material preference header
 2014-10-01 00:36:45 +00:00
Alan Viverette
9c4b973007 am 191807e3: Merge "Remove baked-in shadow insets from Material dialog minHeight" into lmp-dev 
* commit '191807e3863d873cd315701ab7f32b0b51e1bf35':
  Remove baked-in shadow insets from Material dialog minHeight
 2014-10-01 00:36:41 +00:00
Alan Viverette
c2379e005d Merge "Add activated text colors, update Material preference header" into lmp-dev 2014-10-01 00:35:02 +00:00
Alan Viverette
191807e386 Merge "Remove baked-in shadow insets from Material dialog minHeight" into lmp-dev 2014-10-01 00:32:39 +00:00
Alan Viverette
b21e5662d5 Remove baked-in shadow insets from Material dialog minHeight 
We don't bake in shadows anymore, so this was making the minimum
content area way too tall.

BUG: 17700338
Change-Id: I728693654a6dc1c8d75a258746409b61639dccfc
 2014-09-30 17:07:25 -07:00
Vineeta Srivastava
feddd60827 am 575bf7e6: Merge "Correct MTU size for Bell" into lmp-dev 
* commit '575bf7e6ccd3555e2f7e7b90f061867fa1a39934':
  Correct MTU size for Bell
 2014-10-01 00:02:58 +00:00
Vineeta Srivastava
575bf7e6cc Merge "Correct MTU size for Bell" into lmp-dev 2014-10-01 00:00:02 +00:00
Hui Shu
eb487c6301 Remove WebView DRP Setting from Developer Settings 
BUG: 17730990
Change-Id: Ic4fde9affb2f887329d6b3d2dbe8945959c016d8
 2014-09-30 16:52:41 -07:00
Ian Rogers
b05f1dfe10 Merge branch 'lmp-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev-plus-aosp 2014-09-30 23:52:22 +00:00
Eino-Ville Talvala
c89f28019d am 0a62ab70: Merge "Camera2 Legacy: Set a default thumbnail size" into lmp-dev 
* commit '0a62ab707977d4d6666d1c452ba702442655b6e6':
  Camera2 Legacy: Set a default thumbnail size
 2014-09-30 23:51:26 +00:00
Elliott Hughes
921d8e2ddb am ee7684ca: am 04517286: Merge "Use strerror(3) when reporting zygote failures." 
* commit 'ee7684cad00a13fc82519599ad8fab3cfbd6fe8b':
  Use strerror(3) when reporting zygote failures.
 2014-09-30 23:51:04 +00:00
Brian Carlstrom
a39871ef5e Use VMRuntime.isBootClassPathOnDisk 
Bug: 17679443
Change-Id: If53c236058a7237d735c2344a715cf0a36301f9b
 2014-09-30 16:49:32 -07:00
Eino-Ville Talvala
0a62ab7079 Merge "Camera2 Legacy: Set a default thumbnail size" into lmp-dev 2014-09-30 23:44:58 +00:00
Gordon Gao
c535d13e43 Correct MTU size for Bell 
Bug: 17627179
Change-Id: I4740326b0211ca34b82267ebe953f2930f4e3690
 2014-09-30 23:27:05 +00:00
Adam Lesinski
5069dd6989 Fix issue with using locally defined attrs in a shared lib 
The attribute name resource IDs were never fixed up with
the runtime package ID so we weren't finding attributes
whenever the runtime package ID was different than the build
time one, which happened to be when a shared lib referenced itself
(0x00 vs 0x02).

Bug:17666947
Change-Id: Icf3e874bcea0e27eebe42d60fbed626a34bf9266
 2014-09-30 16:18:09 -07:00
Adam Powell
ad60831ed9 am fe426d06: Merge "Inset the non-overlay contextual action bar without a status guard" into lmp-dev 
* commit 'fe426d061ad5feb65200c2970bf826b10e356247':
  Inset the non-overlay contextual action bar without a status guard
 2014-09-30 22:22:01 +00:00