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

116852 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Koch
66e47c5fec am 0c5268c3: am be0b05a0: Merge "Doc fix: add more detail to BitmapFactory.Options.inPurgeable flag. Bug: 6064760" into klp-dev 
* commit '0c5268c3595ca029919df55453a2607cca06b361':
  Doc fix: add more detail to BitmapFactory.Options.inPurgeable flag. Bug: 6064760
 2013-11-05 17:44:03 -08:00
Adam Koch
0c5268c359 am be0b05a0: Merge "Doc fix: add more detail to BitmapFactory.Options.inPurgeable flag. Bug: 6064760" into klp-dev 
* commit 'be0b05a028ebc1b49ed32b79d53af384106c31a3':
  Doc fix: add more detail to BitmapFactory.Options.inPurgeable flag. Bug: 6064760
 2013-11-05 17:15:23 -08:00
Adam Koch
be0b05a028 Merge "Doc fix: add more detail to BitmapFactory.Options.inPurgeable flag. Bug: 6064760" into klp-dev 2013-11-06 01:13:44 +00:00
Dirk Dougherty
813ff58aba am 4ef4d898: resolved conflicts for merge of 790f9183 to klp-ub-dev 
* commit '4ef4d898f6adc1b8dbabc4178b981567d6f377b2':
 2013-11-05 16:49:03 -08:00
Robert Greenwalt
146c90edaa am 5ce5c9bc: am 4653837b: Merge "Add config var for single-pdn devices/networks." into klp-dev 
* commit '5ce5c9bcc5e10488bf3b2e75722076322e82dedf':
  Add config var for single-pdn devices/networks.
 2013-11-05 16:30:26 -08:00
Dirk Dougherty
4ef4d898f6 resolved conflicts for merge of 790f9183 to klp-ub-dev 
Change-Id: I11c97db0ef83f59d629fb9406bb0e240714e5f89
 2013-11-05 16:17:27 -08:00
Joe Fernandez
dc63495cba am 1bf47874: resolved conflicts for merge of 559a00ad to klp-ub-dev 
* commit '1bf478743eeb0d33721f0f5bede004070a5bc70d':
 2013-11-05 16:10:05 -08:00
Robert Greenwalt
5ce5c9bcc5 am 4653837b: Merge "Add config var for single-pdn devices/networks." into klp-dev 
* commit '4653837b78b7da950e7827598baabc79be1aa4ca':
  Add config var for single-pdn devices/networks.
 2013-11-05 16:00:15 -08:00
Robert Greenwalt
4653837b78 Merge "Add config var for single-pdn devices/networks." into klp-dev 2013-11-05 23:58:07 +00:00
Joe Fernandez
bcaebf02a3 am 81dec975: resolved conflicts for merge of 43730d47 to klp-ub-dev 
* commit '81dec975e49a0bd4b51e7203a6da993252e6cd0a':
 2013-11-05 15:49:51 -08:00
Joe Fernandez
dc70a59e96 am 425c9e0e: am 61a7ee53: docs: SDK-ADT 22.3 RC5 - updated signatures 
* commit '425c9e0e653f3612b68baa3e0200e7faae11550c':
 2013-11-05 15:49:22 -08:00
Joe Fernandez
3907a1efc2 am 03b459c4: am b501da92: docs: NDK r9b Release Notes 
* commit '03b459c4feabe5c10585f0b28b5f34e55a0deff6':
 2013-11-05 15:49:18 -08:00
Joe Fernandez
a3037c1ba4 am edb154b5: am fbdd0280: docs: Add screenrecord command to adb docs 
* commit 'edb154b539eb03d5d90440e847c18317057d2c3a':
 2013-11-05 15:49:15 -08:00
Scott Main
b0a9adc862 am 4cceab2d: am ef765bda: add filler version of sidenav that will be removed by javascript. This is simply to reduce the perceived load time, which was previously high because the sidenav was mostly empty. 
* commit '4cceab2daf3ef4dd3e356fd7ac26dac12f52ab10':
 2013-11-05 15:49:12 -08:00
Joe Fernandez
1bf478743e resolved conflicts for merge of 559a00ad to klp-ub-dev 
Change-Id: I938f7fe6bcf927ceaeac9b270b8f6b023b21ac91
 2013-11-05 15:31:22 -08:00
Joe Fernandez
81dec975e4 resolved conflicts for merge of 43730d47 to klp-ub-dev 
Change-Id: Iddf9c792ff86a1db2c882f3d53d7d05e00261fe9
 2013-11-05 15:21:32 -08:00
Vineeta Srivastava
e6d7490520 am aee87dd2: am 65d4a84b: Merge "Setting Tethering profile for specific network" into klp-dev 
* commit 'aee87dd202e5b9767ec7a36b824bd28a3b6d37e8':
  Setting Tethering profile for specific network
 2013-11-05 13:57:05 -08:00
John Spurlock
633626a096 am 6e0b89a5: am 47c46dd5: Merge "Battery icon tweaks." into klp-dev 
* commit '6e0b89a5a035fc7759714c9323d381a4cf7be3d4':
  Battery icon tweaks.
 2013-11-05 13:57:01 -08:00
Jeff Sharkey
2b80a35cb5 am f5073e71: am 5f4affda: Merge "Clarify DocumentsProvider recents behavior." into klp-dev 
* commit 'f5073e71c2d5d124865d01ad9343793f6fcf620c':
  Clarify DocumentsProvider recents behavior.
 2013-11-05 13:56:58 -08:00
John Spurlock
2237f9f3d4 am eaf393bc: am a90f8160: Merge "Enable translucent system bars on the lockscreen by default." into klp-dev 
* commit 'eaf393bc948514409216aabde2048081c27584e9':
  Enable translucent system bars on the lockscreen by default.
 2013-11-05 13:56:55 -08:00
Jeff Sharkey
0e6e465eca am 4967a11f: am 74b0f5ac: Merge "Let Shell modify secondary external storage." into klp-dev 
* commit '4967a11f8c7d166e3c39fe1c1fd75dec41901eec':
  Let Shell modify secondary external storage.
 2013-11-05 13:56:51 -08:00
Christopher Tate
681e015061 am 0505ebbc: am 8869d6f3: Merge "Extend preferred-app preload support for complex resolutions" into klp-dev 
* commit '0505ebbcbe539820d434b924a76e8b9932f8862e':
  Extend preferred-app preload support for complex resolutions
 2013-11-05 13:56:38 -08:00
Dianne Hackborn
0a3a387a46 am 6d61faad: am d64744cc: Merge "Help out with issue #11497149: Clock app crashes when opened during..." into klp-dev 
* commit '6d61faad436f3bae41c6008ffe3e03a19eb4c277':
  Help out with issue #11497149: Clock app crashes when opened during...
 2013-11-05 13:56:23 -08:00
Joe Fernandez
425c9e0e65 am 61a7ee53: docs: SDK-ADT 22.3 RC5 - updated signatures 
* commit '61a7ee53eb33b299565c426304dd2bc8b8d7254c':
  docs: SDK-ADT 22.3 RC5 - updated signatures
 2013-11-05 21:30:11 +00:00
Joe Fernandez
03b459c4fe am b501da92: docs: NDK r9b Release Notes 
* commit 'b501da92779efe8b5fe0d5aa63f1e7f6c92f1b78':
  docs: NDK r9b Release Notes
 2013-11-05 21:30:11 +00:00
Joe Fernandez
edb154b539 am fbdd0280: docs: Add screenrecord command to adb docs 
* commit 'fbdd028055ad0f6ef613466f44bc99e1d7c14e76':
  docs: Add screenrecord command to adb docs
 2013-11-05 21:30:10 +00:00
Scott Main
4cceab2daf am ef765bda: add filler version of sidenav that will be removed by javascript. This is simply to reduce the perceived load time, which was previously high because the sidenav was mostly empty. 
* commit 'ef765bdaf42dfd9d30303b44dd7b614e6d631701':
  add filler version of sidenav that will be removed by javascript. This is simply to reduce the perceived load time, which was previously high because the sidenav was mostly empty.
 2013-11-05 21:30:09 +00:00
Baligh Uddin
0ada814a36 am 63c0e12b: (-s ours) am 41c3cb38: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '63c0e12ba03e6aba207cf006d2a883343553b399':
  Import translations. DO NOT MERGE
 2013-11-05 13:27:23 -08:00
Baligh Uddin
05c18ae06f am 13b204f8: (-s ours) am 48557d6d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '13b204f82b098e06c7f13a1c67bec702c63c1a28':
  Import translations. DO NOT MERGE
 2013-11-05 13:27:20 -08:00
Baligh Uddin
8ecf2307ac am 584b1cc0: (-s ours) am 0bdaa9a5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '584b1cc07324244e2b1c1f0013a8a67b4a87fa04':
  Import translations. DO NOT MERGE
 2013-11-05 13:27:16 -08:00
Baligh Uddin
6574caab31 am cfc26fae: (-s ours) am 17e8f437: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'cfc26faeed96a10d9b93fab10cce0e9fc2fb25a1':
  Import translations. DO NOT MERGE
 2013-11-05 13:27:14 -08:00
Baligh Uddin
576e780b8e am 79cfdb20: (-s ours) am b8ea1228: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '79cfdb20be13e424089849a92c49516bfe785c90':
  Import translations. DO NOT MERGE
 2013-11-05 13:27:11 -08:00
Baligh Uddin
124f38f117 am 7f4cf0da: (-s ours) am 6a2ab888: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '7f4cf0daeb7fa3311a05afe23c1615cba399242c':
  Import translations. DO NOT MERGE
 2013-11-05 13:27:07 -08:00
Baligh Uddin
411a26f2c4 am ed7d19e3: (-s ours) am 73b06973: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'ed7d19e35cc4143af9e29bb09fc9f76ffe55c823':
  Import translations. DO NOT MERGE
 2013-11-05 13:27:04 -08:00
Craig Mautner
883327d862 am efc9acf5: am 2722d79f: Merge "Remove harmful visibility test." into klp-dev 
* commit 'efc9acf5a64558889740d0c717d40f830254245e':
  Remove harmful visibility test.
 2013-11-05 13:26:56 -08:00
John Spurlock
194ff90c2b am 802e04c1: am a89727c8: Merge "Ensure wallpaper hint is at least the display\'s max size." into klp-dev 
* commit '802e04c13f844b5ad1a257cc9f3808a0b78ceaba':
  Ensure wallpaper hint is at least the display's max size.
 2013-11-05 13:26:53 -08:00
Svetoslav
05d15b36bf am 3976afb5: am c445b3f2: Merge "Add missing null pointer check in PrintSpoolerService." into klp-dev 
* commit '3976afb5ac2036864f8d75c26e144c5761c6b20c':
  Add missing null pointer check in PrintSpoolerService.
 2013-11-05 13:26:44 -08:00
Svetoslav
d4879eec5f am 628264c4: am 4033c94b: Merge "Add way for the user to forget previously used printers." into klp-dev 
* commit '628264c4f3828e0c4c997bb91f289a91d54c75c4':
  Add way for the user to forget previously used printers.
 2013-11-05 13:26:40 -08:00
Jim Miller
39724755a5 am 6bb4af27: am e19ed435: Merge "Add explicit refererences and logging to KeyguardSim/Puk" into klp-dev 
* commit '6bb4af273fde7c486f321c4ecdc7395acd6d0490':
  Add explicit refererences and logging to KeyguardSim/Puk
 2013-11-05 13:26:36 -08:00
Adam Koch
e1693df494 Doc fix: add more detail to BitmapFactory.Options.inPurgeable flag. 
Bug: 6064760

Change-Id: I3fd833a3205be451ff6548fab3555d170c9c570e
 2013-11-05 16:00:09 -05:00
Vineeta Srivastava
aee87dd202 am 65d4a84b: Merge "Setting Tethering profile for specific network" into klp-dev 
* commit '65d4a84b980583e068dd21bf11e5fe034df8d7ef':
  Setting Tethering profile for specific network
 2013-11-05 12:53:22 -08:00
John Spurlock
6e0b89a5a0 am 47c46dd5: Merge "Battery icon tweaks." into klp-dev 
* commit '47c46dd56dc0414ebf6220481f04cc8767268b5c':
  Battery icon tweaks.
 2013-11-05 12:53:19 -08:00
Vineeta Srivastava
65d4a84b98 Merge "Setting Tethering profile for specific network" into klp-dev 2013-11-05 20:50:09 +00:00
Jeff Sharkey
f5073e71c2 am 5f4affda: Merge "Clarify DocumentsProvider recents behavior." into klp-dev 
* commit '5f4affdab8ff25d3657075a0b3ae10697aae77da':
  Clarify DocumentsProvider recents behavior.
 2013-11-05 12:49:49 -08:00
John Spurlock
47c46dd56d Merge "Battery icon tweaks." into klp-dev 2013-11-05 20:48:42 +00:00
John Spurlock
eaf393bc94 am a90f8160: Merge "Enable translucent system bars on the lockscreen by default." into klp-dev 
* commit 'a90f816048604538cc25d3b8848ac263761175b4':
  Enable translucent system bars on the lockscreen by default.
 2013-11-05 12:46:15 -08:00
Jeff Sharkey
4967a11f8c am 74b0f5ac: Merge "Let Shell modify secondary external storage." into klp-dev 
* commit '74b0f5acdfaa64afc27ba440883a8d1ead07f999':
  Let Shell modify secondary external storage.
 2013-11-05 12:46:11 -08:00
Jeff Sharkey
5f4affdab8 Merge "Clarify DocumentsProvider recents behavior." into klp-dev 2013-11-05 20:46:11 +00:00
John Spurlock
a90f816048 Merge "Enable translucent system bars on the lockscreen by default." into klp-dev 2013-11-05 20:45:15 +00:00
Jeff Sharkey
74b0f5acdf Merge "Let Shell modify secondary external storage." into klp-dev 2013-11-05 20:44:09 +00:00