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

123104 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
d397deeef0 Import translations. DO NOT MERGE 
Change-Id: I388073346d1d4990f09c557f2d1a2bea49cee99d
Auto-generated-cl: translation import
 2014-02-05 10:57:18 -08:00
Marco Nelissen
829a57c9a5 Merge "Cache media/nomedia paths" 2014-02-05 15:41:55 +00:00
Narayan Kamath
33e77b61b8 Merge "Revert "Camera2: Update stream num tag specs"" 2014-02-05 12:19:15 +00:00
Narayan Kamath
8b1c5704cb Revert "Camera2: Update stream num tag specs" 
This reverts commit 67c23833f81cb27671ee9f62a87ba810d0d49989.

Change-Id: I3aa2d0b245c998c57f3312e2d6f68aa72d80c338
 2014-02-05 12:16:46 +00:00
Jake Hamby
dbe576ebd1 Merge "Add new RIL commands to read/write NV items and reset NV config." 2014-02-05 03:56:03 +00:00
Adam Powell
11579e5595 Merge "Import updated SearchView assets from UX" 2014-02-05 02:28:14 +00:00
Adam Powell
03d165b1da Import updated SearchView assets from UX 
Bug 12233992

Change-Id: I6624d0d7625121a8905efa697c6a183b4463a289
 2014-02-04 18:20:56 -08:00
Stephen Hines
278a561925 am 34b84e69: am eadd6941: am bc80e40b: Merge "Add message to RS docs about application vs. library packaging." 
* commit '34b84e691c4d5bd853bc5b7c7ccb8040590359d6':
  Add message to RS docs about application vs. library packaging.
 2014-02-05 02:09:21 +00:00
Zhijun He
67c23833f8 Camera2: Update stream num tag specs 
Change-Id: I69ae1a34828230408a27bf7c016eb514485097b1
 2014-02-04 18:02:07 -08:00
Stephen Hines
34b84e691c am eadd6941: am bc80e40b: Merge "Add message to RS docs about application vs. library packaging." 
* commit 'eadd69413a5cbdd32ae56967f48b6ab6f3efbe52':
  Add message to RS docs about application vs. library packaging.
 2014-02-05 02:00:43 +00:00
Stephen Hines
eadd69413a am bc80e40b: Merge "Add message to RS docs about application vs. library packaging." 
* commit 'bc80e40b160596c262fee0ee4df4b9f15cc14e89':
  Add message to RS docs about application vs. library packaging.
 2014-02-04 17:57:11 -08:00
Stephen Hines
bc80e40b16 Merge "Add message to RS docs about application vs. library packaging." 2014-02-05 01:52:32 +00:00
Andy McFadden
7b24aee707 Merge "Pass a thread name to AttachCurrentThread" 2014-02-05 00:37:32 +00: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
Andy McFadden
9b311c900d Pass a thread name to AttachCurrentThread 
Reduces logspam from ART.

Bug 12896873

Change-Id: I82ae8e2dbba3918071d9c28f5ae5c882f8dcab3a
 2014-02-04 15:59:39 -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
143b46d50c Check for null display list 
BUG: 12764584
Change-Id: I071aa0d9bc4f4ac353a5d0f534cf7c44964d4bf0
 2014-02-04 14:19:06 -08:00
Alan Viverette
9f244efbfa Merge "Make background projection a property of View" 2014-02-04 22:05:26 +00:00
Ruben Brunk
40675bdd38 Merge "camera3: Update maxRegions tag." 2014-02-04 21:01:19 +00:00
Marco Nelissen
93a5845d1a Cache media/nomedia paths 
Instead of checking all the parents of every path for presence of
a .nomedia file every time a new entry is inserted, build a cache
of paths and use that when possible.

Change-Id: I5b912fd54473db8f96d3511cbc2715e0b69dd16b
 2014-02-04 12:52:10 -08:00
Alan Viverette
07f00e7402 Merge "Update APIs from RotateDrawable change" 2014-02-04 19:37:41 +00:00
Alan Viverette
f14415a9bb Update APIs from RotateDrawable change 
Change-Id: I89b1ef79360231912e16d60b20c2a52d4dc2c94e
 2014-02-04 11:37:05 -08:00
Scott Main
45d1cc587b am 35a25455: am 70f908d7: am 3e80914d: am eea15edc: am 749120f3: dashbaord update for feb \'14 
* commit '35a254554787196cf835536cc3bc28f9ee890af4':
  dashbaord update for feb '14
 2014-02-04 19:33:26 +00:00
Scott Main
35a2545547 am 70f908d7: am 3e80914d: am eea15edc: am 749120f3: dashbaord update for feb \'14 
* commit '70f908d7af916bf0e5b6af2913752dca431b837f':
  dashbaord update for feb '14
 2014-02-04 19:25:04 +00:00
Scott Main
70f908d7af am 3e80914d: am eea15edc: am 749120f3: dashbaord update for feb \'14 
* commit '3e80914d1683d1641fd6a01f14f126452e17f5c7':
  dashbaord update for feb '14
 2014-02-04 19:22:02 +00:00
Scott Main
3e80914d16 am eea15edc: am 749120f3: dashbaord update for feb \'14 
* commit 'eea15edcd47e6830dd6cdecb2c0b1e26eba0e6e3':
  dashbaord update for feb '14
 2014-02-04 19:19:38 +00:00
Alan Viverette
b8771938da Merge "Clean up RotateDrawable, add getters and setters for XML properties" 2014-02-04 19:19:21 +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
Scott Main
eea15edcd4 am 749120f3: dashbaord update for feb \'14 
* commit '749120f39bdac49a96771d06d25b7f9edf70be67':
  dashbaord update for feb '14
 2014-02-04 19:15:36 +00:00
Glenn Kasten
c734de9c2b am 9d2ad121: am 830d4ffc: am 74dc4bd0: am 983a9381: am 11263b24: Merge "Add adb over Wi-Fi" into klp-docs 
* commit '9d2ad12181a1793686d7cdbdf11b3aa5a92030c4':
  Add adb over Wi-Fi
 2014-02-04 19:02:57 +00:00
Adam Lesinski
94c40a4cf9 resolved conflicts for merge of 1b5b60d6 to master 
Change-Id: I2b713a55fcdf02c01afa99f175bf14248f210460
 2014-02-04 11:00:03 -08:00
Scott Main
749120f39b dashbaord update for feb '14 
Change-Id: I7ed66b6603f40cbbf3ffcc4824894777e3f8add2
 2014-02-04 10:57:47 -08:00
Glenn Kasten
9d2ad12181 am 830d4ffc: am 74dc4bd0: am 983a9381: am 11263b24: Merge "Add adb over Wi-Fi" into klp-docs 
* commit '830d4ffcb79fd2a676942a87d9fe661725d745f3':
  Add adb over Wi-Fi
 2014-02-04 18:40:09 +00:00
Adam Lesinski
1b5b60d696 am 203356a3: Merge "Add support for multiple asset dirs (-A)" into klp-modular-dev 
* commit '203356a34a82bfc759be02dfa1caa4529dce0732':
  Add support for multiple asset dirs (-A)
 2014-02-04 18:36:10 +00:00
Glenn Kasten
830d4ffcb7 am 74dc4bd0: am 983a9381: am 11263b24: Merge "Add adb over Wi-Fi" into klp-docs 
* commit '74dc4bd09e0dce4855c15cae31dcdd42b05d3532':
  Add adb over Wi-Fi
 2014-02-04 18:35:30 +00:00
Glenn Kasten
74dc4bd09e am 983a9381: am 11263b24: Merge "Add adb over Wi-Fi" into klp-docs 
* commit '983a9381b87519ddd1c6e12e44a8762dc805894a':
  Add adb over Wi-Fi
 2014-02-04 18:32:10 +00:00
Adam Lesinski
203356a34a Merge "Add support for multiple asset dirs (-A)" into klp-modular-dev 2014-02-04 18:31:23 +00:00
Glenn Kasten
983a9381b8 am 11263b24: Merge "Add adb over Wi-Fi" into klp-docs 
* commit '11263b24230a0d5db363d76ad199d692bcff1b35':
  Add adb over Wi-Fi
 2014-02-04 18:29:17 +00:00
Glenn Kasten
11263b2423 Merge "Add adb over Wi-Fi" into klp-docs 2014-02-04 18:27:13 +00:00
Ricardo Cervera
2a1fdefe16 am 1441acdd: am 6dea46b2: am f7c12817: am b180bff5: am ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug: 12870006" into klp-docs 
* commit '1441acdd6d0f08b00493478386e1b74df47e243b':
  docs: Added note on multiple build.gradle files. Bug: 12870006
 2014-02-04 17:35:37 +00:00
Ricardo Cervera
1441acdd6d am 6dea46b2: am f7c12817: am b180bff5: am ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug: 12870006" into klp-docs 
* commit '6dea46b2e567f614244100f542dce04e44c26bee':
  docs: Added note on multiple build.gradle files. Bug: 12870006
 2014-02-04 17:29:40 +00:00
Ricardo Cervera
6dea46b2e5 am f7c12817: am b180bff5: am ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug: 12870006" into klp-docs 
* commit 'f7c12817dc700a5e3d9e4dd3de6b1b50688a4129':
  docs: Added note on multiple build.gradle files. Bug: 12870006
 2014-02-04 17:26:58 +00:00
Ricardo Cervera
f7c12817dc am b180bff5: am ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug: 12870006" into klp-docs 
* commit 'b180bff575b25ab6b692327a3be244310fd90c5e':
  docs: Added note on multiple build.gradle files. Bug: 12870006
 2014-02-04 17:24:28 +00:00
Ricardo Cervera
b180bff575 am ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug: 12870006" into klp-docs 
* commit 'ccec0906bd358ffa9fbac8f8c882f582c43b6092':
  docs: Added note on multiple build.gradle files. Bug: 12870006
 2014-02-04 17:21:18 +00:00
Ricardo Cervera
ccec0906bd Merge "docs: Added note on multiple build.gradle files. Bug: 12870006" into klp-docs 2014-02-04 17:18:59 +00:00
Scott Main
80ddc85515 remove samples page under tools. redirect in separate cl. 
bug: 12878293

Change-Id: I51b0946d5d408ba92b3ae6fdfad8f14209cdbd5d

Conflicts:
	docs/html/tools/samples/index.jd
 2014-02-04 08:57:20 -08:00
Scott Main
c8f4070018 am e4cf2729: (-s ours) am 5ae21db1: am a7f84f3b: am 28a828fa: am 56783a74: remove samples page under tools. redirect in separate cl. bug: 12878293 
* commit 'e4cf272967d6cbfc8e9e7c5c2756651e306a2755':
  remove samples page under tools. redirect in separate cl. bug: 12878293
 2014-02-04 15:39:46 +00:00