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

47849 Commits

Author SHA1 Message Date
George Mount
7799eea7bf am 8adb491e: Merge "Cross-Activity Scene transition API." 
* commit '8adb491e08b79657deedc13c427f785c889ee448':
  Cross-Activity Scene transition API.
 2014-02-04 16:24:47 -08:00
George Mount
8adb491e08 Merge "Cross-Activity Scene transition API." 2014-02-05 00:23:03 +00:00
George Mount
0a778eda69 Cross-Activity Scene transition API. 
First pass at API for cross-Activity Scene transitions.
Remaining work:
  Transition back
  Automatically capture hero element info
  Transfer of surface texture to synchronize between Activities
  Possibly use scene names to indicate preferred transition

Change-Id: I59d07de1fae694a46b92b1c82525daa301ec1377
 2014-02-04 16:18:43 -08:00
Craig Mautner
406f7756dd am 9e4adfb3: resolved conflicts for merge of 32360147 to master 
* commit '9e4adfb358ca3680288c07201efc8811472a579d':
  Add IIntentSender to ActivityContainer.startActivity
 2014-02-04 15:59:18 -08:00
Craig Mautner
9e4adfb358 resolved conflicts for merge of 32360147 to master 
Change-Id: I97cc95f66df50006469f8debd286966cc21edb60
 2014-02-04 15:55:19 -08:00
Craig Mautner
323601475e am df88d730: Add IIntentSender to ActivityContainer.startActivity 
* commit 'df88d73092c62a1a3cd2b2056ca63ae2e70cc238':
  Add IIntentSender to ActivityContainer.startActivity
 2014-02-04 23:38:28 +00:00
Craig Mautner
df88d73092 Add IIntentSender to ActivityContainer.startActivity 
PendingIntents and IntentSenders can now be launched. Still does not
work once the host activity has been paused and resumed.

Window manager TaskStacks now exist independently of Displays and app
windows persist after Displays are removed below them. Attaching the
stack to a new Display does not yet restore the windows to it.

Fixes bug 12747909.

Change-Id: I509007ee23fda400b353f483cf6ecce08177763b
 2014-02-04 15:10:13 -08:00
Alan Viverette
2b5e863ed2 am 143b46d5: Check for null display list 
* commit '143b46d50c0c01970c7d280228bd1e58c2afb32b':
  Check for null display list
 2014-02-04 14:21:58 -08:00
Alan Viverette
143b46d50c Check for null display list 
BUG: 12764584
Change-Id: I071aa0d9bc4f4ac353a5d0f534cf7c44964d4bf0
 2014-02-04 14:19:06 -08:00
Alan Viverette
3a080e7ba3 am 9f244efb: Merge "Make background projection a property of View" 
* commit '9f244efbfac8d592a0af0321f7985761ed17ec6c':
  Make background projection a property of View
 2014-02-04 14:08:09 -08:00
Alan Viverette
9f244efbfa Merge "Make background projection a property of View" 2014-02-04 22:05:26 +00:00
Ruben Brunk
4ee60085c9 am 40675bdd: Merge "camera3: Update maxRegions tag." 
* commit '40675bdd3857a9e29b2e61b5bc1660e9bb2e82a2':
  camera3: Update maxRegions tag.
 2014-02-04 13:04:15 -08:00
Ruben Brunk
40675bdd38 Merge "camera3: Update maxRegions tag." 2014-02-04 21:01:19 +00:00
Alan Viverette
4085aac583 Make background projection a property of View 
BUG: 12764584
Change-Id: Id80afd6d26c814d3fd551f6690d4a88c441b0b9f
 2014-02-04 11:17:32 -08:00
Alan Viverette
342675df4d am 8eea3ea5: Add APIs for obtaining themed Drawable from Theme, Context 
* commit '8eea3ea5591e59f55cbb4f6b2b7e9363a285ced3':
  Add APIs for obtaining themed Drawable from Theme, Context
 2014-02-03 19:04:27 -08:00
Alan Viverette
8eea3ea559 Add APIs for obtaining themed Drawable from Theme, Context 
BUG: 12611005
Change-Id: Ic0057be4e4c2d0c61ce02a019b3f7d0625e3a016
 2014-02-03 18:42:24 -08:00
Ruben Brunk
5cb46b3c8a am 8cff1a37: Merge "camera3: Update awbRegions tag." 
* commit '8cff1a370e8d89c0a977b82cd8730ab791866808':
  camera3: Update awbRegions tag.
 2014-02-03 18:01:40 -08:00
Ruben Brunk
90bc34e5bf camera3: Update maxRegions tag. 
Change-Id: I22501cbf7f941d9626b88182e2dda8a13a620d01
 2014-02-03 17:54:24 -08:00
Ruben Brunk
8cff1a370e Merge "camera3: Update awbRegions tag." 2014-02-04 01:18:08 +00:00
Ruben Brunk
f59521d3b1 camera3: Update awbRegions tag. 
Change-Id: I85053b61fae4e360eff9143afc021ad60971f3b6
 2014-02-03 17:14:33 -08:00
Andy McFadden
8c8efbf42b am 01127579: Merge "Remove setFlags()" 
* commit '0112757995debe0d4e3527f9f8299380b0561017':
  Remove setFlags()
 2014-02-03 16:42:11 -08:00
Andy McFadden
0112757995 Merge "Remove setFlags()" 2014-02-04 00:39:16 +00:00
Alan Viverette
9d100eb5c8 am e5aea3bb: Merge "Fix ordering of dimension caching during ImageView.setResource()" 
* commit 'e5aea3bb0c88619bea61569fc9f824741542138d':
  Fix ordering of dimension caching during ImageView.setResource()
 2014-02-03 15:33:09 -08:00
Igor Murashkin
149d37adf0 am eff19d36: Merge "camera2: Revise android.sensor.maxFrameDuration definition" 
* commit 'eff19d36fcbdcf3d554b961905a54e4a01c61629':
  camera2: Revise android.sensor.maxFrameDuration definition
 2014-02-03 15:32:57 -08:00
Dianne Hackborn
f4cb4a00b0 am e8d916c0: Merge "More battery history improvements." 
* commit 'e8d916c04c3fb40667fbacb9b6fd1c775ce00b42':
  More battery history improvements.
 2014-02-03 15:32:47 -08:00
Zhijun He
5f7c7b7f14 am 6c90d439: Merge "Camera2: Update sceneFlicker tag spec" 
* commit '6c90d439758add5981dee67674d0aafc5208f427':
  Camera2: Update sceneFlicker tag spec
 2014-02-03 15:32:43 -08:00
Zhijun He
b2f90b1dd2 am 37bac0ae: Merge "Camera2: update lens state tag specs" 
* commit '37bac0aecbf656f0d8b1f0145fbbb30743c59e9b':
  Camera2: update lens state tag specs
 2014-02-03 15:32:40 -08:00
Christopher Tate
190a0bd87f am 31b4834b: Merge "Introduce "IdleService" API to expose idle-time maintenance to apps" 
* commit '31b4834b6d5eb1e5156950930b69221819a84766':
  Introduce "IdleService" API to expose idle-time maintenance to apps
 2014-02-03 15:32:36 -08:00
Zhijun He
1a931fe5d3 am ef83738d: Merge "Camera2: Update pixelArraySize and analog sensitivity tags" 
* commit 'ef83738da65a79defc6dc4f12433b327d670127e':
  Camera2: Update pixelArraySize and analog sensitivity tags
 2014-02-03 15:32:33 -08:00
John Spurlock
bc9a5e82bc am 53a470af: am be878d87: am b6a4926c: am 647db9fa: am 76ecd66a: am 0196e561: Fix typo in ImageView.java 
* commit '53a470af6574dea27a2701e763e6c6b10be75af7':
  Fix typo in ImageView.java
 2014-02-03 15:32:26 -08:00
Alan Viverette
37d46793c0 am edc4664d: Fix broken build in BridgeResources 
* commit 'edc4664d60af1f124d05f0a2b6ba58b837630f51':
  Fix broken build in BridgeResources
 2014-02-03 15:32:18 -08:00
Alan Viverette
3c446eefd3 am fe0ea8c2: Merge "Allow specification of View theme override as a theme attribute" 
* commit 'fe0ea8c21fe6f6cbaa0594295ec371efca4af824':
  Allow specification of View theme override as a theme attribute
 2014-02-03 15:32:07 -08:00
John Spurlock
47845b1b4d am 17b79985: am 47e276db: am cbd156c1: Merge "Update READ&WRITE_DREAM_STATE to signature|system." into klp-modular-dev 
* commit '17b79985f4e5e6b696320e29f665adb796a2aef5':
  Update READ&WRITE_DREAM_STATE to signature|system.
 2014-02-03 15:32:01 -08:00
Craig Mautner
26d61520d8 am 624e98f5: am d5f1fcb7: am 56bf2f67: Merge "Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage" into klp-modular-dev 
* commit '624e98f53962377f00104a50d9fc8e3044cbcd79':
  Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage
 2014-02-03 15:31:57 -08:00
Alan Viverette
6e14cea3e6 am 8b725dcb: Merge "Improve encapsulation of Resources" 
* commit '8b725dcbe15761514eea680c119bcc83a290c0f0':
  Improve encapsulation of Resources
 2014-02-03 15:31:54 -08:00
Chris Wren
edad29aea4 am 5c57c44e: Merge "record the notification style" 
* commit '5c57c44eea02ec579dc24cedfe417d487ba71fce':
  record the notification style
 2014-02-03 15:31:50 -08:00
Chris Craik
39d1322cb1 am 1d89563f: Merge "Add initial hidden outline APIs" 
* commit '1d89563ff8f5afd77457ef58489a234f490b480c':
  Add initial hidden outline APIs
 2014-02-03 15:31:44 -08:00
Narayan Kamath
581eb40bc6 am 90b8eaa6: am 797b5adc: am 77a1986c: am 49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible" 
* commit '90b8eaa68bda6beaf2ff886c3ed642e7050e3ff6':
  AArch64: Make AssetManager and related classes 64-bit compatible
 2014-02-03 15:31:40 -08:00
Narayan Kamath
741fccea18 am fd6a44d0: am ff62e966: am 149510e0: am b9f960e0: Merge "Fixed cancel() not working correctly" 
* commit 'fd6a44d0b5b6bcfc606abf23520b316c4bf36fc4':
  Fixed cancel() not working correctly
 2014-02-03 15:31:35 -08:00
Igor Murashkin
41cc1c253c am 5ec133b9: am ed5d7a6f: am 4463a4ef: am e05b7b50: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" 
* commit '5ec133b9a0949cda92c5c287169aba86ad615065':
  EGL14.eglCreateWindowSurface should set producerControlledByApp
 2014-02-03 15:31:32 -08:00
George Mount
3d215e9f4c am 56f57ccb: Revert "Add Path trimming." 
* commit '56f57ccbd4fbbf4d572cc966d1cb76d7ae7ad334':
  Revert "Add Path trimming."
 2014-02-03 15:31:28 -08:00
Alan Viverette
e5aea3bb0c Merge "Fix ordering of dimension caching during ImageView.setResource()" 2014-02-03 23:03:20 +00:00
Igor Murashkin
eff19d36fc Merge "camera2: Revise android.sensor.maxFrameDuration definition" 2014-02-03 22:44:50 +00:00
Igor Murashkin
6b7ddc47a2 camera2: Revise android.sensor.maxFrameDuration definition 
Change-Id: If0bb6c07f4dff85120c31f7163a41f2af255fd65
 2014-02-03 14:39:19 -08:00
Alan Viverette
4803bc1ab7 Fix ordering of dimension caching during ImageView.setResource() 
BUG: 12876148
Change-Id: I8c27546851f491e229a880307d34e1da8e74e6c2
 2014-02-03 14:32:07 -08:00
Dianne Hackborn
e8d916c04c Merge "More battery history improvements." 2014-02-03 21:32:33 +00:00
Zhijun He
6c90d43975 Merge "Camera2: Update sceneFlicker tag spec" 2014-02-03 21:10:19 +00:00
Zhijun He
208fb6c321 Camera2: Update sceneFlicker tag spec 
Change-Id: Ieb083b653b83f0373661fc15895ce23a4342a47f
 2014-02-03 13:09:06 -08:00
Zhijun He
37bac0aecb Merge "Camera2: update lens state tag specs" 2014-02-03 20:41:43 +00:00
Zhijun He
ca1b73a5f4 Camera2: update lens state tag specs 
Change-Id: I630d45945f2806bde748f440c8203e08a70f59c9
 2014-02-03 12:39:53 -08:00