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

171912 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cheuksan Wang
2045d5f3a2 am f1b64b4b: am e8ea1645: Merge "remove actions and calls for the old sms/mms api BUG: 18005911" into lmp-mr1-dev 
* commit 'f1b64b4bb8300d2079696ff0d70cce16eda2be4e':
  remove actions and calls for the old sms/mms api BUG: 18005911
 2014-12-17 20:51:09 +00:00
Cheuksan Wang
f1b64b4bb8 am e8ea1645: Merge "remove actions and calls for the old sms/mms api BUG: 18005911" into lmp-mr1-dev 
* commit 'e8ea164596b3ab2309d7b99fa52aecd056e50e24':
  remove actions and calls for the old sms/mms api BUG: 18005911
 2014-12-17 20:45:03 +00:00
Cheuksan Wang
e8ea164596 Merge "remove actions and calls for the old sms/mms api BUG: 18005911" into lmp-mr1-dev 2014-12-17 20:38:09 +00:00
John Spurlock
09ab7d0663 am caba3603: am e7f301a0: Merge "Audio policy: Fix deprecated shouldVibrate api." into lmp-mr1-dev 
* commit 'caba360367ea9900a48066f97f4b6e59877a9df6':
  Audio policy: Fix deprecated shouldVibrate api.
 2014-12-17 20:23:55 +00:00
John Spurlock
caba360367 am e7f301a0: Merge "Audio policy: Fix deprecated shouldVibrate api." into lmp-mr1-dev 
* commit 'e7f301a05344376f9065ef09e3b3ef360469bcb3':
  Audio policy: Fix deprecated shouldVibrate api.
 2014-12-17 20:18:03 +00:00
John Spurlock
e7f301a053 Merge "Audio policy: Fix deprecated shouldVibrate api." into lmp-mr1-dev 2014-12-17 20:13:02 +00:00
smain@google.com
2dbb8e13de am 2448afdb: am 48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145" into lmp-docs automerge: b834c72 automerge: 2a53e24 automerge: c6de288 
* commit '2448afdb729bfab4c9e2ac8af124870fd5929a08':
  make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145
 2014-12-17 20:06:02 +00:00
smain@google.com
2448afdb72 am 48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145" into lmp-docs automerge: b834c72 automerge: 2a53e24 
automerge: c6de288

* commit 'c6de288eabfcb6b3623fb6a6c3dba1071d7e0c78':
  make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145
 2014-12-17 20:00:48 +00:00
smain@google.com
c6de288eab am 48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145" into lmp-docs automerge: b834c72 
automerge: 2a53e24

* commit '2a53e24e10654b7f5667899c8a110ef6742c79e3':
  make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145
 2014-12-17 19:57:42 +00:00
Elliott Hughes
8b3df1f971 am a1beb930: am e6d63b94: Merge "Rewrite selectReadable JNI in Java." 
* commit 'a1beb930f59ae88f4386726cdf3a7e5986bd74e1':
  Rewrite selectReadable JNI in Java.
 2014-12-17 19:42:08 +00:00
Jorim Jaggi
3a70523eb6 am 4a5129c8: am c3059b44: Merge "Fix colored icons in doze mode" into lmp-mr1-dev 
* commit '4a5129c83b92e7ae198f4b9a3018c8cdcba5dd86':
  Fix colored icons in doze mode
 2014-12-17 19:10:43 +00:00
Jorim Jaggi
4a5129c83b am c3059b44: Merge "Fix colored icons in doze mode" into lmp-mr1-dev 
* commit 'c3059b444fbd30b1344cd5ee3c7030d1e9e5c408':
  Fix colored icons in doze mode
 2014-12-17 19:04:42 +00:00
Nicolas Prevot
237637e22b am f2bd50b2: Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1-dev 
automerge: 47cbcd7

* commit '47cbcd7740739796aef113646861ff7e79439a9c':
  Fix the doc of addCrossProfileIntentFilter.
 2014-12-17 19:01:18 +00:00
Jorim Jaggi
c3059b444f Merge "Fix colored icons in doze mode" into lmp-mr1-dev 2014-12-17 18:59:40 +00:00
Nicolas Prevot
47cbcd7740 am f2bd50b2: Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1-dev 
* commit 'f2bd50b2ec0e5d7a25694170e0dc1363465fd24e':
  Fix the doc of addCrossProfileIntentFilter.
 2014-12-17 18:58:26 +00:00
Jorim Jaggi
92df1f2758 Fix colored icons in doze mode 
Also fixes the issue that small icons promoted to large icons were
not forced to be white, which lead to inconsistent treatment of the
icons.

Bug: 18537470

Change-Id: Ic35e082da12793f3f13c91740bfc345b336c3db4
 2014-12-17 19:57:45 +01:00
Nicolas Prevot
f2bd50b2ec Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1-dev 2014-12-17 18:54:55 +00:00
Paul Jensen
c266f62fd9 am eece3339: Merge "Show broken lock image when SSL errors are encountered in CaptivePortalLogin." into lmp-mr1-dev automerge: ee8feae 
* commit 'eece33395561fff249afc96749cd69a21c28fbac':
  Show broken lock image when SSL errors are encountered in CaptivePortalLogin.
 2014-12-17 18:43:36 +00:00
Paul Jensen
eece333955 Merge "Show broken lock image when SSL errors are encountered in CaptivePortalLogin." into lmp-mr1-dev 
automerge: ee8feae

* commit 'ee8feae5d4624e6759e264cc80eac28b0d0af20f':
  Show broken lock image when SSL errors are encountered in CaptivePortalLogin.
 2014-12-17 18:36:31 +00:00
Paul Jensen
ee8feae5d4 Merge "Show broken lock image when SSL errors are encountered in CaptivePortalLogin." into lmp-mr1-dev 2014-12-17 18:34:57 +00:00
Elliott Hughes
a1beb930f5 am e6d63b94: Merge "Rewrite selectReadable JNI in Java." 
* commit 'e6d63b94627d0072ff1468feca71698df1a0b64e':
  Rewrite selectReadable JNI in Java.
 2014-12-17 18:26:33 +00:00
Elliott Hughes
e6d63b9462 Merge "Rewrite selectReadable JNI in Java." 2014-12-17 18:21:06 +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
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
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
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
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
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
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