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

178690 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
7dfbafd8b3 am 6d41504d: Merge "Move frameworks users over to libcore hex encoding API." automerge: 681e6df1 
automerge: 25c29c1

* commit '25c29c19474e5cb359473d3d36fdb1eddb90f50b':
  Move frameworks users over to libcore hex encoding API.
 2014-12-17 18:17:01 +00:00
Narayan Kamath
25c29c1947 am 6d41504d: Merge "Move frameworks users over to libcore hex encoding API." 
automerge: 681e6df1

* commit '681e6df1221ca7671f574d368d428f62184448b0':
  Move frameworks users over to libcore hex encoding API.
 2014-12-17 18:14:00 +00:00
smain@google.com
2a53e24e10 am 48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145" into lmp-docs 
automerge: b834c72

* commit 'b834c72e61943fda18153bb42b3c8bd80d604b0b':
  make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145
 2014-12-17 18:03:39 +00:00
Geoff Mendal
fbe0278d6a am 8b282e7e: (-s ours) am 525833be: (-s ours) am 296aa925: (-s ours) Import translations. DO NOT MERGE automerge: 43741a8 -s ours 
* commit '8b282e7e06858cf263e9e7a483efedf5f3eaa7a3':
  Import translations. DO NOT MERGE
 2014-12-17 18:02:27 +00:00
Christoph Studer
ec03f1fdc0 am 7d479736: am 3c0abd40: am e326af3c: am 3eff1e1f: am 92c411b2: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs automerge: 4328588 
* commit '7d4797361f446357f0c55b60955f8cb70311c8fb':
  Fix MediaStyle docs mentioning 2 max actions in compact view
 2014-12-17 18:02:23 +00:00
Joe Fernandez
aca5182e4c am ab23dec3: am fa7d86a1: am e8ce10da: am 6ff265cc: am df916a89: Merge "docs: studio revision 21 update" into lmp-docs automerge: ca27fb9 
* commit 'ab23dec39e0e73c46a2c4fa1aa27924e04b08ecd':
  docs: studio revision 21 update
 2014-12-17 18:02:18 +00:00
Joe Fernandez
da915f1c30 am e117fcb6: am 425663b5: am f9ea93cd: am 80287e76: Merge "docs: studio tools help monkey update" into lmp-docs automerge: e479dc2 automerge: c79d5e2 
* commit 'e117fcb62239d5fe33f322b887b445f761eb9c4e':
  docs: studio tools help monkey update
 2014-12-17 18:02:14 +00:00
Geoff Mendal
8b282e7e06 am 525833be: (-s ours) am 296aa925: (-s ours) Import translations. DO NOT MERGE automerge: 43741a8 -s ours 
* commit '525833bea31390ba3e7f72839e547b705080e4c5':
  Import translations. DO NOT MERGE
 2014-12-17 18:00:07 +00:00
smain@google.com
b834c72e61 am 48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145" into lmp-docs 
* commit '4842228377a292698b232f18706ce54cb7f7cc32':
  make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145
 2014-12-17 17:59:00 +00:00
Geoff Mendal
9d91f563d8 Merge "Import translations. DO NOT MERGE" 2014-12-17 17:57:50 +00:00
Christoph Studer
7d4797361f am 3c0abd40: am e326af3c: am 3eff1e1f: am 92c411b2: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs automerge: 4328588 
* commit '3c0abd408797a960f29575fe173011b87dc4ddf3':
  Fix MediaStyle docs mentioning 2 max actions in compact view
 2014-12-17 17:55:52 +00:00
Joe Fernandez
099e49872c am 09d6ed50: am a5142ca4: am 85787187: am b8e29d01: am 740436b6: Merge "docs: help-adt link updates" into lmp-docs automerge: 9381301 
* commit '09d6ed50a7e470c8f2b63736a66ceed11f9cbd49':
  docs: help-adt link updates
 2014-12-17 17:55:47 +00:00
Joe Fernandez
ab23dec39e am fa7d86a1: am e8ce10da: am 6ff265cc: am df916a89: Merge "docs: studio revision 21 update" into lmp-docs automerge: ca27fb9 
* commit 'fa7d86a115f6c0afaf7708a936918e16cfc3aa0a':
  docs: studio revision 21 update
 2014-12-17 17:55:45 +00:00
Sungsoo Lim
2ccbdf806d am a8a982b0: am c5023948: am 47aafcd6: am 31d592dc: am cd45de8b: Missing Javadoc update while API review automerge: d0b09b0 
* commit 'a8a982b05460c8a037bdcdf8e4a0eb252eaec8b6':
  Missing Javadoc update while API review
 2014-12-17 17:55:43 +00:00
Joe Fernandez
e117fcb622 am 425663b5: am f9ea93cd: am 80287e76: Merge "docs: studio tools help monkey update" into lmp-docs automerge: e479dc2 automerge: c79d5e2 
* commit '425663b5a019fc55e4347c19f7a36d771b516b15':
  docs: studio tools help monkey update
 2014-12-17 17:55:39 +00:00
Christopher Tate
b7e2c850d9 am 170ec7af: am 6f3be111: am 52ab8613: am 5c3e277f: Fix bad alarm delivery automerge: be3206e 
* commit '170ec7af9e812bb1079490616e941973ab2f2d11':
  Fix bad alarm delivery
 2014-12-17 17:55:38 +00:00
Nicolas Prevot
fc7b444462 Fix the doc of addCrossProfileIntentFilter. 
Mention that cross-profile-intent-filters only work for activity intents.

BUG:18776618

Change-Id: I209d1e38641b4ae84b682a2525e6ddae603a71f9
 2014-12-17 17:55:08 +00:00
Geoff Mendal
525833bea3 am 296aa925: (-s ours) Import translations. DO NOT MERGE automerge: 43741a8 -s ours 
* commit '296aa925171b27a87b427575a9a462dc8a8620b2':
  Import translations. DO NOT MERGE
 2014-12-17 17:54:19 +00:00
smain@google.com
4842228377 Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145" into lmp-docs 2014-12-17 17:52:08 +00:00
Geoff Mendal
4ab1dfa9b7 Import translations. DO NOT MERGE 
Change-Id: Ic380112c6561c7fe42819ba12c6936f72d78a3c0
Auto-generated-cl: translation import
 2014-12-17 09:51:28 -08:00
smain@google.com
58bd02739e make hidden text hidden with negative indent to avoid horizontal scroll 
bug: 18721145

Change-Id: I6efe51071d9d93697f1412243468353cd0c6d166
 2014-12-17 09:50:26 -08:00
Christoph Studer
3c0abd4087 am e326af3c: am 3eff1e1f: am 92c411b2: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs automerge: 4328588 
* commit 'e326af3cdba9f8e2a1a8626dc48524410d84e6fa':
  Fix MediaStyle docs mentioning 2 max actions in compact view
 2014-12-17 17:50:04 +00:00
Joe Fernandez
fa7d86a115 am e8ce10da: am 6ff265cc: am df916a89: Merge "docs: studio revision 21 update" into lmp-docs automerge: ca27fb9 
* commit 'e8ce10dac8db89387d83554a8e3909cec560536a':
  docs: studio revision 21 update
 2014-12-17 17:49:59 +00:00
Joe Fernandez
09d6ed50a7 am a5142ca4: am 85787187: am b8e29d01: am 740436b6: Merge "docs: help-adt link updates" into lmp-docs automerge: 9381301 
* commit 'a5142ca4d488fa216342213784df61b2e090cacb':
  docs: help-adt link updates
 2014-12-17 17:49:47 +00:00
Sungsoo Lim
a8a982b054 am c5023948: am 47aafcd6: am 31d592dc: am cd45de8b: Missing Javadoc update while API review automerge: d0b09b0 
* commit 'c502394816412baf0aca28597025ecc397e14b97':
  Missing Javadoc update while API review
 2014-12-17 17:49:41 +00:00
Christopher Tate
170ec7af9e am 6f3be111: am 52ab8613: am 5c3e277f: Fix bad alarm delivery automerge: be3206e 
* commit '6f3be11181b3c6ad020470228a87da64668a1605':
  Fix bad alarm delivery
 2014-12-17 17:49:36 +00:00
Joe Fernandez
425663b5a0 am f9ea93cd: am 80287e76: Merge "docs: studio tools help monkey update" into lmp-docs automerge: e479dc2 
automerge: c79d5e2

* commit 'c79d5e29de3ba4259e3c87650c77c3e87507cab0':
  docs: studio tools help monkey update
 2014-12-17 17:48:33 +00:00
Geoff Mendal
296aa92517 Import translations. DO NOT MERGE 
automerge: 43741a8  -s ours

* commit '43741a8c8371e3a473794cc2d2a81dda777e8724':
  Import translations. DO NOT MERGE
 2014-12-17 17:45:09 +00:00
Joe Fernandez
a5142ca4d4 am 85787187: am b8e29d01: am 740436b6: Merge "docs: help-adt link updates" into lmp-docs automerge: 9381301 
* commit '85787187fca274303412a48e1fa91f7e7388ce94':
  docs: help-adt link updates
 2014-12-17 17:44:30 +00:00
Sungsoo Lim
c502394816 am 47aafcd6: am 31d592dc: am cd45de8b: Missing Javadoc update while API review automerge: d0b09b0 
* commit '47aafcd66c9c703fcfd301ec850e433f40e4b190':
  Missing Javadoc update while API review
 2014-12-17 17:44:25 +00:00
Christopher Tate
6f3be11181 am 52ab8613: am 5c3e277f: Fix bad alarm delivery automerge: be3206e 
* commit '52ab8613ea2556ad9dd5c786e0cf43eb5a4e24c9':
  Fix bad alarm delivery
 2014-12-17 17:44:21 +00:00
Christoph Studer
e326af3cdb am 3eff1e1f: am 92c411b2: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs 
automerge: 4328588

* commit '4328588cb532571c3b11867048d0972ff2e4d969':
  Fix MediaStyle docs mentioning 2 max actions in compact view
 2014-12-17 17:43:33 +00:00
Joe Fernandez
e8ce10dac8 am 6ff265cc: am df916a89: Merge "docs: studio revision 21 update" into lmp-docs 
automerge: ca27fb9

* commit 'ca27fb9711f24df8b88a41c8a360f57c7252ba79':
  docs: studio revision 21 update
 2014-12-17 17:42:19 +00:00
Joe Fernandez
c79d5e29de am f9ea93cd: am 80287e76: Merge "docs: studio tools help monkey update" into lmp-docs 
automerge: e479dc2

* commit 'e479dc219ff4d289105e32264c1fa66187aa5555':
  docs: studio tools help monkey update
 2014-12-17 17:40:58 +00:00
Joe Fernandez
85787187fc am b8e29d01: am 740436b6: Merge "docs: help-adt link updates" into lmp-docs 
automerge: 9381301

* commit '93813012c0be63a4cbcdf9e076323fd4afd6dfb7':
  docs: help-adt link updates
 2014-12-17 17:39:45 +00:00
Sungsoo Lim
47aafcd66c am 31d592dc: am cd45de8b: Missing Javadoc update while API review 
automerge: d0b09b0

* commit 'd0b09b04b8c2bf666b15fcc1c496d6ab33c44a86':
  Missing Javadoc update while API review
 2014-12-17 17:37:53 +00:00
Christopher Tate
52ab8613ea am 5c3e277f: Fix bad alarm delivery 
automerge: be3206e

* commit 'be3206ecdce7aead184e8939a29ac7dd5f91931e':
  Fix bad alarm delivery
 2014-12-17 17:36:46 +00:00
John Spurlock
57627794b6 Audio policy: Fix deprecated shouldVibrate api. 
And apply zen mode immediately to avoid race conditions
in tests.

Bug: 18702149
Change-Id: Iad156a29b9e6a5998e7c2dafa8b79a71447066f9
 2014-12-17 12:34:00 -05:00
Geoff Mendal
831969a225 am 3c58e4ca: (-s ours) am 2e2fd473: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '3c58e4ca2c01dce84d3a89a40d2de7569ba87fe3':
  Import translations. DO NOT MERGE
 2014-12-17 16:38:07 +00:00
Geoff Mendal
3c58e4ca2c am 2e2fd473: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '2e2fd473be7a8ebb6392643812eb9119c402cbbb':
  Import translations. DO NOT MERGE
 2014-12-17 16:31:49 +00:00
Geoff Mendal
2e2fd473be Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-17 16:25:14 +00:00
Geoff Mendal
43741a8c83 Import translations. DO NOT MERGE 
Change-Id: Ib24cc684af4d1674eef4cffb4232517416f1b9b2
Auto-generated-cl: translation import
 2014-12-17 07:43:53 -08:00
Geoff Mendal
2a68115a48 Import translations. DO NOT MERGE 
Change-Id: I9e2ca7deb58492b7f2271715536eaaa945d21ec2
Auto-generated-cl: translation import
 2014-12-17 07:39:09 -08:00
Geoff Mendal
a79f074b76 am d1b3f15b: (-s ours) am 13f57b84: (-s ours) am 0de82370: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'd1b3f15b4a9dcd23388ca1ae6793639fa5fcf216':
  Import translations. DO NOT MERGE
 2014-12-17 15:38:33 +00:00
Geoff Mendal
d1b3f15b4a am 13f57b84: (-s ours) am 0de82370: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '13f57b848c99a9dc3535a13059d50e421a9f6697':
  Import translations. DO NOT MERGE
 2014-12-17 15:33:28 +00:00
Christoph Studer
58d080e1a2 am f3528480: am 1464dd2f: am 0b22e395: Merge "Notification: Fix bigLargeIcon" into lmp-mr1-dev 
* commit 'f35284804b4f04b91d772b913d9a6ae1c8a5f65a':
  Notification: Fix bigLargeIcon
 2014-12-17 15:30:02 +00:00
Geoff Mendal
13f57b848c am 0de82370: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '0de823704d94d9e9e5cceccf4573afed4fd66b28':
  Import translations. DO NOT MERGE
 2014-12-17 15:28:03 +00:00
Christoph Studer
f35284804b am 1464dd2f: am 0b22e395: Merge "Notification: Fix bigLargeIcon" into lmp-mr1-dev 
* commit '1464dd2f925f4b6179a7ede287f13431e6835aec':
  Notification: Fix bigLargeIcon
 2014-12-17 15:23:48 +00:00
Geoff Mendal
0de823704d Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-17 15:22:30 +00:00
Geoff Mendal
e333ef546e Import translations. DO NOT MERGE 
Change-Id: I52f334af6fd23d7e74c142dafe7bb431604602e5
Auto-generated-cl: translation import
 2014-12-17 07:18:42 -08:00