Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
171,534 Commits 3 Branches 0 Tags
2d6627a9f28c5c31fec5da3dcf48d96ff7a0d893
Commit Graph

171534 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
2d6627a9f2 am 72b047c6: Merge "Don\'t apply animations to windows that are showing" into lmp-mr1-dev 
automerge: 922f8e2

* commit '922f8e2c0f58e57d02ab136f24f135553e6d9720':
  Don't apply animations to windows that are showing
 2014-12-12 04:24:34 +00:00
David Friedman
99385aa992 am e84bf9fd: am d0d76540: am c82392df: am 1ab615b3: Merge "Adds link to related video." into lmp-docs 
automerge: e90a170

* commit 'e90a170f67f91d9b0166ac4f0de07f63207b1bce':
  Adds link to related video.
 2014-12-12 04:23:07 +00:00
Alan Viverette
3ead4127ae am ff441883: Merge "Improve time picker accessibility" into lmp-mr1-dev 
automerge: 4b7f724

* commit '4b7f724fb23166f892781ae7daa2df76bede2134':
  Improve time picker accessibility
 2014-12-12 04:21:42 +00:00
Winson Chung
51fafe26a8 am 47d9a58c: Merge "Fixing issue with old thumbnails on first launch of app. (Bug 18718114)" into lmp-mr1-dev 
automerge: 8c8c99c

* commit '8c8c99cf0873e10f19d79bfe79d8ea56848dadb4':
  Fixing issue with old thumbnails on first launch of app. (Bug 18718114)
 2014-12-12 04:20:19 +00:00
Joe Fernandez
6ea9db4b64 am 81779694: am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs 
automerge: a878256

* commit 'a878256b59e1766ce918257dbfe343b0d3d0ec2d':
  docs: studio basics haxm updates
 2014-12-12 04:19:03 +00:00
Ricardo Cervera
c0276ebd93 am af7070e6: am 64d97cb2: am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs 
automerge: 575c8c9

* commit '575c8c9fcdc2ee8ed614ac9b6a4992fffe8ccea4':
  docs: Fixes to watch faces docs.
 2014-12-12 04:17:41 +00:00
Rich Slogar
cc46ad8d66 am 0564cee3: am b490f297: am 5c853c26: am d35216ad: Merge "docs: studio bundle update" into lmp-docs 
automerge: 51f1c26

* commit '51f1c26b5b4b2c514fd5a4ca11de98542ccd4166':
  docs: studio bundle update
 2014-12-12 04:16:30 +00:00
Joe Fernandez
11fc651aef am 07877955: am 5c518b7f: am b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs 
automerge: cc08e61

* commit 'cc08e619d6a946b58b2aae857e3190b5996c07b8':
  docs: platform updates for api 21
 2014-12-12 04:14:43 +00:00
Joe Fernandez
4cb6d10d5e am e3bac3bc: am b64545c8: am 378c71a3: am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs 
automerge: 11bccb1

* commit '11bccb1ebe457bc3cca582320d13a459920425d9':
  docs: sdk tools 24.0.1 revisions
 2014-12-12 04:13:20 +00:00
Andrew Solovay
d96ed254db am 13e0a650: am a97053fd: am f43c057c: am c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes" 
automerge: fe96791

* commit 'fe967912faf8ddf79d9eab794c4a2417758b716d':
  docs: Added info about managed profiles to "Android 5.0 Changes"
 2014-12-12 04:11:53 +00:00
Ruben Brunk
c7c20b34ec am f6ed526b: Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev 
automerge: 81b381b

* commit '81b381b82e83ec742a8a6541dabbc63dae087c0a':
  camera2: Fix LEGACY YUV production and orientation.
 2014-12-12 04:09:55 +00:00
Jason Monk
239c7667dd am 7d8ccb41: Merge "Fix crash in BluetoothControllerImpl" into lmp-mr1-dev 
automerge: 70cf2f7

* commit '70cf2f72f2e19570d81c1365164313437b38ffd5':
  Fix crash in BluetoothControllerImpl
 2014-12-12 04:08:33 +00:00
Amit Mahajan
dee84a8796 am c5da1d3d: Merge "Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network." into lmp-mr1-dev 
automerge: cac8662

* commit 'cac8662943b28663fefc6e5315a7b9acd514bfdb':
  Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network.
 2014-12-12 04:05:59 +00:00
John Spurlock
97a2be8672 am 0537caa1: Merge "Zen: Leave zen=none on manual ringer mode stream volume changes." into lmp-mr1-dev 
automerge: 6f9a717

* commit '6f9a71729f6ba7521ed8461ec8b556a8907743b1':
  Zen: Leave zen=none on manual ringer mode stream volume changes.
 2014-12-12 04:04:40 +00:00
Craig Mautner
922f8e2c0f am 72b047c6: Merge "Don\'t apply animations to windows that are showing" into lmp-mr1-dev 
* commit '72b047c6c37ddf860be15b159b9a143be36d7425':
  Don't apply animations to windows that are showing
 2014-12-11 22:29:58 +00:00
David Friedman
e90a170f67 am e84bf9fd: am d0d76540: am c82392df: am 1ab615b3: Merge "Adds link to related video." into lmp-docs 
* commit 'e84bf9fddce69f2cc6b9e5f4274419a4122476a2':
  Adds link to related video.
 2014-12-11 22:29:53 +00:00
Craig Mautner
72b047c6c3 Merge "Don't apply animations to windows that are showing" into lmp-mr1-dev 2014-12-11 22:27:54 +00:00
David Friedman
e84bf9fddc am d0d76540: am c82392df: am 1ab615b3: Merge "Adds link to related video." into lmp-docs 
* commit 'd0d76540ae937d6773793ba053e81ee3667d0ba6':
  Adds link to related video.
 2014-12-11 22:21:16 +00:00
Alan Viverette
4b7f724fb2 am ff441883: Merge "Improve time picker accessibility" into lmp-mr1-dev 
* commit 'ff44188309fca037892d0ded64cfee04a3a71c42':
  Improve time picker accessibility
 2014-12-11 22:19:07 +00:00
Alan Viverette
ff44188309 Merge "Improve time picker accessibility" into lmp-mr1-dev 2014-12-11 22:11:56 +00:00
David Friedman
d0d76540ae am c82392df: am 1ab615b3: Merge "Adds link to related video." into lmp-docs 
* commit 'c82392df7caa12836d97650c7528f216d3c2b76f':
  Adds link to related video.
 2014-12-11 22:10:48 +00:00
David Friedman
c82392df7c am 1ab615b3: Merge "Adds link to related video." into lmp-docs 
* commit '1ab615b3e6a7ae820fde4ba067f76dff635f3639':
  Adds link to related video.
 2014-12-11 22:03:42 +00:00
David Friedman
1ab615b3e6 Merge "Adds link to related video." into lmp-docs 2014-12-11 21:55:25 +00:00
Winson Chung
8c8c99cf08 am 47d9a58c: Merge "Fixing issue with old thumbnails on first launch of app. (Bug 18718114)" into lmp-mr1-dev 
* commit '47d9a58ce15007f79bc094d9b1599e41d51670a3':
  Fixing issue with old thumbnails on first launch of app. (Bug 18718114)
 2014-12-11 21:27:54 +00:00
Winson Chung
47d9a58ce1 Merge "Fixing issue with old thumbnails on first launch of app. (Bug 18718114)" into lmp-mr1-dev 2014-12-11 21:20:42 +00:00
Joe Fernandez
a878256b59 am 81779694: am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs 
* commit '817796940bf79942ccd950cec47815039a2aa15e':
  docs: studio basics haxm updates
 2014-12-11 21:03:11 +00:00
Ricardo Cervera
575c8c9fcd am af7070e6: am 64d97cb2: am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs 
* commit 'af7070e6f0bb2b035b1d2565fdd50b6bde210864':
  docs: Fixes to watch faces docs.
 2014-12-11 21:03:06 +00:00
Rich Slogar
51f1c26b5b am 0564cee3: am b490f297: am 5c853c26: am d35216ad: Merge "docs: studio bundle update" into lmp-docs 
* commit '0564cee3c7537c916c74e560e2160b0f0657a9eb':
  docs: studio bundle update
 2014-12-11 21:02:44 +00:00
Joe Fernandez
cc08e619d6 am 07877955: am 5c518b7f: am b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs 
* commit '07877955bef2132ea5e8d02662a7f0ca1aad5f7d':
  docs: platform updates for api 21
 2014-12-11 21:02:37 +00:00
Joe Fernandez
11bccb1ebe am e3bac3bc: am b64545c8: am 378c71a3: am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs 
* commit 'e3bac3bc8f015a1ee8238fef7ca155fb432beb51':
  docs: sdk tools 24.0.1 revisions
 2014-12-11 21:02:32 +00:00
Andrew Solovay
fe967912fa am 13e0a650: am a97053fd: am f43c057c: am c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes" 
* commit '13e0a6505fd049a8df47aa8fa01b7c8c3120dea1':
  docs: Added info about managed profiles to "Android 5.0 Changes"
 2014-12-11 21:02:26 +00:00
Chih-hung Hsieh
d1aa67b8e1 am b0dd6d3a: am 4c23a0ec: Merge "Adjust format strings to work on both 32-bit and 64-bit builds" 
* commit 'b0dd6d3a8a7f11454239facf0ee9b2dd2390945e':
  Adjust format strings to work on both 32-bit and 64-bit builds
 2014-12-11 21:02:08 +00:00
Joe Fernandez
817796940b am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs 
* commit 'c9014b6d59cae3602027a5ea373d436a7e78b71c':
  docs: studio basics haxm updates
 2014-12-11 20:55:53 +00:00
Ricardo Cervera
af7070e6f0 am 64d97cb2: am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs 
* commit '64d97cb2ad6bfd10511067f178ba8a1ccf9ba452':
  docs: Fixes to watch faces docs.
 2014-12-11 20:55:49 +00:00
Rich Slogar
0564cee3c7 am b490f297: am 5c853c26: am d35216ad: Merge "docs: studio bundle update" into lmp-docs 
* commit 'b490f297101bcf31f56278d21d5f56a5e5998a58':
  docs: studio bundle update
 2014-12-11 20:55:45 +00:00
Joe Fernandez
07877955be am 5c518b7f: am b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs 
* commit '5c518b7f01345a414cd260db7762bdb0aa73b55b':
  docs: platform updates for api 21
 2014-12-11 20:55:35 +00:00
Joe Fernandez
e3bac3bc8f am b64545c8: am 378c71a3: am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs 
* commit 'b64545c83a526d17ccbce2d110a06f3789dd4ad8':
  docs: sdk tools 24.0.1 revisions
 2014-12-11 20:55:29 +00:00
Andrew Solovay
13e0a6505f am a97053fd: am f43c057c: am c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes" 
* commit 'a97053fd0ba37feb7382fd30498a6a5e93c52a9e':
  docs: Added info about managed profiles to "Android 5.0 Changes"
 2014-12-11 20:55:23 +00:00
Chih-hung Hsieh
b0dd6d3a8a am 4c23a0ec: Merge "Adjust format strings to work on both 32-bit and 64-bit builds" 
* commit '4c23a0ec161891a1248b7aea67fbfd1d00bbd199':
  Adjust format strings to work on both 32-bit and 64-bit builds
 2014-12-11 20:54:56 +00:00
Chih-hung Hsieh
4c23a0ec16 Merge "Adjust format strings to work on both 32-bit and 64-bit builds" 2014-12-11 20:49:30 +00:00
Winson Chung
0eae5573b5 Fixing issue with old thumbnails on first launch of app. (Bug 18718114) 
Ensure that we always update the thumbnail for the running task, in addition, we
need to be ignoring the running task when doing background preloading since it
will be invalidated anyways.

Change-Id: Ie4f9862dddc29aa71a44e94bbd036c7712487eed
 2014-12-11 12:24:41 -08:00
Joe Fernandez
c9014b6d59 am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs 
* commit 'ea500a3adf6bcf17ad22f05acd8c3220358f72ce':
  docs: studio basics haxm updates
 2014-12-11 19:59:00 +00:00
Ruben Brunk
81b381b82e am f6ed526b: Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev 
* commit 'f6ed526b3a02bac9c5912a9655e5890f332cefc6':
  camera2: Fix LEGACY YUV production and orientation.
 2014-12-11 19:55:02 +00:00
Joe Fernandez
ea500a3adf am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs 
* commit '0aa234457737cdb31538711251920aef3a70bb56':
  docs: studio basics haxm updates
 2014-12-11 19:50:39 +00:00
Ruben Brunk
f6ed526b3a Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev 2014-12-11 19:48:37 +00:00
Ricardo Cervera
64d97cb2ad am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs 
* commit '6621a4f6f9c63ff952c5e64a5ae1e41ef5ac5960':
  docs: Fixes to watch faces docs.
 2014-12-11 19:43:25 +00:00
Joe Fernandez
0aa2344577 Merge "docs: studio basics haxm updates" into lmp-docs 2014-12-11 19:43:18 +00:00
Ruben Brunk
433e715cc0 camera2: Fix LEGACY YUV production and orientation. 
Bug: 18486140
Change-Id: I119e57315b67d1f485bea7f1682bfc261ae0f934
 2014-12-11 11:35:46 -08:00
Ricardo Cervera
6621a4f6f9 am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs 
* commit '9fe34d9037dc27abb89c64ff75b87fdf9a4eaa8b':
  docs: Fixes to watch faces docs.
 2014-12-11 19:35:41 +00:00
Ricardo Cervera
9fe34d9037 Merge "docs: Fixes to watch faces docs." into lmp-docs 2014-12-11 19:28:41 +00:00