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

94971 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
f98e18e68d am d9f98c81: Fix build break due to merge. 
# Via Jean-Baptiste Queru
* commit 'd9f98c81068594c33c81b5b817391c6b4b895492':
  Fix build break due to merge.
 2013-02-11 14:39:54 -08:00
Scott Main
bfec2a0189 docs: nudge dashboard chart to the right to avoid overlap 
Change-Id: I852004b6dbd7ca8343a20f05da1166cff2d2898a
 2013-02-11 14:24:03 -08:00
Robert Ly
a578ade219 am 1c4311cc: am 4af36f4e: am 96b1b403: am 4c01047e: makefile changes for s.a.c 
# Via Android Git Automerger (3) and Robert Ly (1)
* commit '1c4311cc9c0e32d30ff17083f24fb7145336fcae':
  makefile changes for s.a.c
 2013-02-11 14:17:33 -08:00
Robert Ly
1c4311cc9c am 4af36f4e: am 96b1b403: am 4c01047e: makefile changes for s.a.c 
# Via Android Git Automerger (2) and Robert Ly (1)
* commit '4af36f4ebea986a690df12659c4225c3a23484be':
  makefile changes for s.a.c
 2013-02-11 14:15:21 -08:00
Robert Ly
4af36f4ebe am 96b1b403: am 4c01047e: makefile changes for s.a.c 
# Via Android Git Automerger (1) and Robert Ly (1)
* commit '96b1b403b6ecf0daa2d7d0a8475e0d087790e457':
  makefile changes for s.a.c
 2013-02-11 14:13:12 -08:00
Robert Ly
96b1b403b6 am 4c01047e: makefile changes for s.a.c 
# Via Robert Ly
* commit '4c01047ec7b06aabeeae273c7871caa6c3029b84':
  makefile changes for s.a.c
 2013-02-11 14:10:00 -08:00
Robert Ly
4c01047ec7 makefile changes for s.a.c 
Change-Id: I501cc140994b2822c3df1f00639076f17765f256
 2013-02-11 13:38:31 -08:00
Jeff Brown
d9f98c8106 Fix build break due to merge. 
Change-Id: I08c39690ee9de825ff51afc7d102ee622af6ba13
 2013-02-11 11:34:43 -08:00
Dirk Dougherty
ef1d17938e am c0614c44: am b6efefb4: am 337d3e32: am 7d849491: Doc change: fix typos. 
# Via Android Git Automerger (3) and Dirk Dougherty (1)
* commit 'c0614c4471363e983610e885bf63f101be4ae21c':
  Doc change: fix typos.
 2013-02-11 11:32:06 -08:00
Dirk Dougherty
c0614c4471 am b6efefb4: am 337d3e32: am 7d849491: Doc change: fix typos. 
# Via Android Git Automerger (2) and Dirk Dougherty (1)
* commit 'b6efefb4bdb05afa4a0c45e78df981706040d99e':
  Doc change: fix typos.
 2013-02-11 11:29:16 -08:00
Dirk Dougherty
b6efefb4bd am 337d3e32: am 7d849491: Doc change: fix typos. 
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '337d3e3240e52ca5321029fdd23d2f2a3e1201d8':
  Doc change: fix typos.
 2013-02-11 11:26:19 -08:00
Dirk Dougherty
337d3e3240 am 7d849491: Doc change: fix typos. 
# Via Dirk Dougherty
* commit '7d8494913292dcdbe25d046cbef6e349d904b41c':
  Doc change: fix typos.
 2013-02-11 11:23:28 -08:00
Dirk Dougherty
7d84949132 Doc change: fix typos. 
Change-Id: I58c8841c9bf23bc75e1b25d63af917ff56087fdc
 2013-02-11 11:18:59 -08:00
Jeff Brown
4fd6079247 am 5262a108: Merge "Complete documentation of whereArgs (Issue #43061)" 
# By Tim Roes
# Via Gerrit Code Review (1) and Tim Roes (1)
* commit '5262a1082663610a888d1145fd9676f7db41d397':
  Complete documentation of whereArgs (Issue #43061)
 2013-02-08 16:58:14 -08:00
Jeff Brown
64f4de0303 am fa49a6b1: Merge "frameworks/base: Added English UK keyboard layout for physical keyboards" 
# By HeyRatFans
# Via Gerrit Code Review (1) and Matt Beale (1)
* commit 'fa49a6b13ebf496ea01d5981f69084596d06d464':
  frameworks/base: Added English UK keyboard layout for physical keyboards
 2013-02-08 16:58:09 -08:00
Jeff Brown
5262a10826 Merge "Complete documentation of whereArgs (Issue #43061)" 2013-02-08 23:49:51 +00:00
Jeff Brown
110fe9b303 am fe1f3a1b: Merge "Fix ViewRootImpl to find missing focus using D-pad." 
# By Ki-Hwan Lee
# Via Gerrit Code Review (1) and Ki-Hwan Lee (1)
* commit 'fe1f3a1beff9f73f6a04bcc35239038a21bc38ff':
  Fix ViewRootImpl to find missing focus using D-pad.
 2013-02-08 15:49:46 -08:00
Jeff Brown
fa49a6b13e Merge "frameworks/base: Added English UK keyboard layout for physical keyboards" 2013-02-08 23:49:11 +00:00
The Android Open Source Project
4b71a472c0 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I728b304c185d7f0406b6d45334c10263bd38d769
 2013-02-08 15:40:41 -08:00
Jeff Brown
fe1f3a1bef Merge "Fix ViewRootImpl to find missing focus using D-pad." 2013-02-08 23:29:11 +00:00
Joe Fernandez
46e31ae425 docs: Android SDK 21.1.0 Release Notes 
Change-Id: I1e97eb5a7e3b4a1c63474f7b85cb22dd343ceb4b
 2013-02-08 14:28:02 -08:00
The Android Automerger
763ef60466 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-02-08 13:51:07 -08:00
Dirk Dougherty
b555029e41 am 2e65e20c: am 9b8b4ae5: am f2d89ef9: am 64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit '2e65e20c761f0fdee98eeefe9a8ee13c95a8b1ff':
  Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
 2013-02-08 11:21:03 -08:00
Dirk Dougherty
2e65e20c76 am 9b8b4ae5: am f2d89ef9: am 64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev 
# Via Android Git Automerger (2) and others
* commit '9b8b4ae5d7a4f5fbe242f5a2da145fd0fa88ce87':
  Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
 2013-02-08 11:17:50 -08:00
Dirk Dougherty
9b8b4ae5d7 am f2d89ef9: am 64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev 
# Via Android (Google) Code Review (1) and others
* commit 'f2d89ef9d57b096962b802608a88d3483a51d08a':
  Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
 2013-02-08 11:16:11 -08:00
Dirk Dougherty
f2d89ef9d5 am 64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Dirk Dougherty (1)
* commit '64ab8fdcb0a3015d3e6c4db0a1d66443085fd673':
  Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
 2013-02-08 11:14:23 -08:00
Dirk Dougherty
64ab8fdcb0 Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev 2013-02-08 19:10:07 +00:00
Marco Nelissen
85a1ee3021 am b683f354: am 69abccc3: Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content" 
# By Jan Bjernler
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit 'b683f3542a123a07823b51643b1973507bfb57e2':
  MediaStore.Audio.Media.getContentUriForPath() returns unexpected content
 2013-02-08 08:44:36 -08:00
Marco Nelissen
b683f3542a am 69abccc3: Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content" 
# By Jan Bjernler
# Via Gerrit Code Review
* commit '69abccc3cdacee354dec8867865a0577a4e14e63':
  MediaStore.Audio.Media.getContentUriForPath() returns unexpected content
 2013-02-08 08:41:20 -08:00
Marco Nelissen
69abccc3cd Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content" 2013-02-08 16:22:09 +00:00
Jan Bjernler
66eb589957 MediaStore.Audio.Media.getContentUriForPath() returns unexpected content 
MediaStore.Audio.getContentUriForPath() returns an uri to
internal storage if anything but /mnt/sdcard/ is sent in.
This fix checks if there is an additional sdcard
(normally called ext_card) or usb mass storage attached to
the device and then returns an uri to the external db.
The extra sdcard name and the usb mass storage name info is read from
the system environment variable SECONDARY_STORAGE so if a customer
chooses to change the name this will work as expected.

Change-Id: Ib78bca929fe382d4770df895149a0132f0e56994
 2013-02-08 16:17:23 +00:00
Jesse Hall
93194ffbf1 am c2edfa2b: am 7c292062: Merge "Process all display events in order" 
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit 'c2edfa2b9649f67c142b181c54580c015badfca3':
  Process all display events in order
 2013-02-07 20:26:27 -08:00
Jesse Hall
5a5cc3dcb0 am bc18fe85: am fd1c028e: Merge "Handle hotplug events as described instead of rescanning" 
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit 'bc18fe851c98dbe6be4eb2655efb1ef95902d961':
  Handle hotplug events as described instead of rescanning
 2013-02-07 20:26:23 -08:00
Robert Ly
74e8693d31 am ddc0a7bd: am 11fa4460: am 9da9a7cd: am e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit 'ddc0a7bdf94f4ba84dd4b89b693eb148ff32b5d3':
  makefile changes for gcm javadocs
 2013-02-07 18:01:17 -08:00
Robert Ly
ddc0a7bdf9 am 11fa4460: am 9da9a7cd: am e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev 
# Via Android Git Automerger (2) and others
* commit '11fa446033a8600b681efeb857507388e8113d72':
  makefile changes for gcm javadocs
 2013-02-07 17:57:57 -08:00
Robert Ly
11fa446033 am 9da9a7cd: am e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and others
* commit '9da9a7cda27a9b9a3a08e64e81d0ca10ac4c4ec1':
  makefile changes for gcm javadocs
 2013-02-07 17:55:20 -08:00
Robert Ly
9da9a7cda2 am e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Robert Ly (1)
* commit 'e60b6023ae4fdea932d0effc553dddc38117d235':
  makefile changes for gcm javadocs
 2013-02-07 17:53:29 -08:00
Robert Ly
e60b6023ae Merge "makefile changes for gcm javadocs" into jb-mr1-dev 2013-02-08 01:48:56 +00:00
Jesse Hall
c2edfa2b96 am 7c292062: Merge "Process all display events in order" 
# Via Gerrit Code Review
* commit '7c2920625eb72216025aeb8ea8dce544df0eca36':
  Process all display events in order
 2013-02-07 17:41:50 -08:00
Jesse Hall
bc18fe851c am fd1c028e: Merge "Handle hotplug events as described instead of rescanning" 
# Via Gerrit Code Review
* commit 'fd1c028e34fc559ccccebd18979ee85ec7821dea':
  Handle hotplug events as described instead of rescanning
 2013-02-07 17:41:44 -08:00
Dirk Dougherty
34c880415b Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning. 
Change-Id: I3003fa163f7c9e10925d96f8d89005b42baed315
 2013-02-07 17:32:35 -08:00
Jesse Hall
7c2920625e Merge "Process all display events in order" 2013-02-08 01:29:33 +00:00
Jesse Hall
fd1c028e34 Merge "Handle hotplug events as described instead of rescanning" 2013-02-08 01:29:03 +00:00
Katie McCormick
89e7aa3dae am 2306f0ee: am ee27bcda: am b68702eb: am 0e66f16a: Merge "Doc change: Scroller Javadoc Bug # 7966653" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit '2306f0ee3396cd8a85d04dfbc08fb8c5ffa6699f':
  Doc change: Scroller Javadoc Bug # 7966653
 2013-02-07 17:26:13 -08:00
Katie McCormick
2306f0ee33 am ee27bcda: am b68702eb: am 0e66f16a: Merge "Doc change: Scroller Javadoc Bug # 7966653" into jb-mr1-dev 
# Via Android Git Automerger (2) and others
* commit 'ee27bcda8644f8c3f2328acc248b8c5c9d152f59':
  Doc change: Scroller Javadoc Bug # 7966653
 2013-02-07 17:23:00 -08:00
Katie McCormick
ee27bcda86 am b68702eb: am 0e66f16a: Merge "Doc change: Scroller Javadoc Bug # 7966653" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and others
* commit 'b68702eb0526633e51d9dbfe6fc971c168e1274a':
  Doc change: Scroller Javadoc Bug # 7966653
 2013-02-07 17:21:29 -08:00
Katie McCormick
b68702eb05 am 0e66f16a: Merge "Doc change: Scroller Javadoc Bug # 7966653" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Katie McCormick (1)
* commit '0e66f16abd651bdf5833f4aede4899e627d7b333':
  Doc change: Scroller Javadoc Bug # 7966653
 2013-02-07 17:18:48 -08:00
Katie McCormick
0e66f16abd Merge "Doc change: Scroller Javadoc Bug # 7966653" into jb-mr1-dev 2013-02-08 01:14:47 +00:00
Katie McCormick
87cfad7d74 Doc change: Scroller Javadoc Bug # 7966653 
Change-Id: I4365946f890a76fcfa78ca9d69f2a8e0848095a9
 2013-02-07 16:42:26 -08:00
Katie McCormick
1309c9e2af am 93ebe284: am 80a01a7f: am ef4196d0: am 89fafaea: Doc update: clean up 
# Via Android Git Automerger (3) and Katie McCormick (1)
* commit '93ebe2845c7f2d7afea1b679020446adcd0047ee':
  Doc update: clean up
 2013-02-07 15:57:21 -08:00