Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,611 Commits 3 Branches 0 Tags
c56cd34dcafe0d854a3a2b234a32cf859708f1df
Commit Graph

176611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
5ecbfeb38b Always update date picker position after change in range 
BUG: 18204507
Change-Id: Id3ae11cdb68f60901a3145ebd93f3acbbccd71d2
 2014-11-03 18:31:36 -08:00
Baligh Uddin
c4a072214c am e4ef64da: (-s ours) am dc9dc7fa: (-s ours) am aa816de4: (-s ours) Import translations. DO NOT MERGE automerge: 07dd521 -s ours automerge: ecd9daa -s ours 
* commit 'e4ef64da702e65719ecf172c9f2bdb3dacc867de':
  Import translations. DO NOT MERGE
 2014-11-04 02:28:43 +00:00
Nancy Chen
4741ceefc2 am 4f03fa90: am bff9a23a: am f9503019: Merge "Adn queries for multi-SIM. (2/3)" into lmp-mr1-dev 
* commit '4f03fa903b6ce4ece24b113e0a9440746445a378':
  Adn queries for multi-SIM. (2/3)
 2014-11-04 02:28:24 +00:00
Dianne Hackborn
41ca024387 am 726715e1: am e6fa3f44: am d1f1ea76: Merge "Few more small meminfo improvements." into lmp-mr1-dev 
* commit '726715e1138d880656a13014d447a14b3998b132':
  Few more small meminfo improvements.
 2014-11-04 02:28:18 +00:00
Bryce Lee
c5d81c2dad am 1e2a01a6: am 68993a41: am 99a6c1cb: Merge "[Theater Mode] Add framework support for screen double tapping out of theater mode." into lmp-sprout-dev automerge: abf33e4 
* commit '1e2a01a6edd5fb95f62207f1e1386b4701e8bcb2':
  [Theater Mode] Add framework support for screen double tapping out of theater mode.
 2014-11-04 02:28:13 +00:00
Dirk Dougherty
4c148e91ea am 52973fa2: am 0b8ae553: am 73e55866: am 550465ba: am e1970f12: Doc change: Tv doc updates for publishing in Google Play. automerge: 45729a1 
* commit '52973fa234afcc32bda8e89de6a49e4012be50fa':
  Doc change: Tv doc updates for publishing in Google Play.
 2014-11-04 02:28:08 +00:00
Adam Lesinski
cdd11d7a60 am 4dfff4e7: am 5fa90218: am f7ffcaa7: Merge "Build the split-select tool without C++11 support" into lmp-mr1-dev 
* commit '4dfff4e7276ef98e4c5b84ef715b75a80b01f5c7':
  Build the split-select tool without C++11 support
 2014-11-04 02:28:03 +00:00
Eric Laurent
adbe8bf85f AudioService: fix wired headset insertion delay. 
Do not systematically delay a device connection
message by 1 second if another message is still in the queue
but calculate delay based on last message insertion time.

Bug: 17882912.

Change-Id: Id86c338488f41eebfa1dfd926032468be0294cec
 2014-11-03 18:26:57 -08:00
Baligh Uddin
e4ef64da70 am dc9dc7fa: (-s ours) am aa816de4: (-s ours) Import translations. DO NOT MERGE automerge: 07dd521 -s ours automerge: ecd9daa -s ours 
* commit 'dc9dc7fa9499b279571c7256815448014b1696ed':
  Import translations. DO NOT MERGE
 2014-11-04 02:21:23 +00:00
Nancy Chen
4f03fa903b am bff9a23a: am f9503019: Merge "Adn queries for multi-SIM. (2/3)" into lmp-mr1-dev 
* commit 'bff9a23ab3acc54aa64f6dea0a5ac10aaafec6b5':
  Adn queries for multi-SIM. (2/3)
 2014-11-04 02:21:17 +00:00
Dianne Hackborn
726715e113 am e6fa3f44: am d1f1ea76: Merge "Few more small meminfo improvements." into lmp-mr1-dev 
* commit 'e6fa3f44652fd9e23ce64f39bb43458fa4abd60a':
  Few more small meminfo improvements.
 2014-11-04 02:21:11 +00:00
Bryce Lee
1e2a01a6ed am 68993a41: am 99a6c1cb: Merge "[Theater Mode] Add framework support for screen double tapping out of theater mode." into lmp-sprout-dev automerge: abf33e4 
* commit '68993a41b35eb82459b3686c9baff54f980168ed':
  [Theater Mode] Add framework support for screen double tapping out of theater mode.
 2014-11-04 02:21:05 +00:00
Dirk Dougherty
52973fa234 am 0b8ae553: am 73e55866: am 550465ba: am e1970f12: Doc change: Tv doc updates for publishing in Google Play. automerge: 45729a1 
* commit '0b8ae553e89e93f73de4fff6ca2c46745177ed9c':
  Doc change: Tv doc updates for publishing in Google Play.
 2014-11-04 02:20:59 +00:00
Adam Lesinski
4dfff4e727 am 5fa90218: am f7ffcaa7: Merge "Build the split-select tool without C++11 support" into lmp-mr1-dev 
* commit '5fa9021822577f1e4676db49a6b5cb5d36e4614a':
  Build the split-select tool without C++11 support
 2014-11-04 02:20:47 +00:00
Adam Lesinski
24655f37ed am 3fd34002: Merge commit \'78be0498\' into manualmerge 
* commit '3fd340028fc24198edb23ddf5eb5a0a100bab745':
  Fix issues that will be present in C++11
 2014-11-04 02:14:37 +00:00
Adam Lesinski
3fd340028f Merge commit '78be0498' into manualmerge 
Conflicts:
	libs/androidfw/ResourceTypes.cpp
	tools/aapt/Android.mk
	tools/aapt/StringPool.cpp
	tools/aapt/StringPool.h

Change-Id: I9d69efdfb892032895ace12159d193304f02dc6c
 2014-11-03 18:06:22 -08:00
Eric Laurent
8befd6fd05 Merge "AudioService: fix cross deadlock" into lmp-mr1-dev 2014-11-04 02:00:32 +00:00
David Friedman
6666f34c9b am e20e2b9a: am 5a416a49: am a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs 
* commit 'e20e2b9a4863144633bb5ba9d7bedf7d0948c760':
  Fixed ADB documentation to work properly on Windows Bug: 17192985
 2014-11-04 01:34:05 +00:00
Eric Laurent
8fa4d6f585 AudioService: fix cross deadlock 
Fix cross deadlock between VolumeStreamState.class and
VolumeStreamState instance synchronization.

Do not synchronize on VolumeStreamState instance anymore.

Also document the locking order for synchronization objects
related to volume management.

Bug: 18159081.
Change-Id: Ibfe0759215cdac778408b95191cf0fd96bf46312
 2014-11-03 17:30:41 -08:00
Stuart Scott
b600d890a6 Merge "Clean up public API of SubInfoRecord." into lmp-mr1-dev 2014-11-04 01:29:00 +00:00
Andrew Solovay
4034546812 docs: Removed broken link to non-existent method. 
Doc had included link to method MediaBrowserService.onLoadIcon().
Per bug http://b/17205016 that method was removed before release.

Revised doc is staged to:

http://asolovay.mtv.corp.google.com:9650/reference/android/service/media/MediaBrowserService.Result.html

(Note that the other "See Also" link, which I didn't remove, is badly
formatted because Javadoc seems to choke on links to methods that are
passed generic types. JoeFernandez@, if you can suggest a better way
to format that link I'll make that change too.)

bug: 18229650
Change-Id: Ic55ae8b9edc6dd314cf5acc306abd8a9d5f71134
 2014-11-04 01:25:26 +00:00
Deepanshu Gupta
0267541c90 am 0a2e42d4: Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev automerge: 9b64954 
automerge: fef5001

* commit 'fef500107ea558bfc210230a3cd8281d7fea6fd5':
  Fix BridgeContext.get*ResourceValue()
 2014-11-04 01:24:41 +00:00
Deepanshu Gupta
6479282ef5 am 33996b98: Merge "Support framework menus in ActionBar" into lmp-dev automerge: c23487a 
automerge: 9a6d8ae

* commit '9a6d8ae25522f88191e8b7d817c1d4e5816b642b':
  Support framework menus in ActionBar
 2014-11-04 01:23:39 +00:00
Deepanshu Gupta
a369809808 am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev automerge: 84a89ed 
automerge: 5ad0763

* commit '5ad076396c43b2d26f9c020f0914623972cadd0e':
  Use the right layout for inflating Action Bar.
 2014-11-04 01:22:24 +00:00
Baligh Uddin
dc9dc7fa94 am aa816de4: (-s ours) Import translations. DO NOT MERGE automerge: 07dd521 -s ours 
automerge: ecd9daa  -s ours

* commit 'ecd9daab207b297a1b7404457b3578bcda9ca51d':
  Import translations. DO NOT MERGE
 2014-11-04 01:21:03 +00:00
Jorim Jaggi
ea814d9d00 am 7fd12db3: Merge "Only hide sensitive content when Keyguard is showing" into lmp-mr1-dev automerge: 3c7efdc automerge: 61059fe 
* commit '7fd12db350a341eb7a50759aa329be5281556928':
  Only hide sensitive content when Keyguard is showing
 2014-11-04 01:17:04 +00:00
Luan Nguyen
17ba88e8d9 am 9a4dc72b: am 9b1bad22: am dcea6fa9: am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs automerge: aec7c97 automerge: 4182391 automerge: c85ccdf automerge: 343baef 
* commit '9a4dc72b3539827eee12594d4d149612e0182409':
 2014-11-04 01:16:59 +00:00
Joe Fernandez
6d26dd568a am b070a7cf: am f05f8a30: am cbabe576: am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs automerge: 90f734e automerge: 3d76f6a automerge: 583b2cc automerge: efbc7f3 
* commit 'b070a7cf2f3bb0dd2cd462edd1b73619d37d1112':
 2014-11-04 01:16:53 +00:00
Natalie Masse
61ce0acb5d am f208d803: am 471a354c: am 7d3bd06d: am 1e5bb861: Link and typo fixed automerge: bcf9ced automerge: 9f6ea58 automerge: f978dac automerge: f6ca1a6 
* commit 'f208d803a4f380ec5616815489e9465ce9c75735':
 2014-11-04 01:16:49 +00:00
Scott Rowe
995ff600c2 am f9319738: am f6768bac: am c51276ec: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs automerge: a1e3063 automerge: e0da6dd automerge: d584dbe automerge: cca9f67 
* commit 'f93197389fbb64c382091a382f0a5f3741848e40':
 2014-11-04 01:16:45 +00:00
Joe Fernandez
69863ab0fc am 995c1e0e: am 9586eacf: am 2fb449e9: am 031a0863: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs automerge: 2f9ea27 automerge: d6ed575 automerge: a1ce8ca 
* commit '995c1e0ea4cc39d193f5bacad2f426c4a868e906':
 2014-11-04 01:16:40 +00:00
Prashant Malani
84f663bacb am b507d8de: (-s ours) am eaf585a1: am 80c26ce0: am ee2802eb: Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev automerge: 645e017 -s ours automerge: a8f4b8a -s ours automerge: 9ffa931 -s ours 
* commit 'b507d8dee1f392da1ddcfa14c1f32cc4ed1d5fbf':
 2014-11-04 01:16:35 +00:00
Ricardo Cervera
d288f2e9c0 am cd8bff23: am c96d62a6: am b50fd5d5: am 764e61ad: am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs automerge: dc1f308 automerge: 884b473 automerge: e3835c1 
* commit 'cd8bff23699376149182409ef66c3501545d8871':
 2014-11-04 01:16:31 +00:00
Luan Nguyen
3844a49a7e am 768e068b: am 4e4a1ed3: am 879b948e: am acbfd20d: am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs automerge: c07a288 automerge: cc8b367 automerge: d3b5483 
* commit '768e068bbf86b31387e97817d3782cf12d2dec02':
 2014-11-04 01:16:26 +00:00
smain@google.com
b1203bf435 am cbc3b3db: am c360ec9b: am afa68731: am 841b7a21: am 075531ae: add the butterbar for L announce to Preview landing page automerge: e43bb6a automerge: 870afdb automerge: 5dbac8e 
* commit 'cbc3b3db1a4fcfc65f9f0ae3ea830e95e3bfd4aa':
 2014-11-04 01:16:21 +00:00
smain@google.com
ebaad4b457 am 6757cc55: am ec3eb1c7: am 6df786d3: am 87c4d66d: am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 automerge: 6fbe299 automerge: 469c8c8 automerge: 21fdc41 
* commit '6757cc5543bbc0c2c59669dfd25388ae6a9c2fe3':
 2014-11-04 01:16:16 +00:00
Ricardo Cervera-Navarro
44261ce721 am 4a1fb178: am dc489b6c: am 521f964a: am e3e6193e: am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs automerge: c93723b automerge: 4687757 automerge: 6bda7d2 
* commit '4a1fb17845259c9f48ea6fe9b5ad60df1a653293':
 2014-11-04 01:16:10 +00:00
Rich Slogar
3a9ffeafc9 am d55f4731: am 4a6b69c5: am ec4bc006: am 4f8a41cc: am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs automerge: 858cfad automerge: d84910b automerge: 6b54651 
* commit 'd55f47318fc154a46918a372229e2e27b620cafd':
 2014-11-04 01:16:06 +00:00
Eric Gilmore
3b6abc6d4a am 921ceb2e: am f38b98f3: am e9324d0f: am 7ecb0a3e: Merge commit \'a4eb81b\' into klp-modular-dev-plus-aosp automerge: 068cb36 automerge: ee870df 
* commit '921ceb2eaa187242c520838daa906508991aeea9':
 2014-11-04 01:16:02 +00:00
Deepanshu Gupta
fef500107e am 0a2e42d4: Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev automerge: 9b64954 
* commit '0a2e42d4afe9aa81cc41674102dfc999496db845':
  Fix BridgeContext.get*ResourceValue()
 2014-11-04 01:08:43 +00:00
Deepanshu Gupta
9a6d8ae255 am 33996b98: Merge "Support framework menus in ActionBar" into lmp-dev automerge: c23487a 
* commit '33996b98787c4625f9cd4a8e38e6a88458773276':
  Support framework menus in ActionBar
 2014-11-04 01:08:39 +00:00
Deepanshu Gupta
5ad076396c am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev automerge: 84a89ed 
* commit 'cd5f3bab37ef1dc041489f53f565416d295916d9':
  Use the right layout for inflating Action Bar.
 2014-11-04 01:08:23 +00:00
David Friedman
e20e2b9a48 am 5a416a49: am a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs 
* commit '5a416a4905ba2f347a9837c1f578327c239f5910':
  Fixed ADB documentation to work properly on Windows Bug: 17192985
 2014-11-04 01:06:41 +00:00
Nancy Chen
bff9a23ab3 am f9503019: Merge "Adn queries for multi-SIM. (2/3)" into lmp-mr1-dev 
* commit 'f950301945164f5318ea50401fcf23bef824fa9c':
  Adn queries for multi-SIM. (2/3)
 2014-11-04 01:02:37 +00:00
Dianne Hackborn
e6fa3f4465 am d1f1ea76: Merge "Few more small meminfo improvements." into lmp-mr1-dev 
* commit 'd1f1ea76e854d518803d68a31e35b34841468f4c':
  Few more small meminfo improvements.
 2014-11-04 01:01:35 +00:00
Bryce Lee
68993a41b3 am 99a6c1cb: Merge "[Theater Mode] Add framework support for screen double tapping out of theater mode." into lmp-sprout-dev automerge: abf33e4 
* commit '99a6c1cbe83baff199be6fd69234e20b4b14241d':
  [Theater Mode] Add framework support for screen double tapping out of theater mode.
 2014-11-04 01:01:29 +00:00
Dirk Dougherty
0b8ae553e8 am 73e55866: am 550465ba: am e1970f12: Doc change: Tv doc updates for publishing in Google Play. automerge: 45729a1 
* commit '73e558664d56a68745f9f4b2dc23bfee39ec624a':
  Doc change: Tv doc updates for publishing in Google Play.
 2014-11-04 01:01:19 +00:00
Adam Lesinski
5fa9021822 am f7ffcaa7: Merge "Build the split-select tool without C++11 support" into lmp-mr1-dev 
* commit 'f7ffcaa7a478eaafc121e84b14dcaf2503dd5457':
  Build the split-select tool without C++11 support
 2014-11-04 01:01:13 +00:00
Adam Lesinski
78be0498af am 668f0a35: Merge "Fix issues that will be present in C++11" into lmp-mr1-dev 
* commit '668f0a356cba44c22d8ca0c9f4711613885d46a9':
  Fix issues that will be present in C++11
 2014-11-04 01:01:06 +00:00
David Friedman
5a416a4905 am a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs 
* commit 'a827de4e8bcd8d90987387b1acf8d8856104e21c':
  Fixed ADB documentation to work properly on Windows Bug: 17192985
 2014-11-04 00:59:31 +00:00