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

109174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
cc5b49f07f Merge "Fix MenuItemImpl#hasCollapsibleActionView for action providers" 2013-07-12 21:36:07 +00:00
Scott Main
414e204199 am e86ba6dc: am 797a99ff: am c0f5bb70: am ca4b112e: am 546ac85a: am ad17523d: add warning for Windows users and fix typos 
* commit 'e86ba6dcbee541c9b1837799c3de67249ad48470':
  add warning for Windows users and fix typos
 2013-07-12 14:31:27 -07:00
Scott Main
e86ba6dcbe am 797a99ff: am c0f5bb70: am ca4b112e: am 546ac85a: am ad17523d: add warning for Windows users and fix typos 
* commit '797a99ff3e7e1fd81f8def2e5ca4ea089c01ad06':
  add warning for Windows users and fix typos
 2013-07-12 14:28:40 -07:00
Scott Main
797a99ff3e am c0f5bb70: am ca4b112e: am 546ac85a: am ad17523d: add warning for Windows users and fix typos 
* commit 'c0f5bb70b72c25c0057d2318bbcc8d79553d1e12':
  add warning for Windows users and fix typos
 2013-07-12 14:22:48 -07:00
Scott Main
c0f5bb70b7 am ca4b112e: am 546ac85a: am ad17523d: add warning for Windows users and fix typos 
* commit 'ca4b112eb243b1350aba000c4f021574be25bd96':
  add warning for Windows users and fix typos
 2013-07-12 14:20:11 -07:00
Scott Main
ca4b112eb2 am 546ac85a: am ad17523d: add warning for Windows users and fix typos 
* commit '546ac85a834cf033cf1f3ce82624f1f4a63d099f':
  add warning for Windows users and fix typos
 2013-07-12 14:17:30 -07:00
Scott Main
546ac85a83 am ad17523d: add warning for Windows users and fix typos 
* commit 'ad17523da976c2d6b7b70fd3aa9ad290e4731224':
  add warning for Windows users and fix typos
 2013-07-12 14:15:15 -07:00
Scott Main
ad17523da9 add warning for Windows users and fix typos 
Change-Id: I694baa83cde2b97cf0159a75358fa129bd656da3
 2013-07-12 14:09:38 -07:00
Chet Haase
f72257473f Merge "Fix minor transition bugs and add capabilities" 2013-07-12 21:00:40 +00:00
Chet Haase
c81a849388 Fix minor transition bugs and add capabilities 
Some view changes require more flexible transitions than the
defaults provided by Crossfade and TextChange - this change supplies some
of that flexibility.

Also, starting a new transition on a hierarchy undergoing a transition
caused the first to get canceled, then the start values to be retrieved.
The new transition should actually get the start values from the intermediate
state of the views, so we now cancel the previous transition only after the
start values have been captured.

Issue #9756349 Transitions: Crossfade does not handle interruption/reverse correctly
Issue #9295863 Transitions: Add behavior API/flags to various transitions
Issue #9275859 Transitions: Improve mechanism for transition interruption

Change-Id: I5a8c5a12466ddcab9e84e4880930563fa1216f3b
 2013-07-12 13:40:38 -07:00
Christopher Tate
70d3dd4f79 Merge "Out-of-band apk pushes to the privileged install dir" 2013-07-12 20:18:55 +00:00
Glenn Kasten
2dafbe78c1 Merge "Return correct status for android.media.AudioTrack.write(short[]...)" 2013-07-12 20:13:00 +00:00
Chad Brubaker
12324b4604 Add NetworkUtil function for marking sockets 
Add NetworkUtil function for setting the SO_MARK field of sockets

Change-Id: I94389b64296d87ee928293f24a26f8dd08c3bf37
 2013-07-12 19:48:32 +00:00
Geremy Condra
f33468e68a Merge "Add NetworkManagement support for fwmark routes" 2013-07-12 19:47:19 +00:00
Christopher Tate
409bb36a13 Out-of-band apk pushes to the privileged install dir 
The new apk will now correctly allow system permissions to an app
placed in the privileged install dir via 'adb push' on the fly.

Change-Id: Ie4284d12628e08d9562d18eee6a7e8f74ae6295e
 2013-07-12 12:33:09 -07:00
Amith Yamasani
46db67cf7f Merge "Fix build" 2013-07-12 19:24:10 +00:00
Amith Yamasani
ed411593ec Fix build 
Change-Id: If4c4f1f104826b599c86bc1c924ebadc5223c8f0
 2013-07-12 12:23:16 -07:00
Wink Saville
7ab34954c8 am 97b077bc: am 42a85412: am 925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev 
* commit '97b077bc18752e7dafe041cb04c19e67ce69939c':
  VZW wants the phoneNumber to be 10 zero's if there isn't one.
 2013-07-12 12:14:01 -07:00
Wink Saville
97b077bc18 am 42a85412: am 925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev 
* commit '42a85412d12078f36c3fdeda1211bdc3800bab0c':
  VZW wants the phoneNumber to be 10 zero's if there isn't one.
 2013-07-12 12:03:53 -07:00
Wink Saville
42a85412d1 am 925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev 
* commit '925ec03fcd9651ff4c6b04982eb6d930b16493b9':
  VZW wants the phoneNumber to be 10 zero's if there isn't one.
 2013-07-12 12:01:41 -07:00
Wink Saville
925ec03fcd Merge "VZW wants the phoneNumber to be 10 zero's if there isn't one." into jb-mr2-dev 2013-07-12 18:59:03 +00:00
Adam Powell
258f8de22c Tweak error fallback behavior for view direction resolution 
If the required ViewParent methods aren't present for resolving text
direction or alignment, mark them resolved with default results and
skip further resolution steps.

Change-Id: I0ea6b0ce968cc24ffed77a2d1e66dfafbec49f9c
 2013-07-12 11:33:44 -07:00
Amith Yamasani
abee69bc08 am 8361a9f7: am 1a1a7c08: am 06a441de: Merge "Pass along the user id to AttributeCache requests" into jb-mr2-dev 
* commit '8361a9f719b6a416a40134951daf28297b6e0670':
  Pass along the user id to AttributeCache requests
 2013-07-12 11:25:24 -07:00
Adam Powell
a73ac4b6fb Merge "Always show overflow buttons on action bars" 2013-07-12 18:22:30 +00:00
Amith Yamasani
8361a9f719 am 1a1a7c08: am 06a441de: Merge "Pass along the user id to AttributeCache requests" into jb-mr2-dev 
* commit '1a1a7c0878320b94d01da6bdfaa857c85b4199a3':
  Pass along the user id to AttributeCache requests
 2013-07-12 11:21:27 -07:00
Amith Yamasani
1a1a7c0878 am 06a441de: Merge "Pass along the user id to AttributeCache requests" into jb-mr2-dev 
* commit '06a441de3b6756cf49879ff445ac26c66da54d02':
  Pass along the user id to AttributeCache requests
 2013-07-12 11:19:24 -07:00
Amith Yamasani
06a441de3b Merge "Pass along the user id to AttributeCache requests" into jb-mr2-dev 2013-07-12 18:17:09 +00:00
Marco Nelissen
cda564d6ea Merge "Add stopservice command to am" 2013-07-12 14:34:41 +00:00
The Android Open Source Project
b2d93f85b6 am a4ee3088: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge 
* commit 'a4ee3088e74bb9b38dcd469df4dc929f1c935ff3':
  Recover from corrupt network stats.
 2013-07-12 07:30:00 -07:00
The Android Open Source Project
a4ee3088e7 Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: Ic45c05e30f974890e8c5320393f95adaf0d0a79f
 2013-07-12 07:27:43 -07:00
Jaekyun Seok
bfdad8ecad Add a keycode to switch audio tracks (1/2) 
A key to switch audio tracks is general on media devices like blu-ray.

Bug: 9728155
Change-Id: Ib61822b8aa9c143a8febc3cff4707fa775119448
 2013-07-12 17:23:29 +09:00
Hiroaki Kuriyama
1ebf13ef20 PreferenceActivity should not leave message in looper when destroyed 
When a PreferenceActivity is destroyed as soon as created,
there is a problematic case that messages for the activity are
sometimes left in the looper even after the activity is destroyed.
For example, by clearing user data of the selecting IME on
Settings apk, com.android.settings.Settings is re-launched
2 times successively. (Destory->Create->Destroy->Create)
Due to the left message, application crash can happen.
(NullPointerException at BackStackRecord.getBreadCrumbTitle())

Two cases have been found to observe this issue.
[Case 1]
 1,Launch IME in advance.
 2,Go to Settings >Apps > All and choose the IME package.
 3,Click "Clear data"
 4,Application crash occurs on com.android.settings.
[Case 2]
 1,Go to Settings > Language&input > Language.
 2,ListView dialog to choose language is shown.
 3,Rotate the tablet 180 degree so that 90 degree rotation occurs twice.
 4,Application crash occurs on com.android.settings.

Change-Id: I5ce36ea7a40ab7bc7737b7dca6641a4c3d77a480
 2013-07-12 15:42:35 +09:00
Lorenzo Colitti
51a845688c Merge "Make legacy VPN work over stacked interfaces." 2013-07-12 03:33:20 +00:00
Elliott Hughes
bea6525a53 am 9c8685b7: am f094eefc: am c5de9c35: Merge "Track libcore API update." 
* commit '9c8685b714b38c2bbf09077b9cba73a95b734269':
  Track libcore API update.
 2013-07-11 19:01:40 -07:00
Elliott Hughes
9c8685b714 am f094eefc: am c5de9c35: Merge "Track libcore API update." 
* commit 'f094eefc34013c7167effa558b488709eaa54751':
  Track libcore API update.
 2013-07-11 18:55:54 -07:00
Elliott Hughes
f094eefc34 am c5de9c35: Merge "Track libcore API update." 
* commit 'c5de9c3509e6f91f1a6fca4541c5a2dfc9878dcc':
  Track libcore API update.
 2013-07-11 18:52:11 -07:00
Scott Main
86b4bfbdfe am a1063aa3: am a60edcbe: am c079e43f: am e920ab1a: am a618e938: am c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017" into jb-mr1.1-ub-dev 
* commit 'a1063aa3fb6619caf59c2c139c1800a427bbafb5':
  add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017
 2013-07-11 18:16:37 -07:00
Scott Main
a1063aa3fb am a60edcbe: am c079e43f: am e920ab1a: am a618e938: am c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017" into jb-mr1.1-ub-dev 
* commit 'a60edcbee7d99058eb689761097826adac0593e7':
  add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017
 2013-07-11 18:14:52 -07:00
Scott Main
a60edcbee7 am c079e43f: am e920ab1a: am a618e938: am c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017" into jb-mr1.1-ub-dev 
* commit 'c079e43fc317087ae5517ee7d9a376e97fef0f57':
  add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017
 2013-07-11 18:12:01 -07:00
Dirk Dougherty
29d0833f74 am 8b1cdd98: am e34e6520: am e4709679: am c1addd47: am c7da42d7: am f7832a35: am d6bbda24: am bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs 
* commit '8b1cdd9874e88569fcf46d848f8f3424dfa7afc9':
  Doc change: Update gcore reference docs.
 2013-07-11 18:09:59 -07:00
Scott Main
c079e43fc3 am e920ab1a: am a618e938: am c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017" into jb-mr1.1-ub-dev 
* commit 'e920ab1a82327976e0a25842d7d57dc7a92ba604':
  add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017
 2013-07-11 18:09:53 -07:00
Dirk Dougherty
8b1cdd9874 am e34e6520: am e4709679: am c1addd47: am c7da42d7: am f7832a35: am d6bbda24: am bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs 
* commit 'e34e65203f8188849cfebb901c4efe5b5b4ad8d5':
  Doc change: Update gcore reference docs.
 2013-07-11 18:08:36 -07:00
Scott Main
e920ab1a82 am a618e938: am c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017" into jb-mr1.1-ub-dev 
* commit 'a618e93891603f825fd2c0ec1a67c96c29863dcd':
  add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017
 2013-07-11 18:08:01 -07:00
Dirk Dougherty
e34e65203f am e4709679: am c1addd47: am c7da42d7: am f7832a35: am d6bbda24: am bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs 
* commit 'e4709679198590fa37fbad67df0d7e3827c4f8cf':
  Doc change: Update gcore reference docs.
 2013-07-11 18:06:22 -07:00
Scott Main
a618e93891 am c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017" into jb-mr1.1-ub-dev 
* commit 'c660c608e75791d5b4b286f34a9ec335f9e95ba6':
  add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017
 2013-07-11 18:05:44 -07:00
Scott Main
c660c608e7 Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017" into jb-mr1.1-ub-dev 2013-07-12 01:03:22 +00:00
Dirk Dougherty
e470967919 am c1addd47: am c7da42d7: am f7832a35: am d6bbda24: am bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs 
* commit 'c1addd4750be5b1721a8668a110e74fa59e476c6':
  Doc change: Update gcore reference docs.
 2013-07-11 18:03:17 -07:00
Dirk Dougherty
c1addd4750 am c7da42d7: am f7832a35: am d6bbda24: am bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs 
* commit 'c7da42d76470c4e9fb541058e942e31163275b83':
  Doc change: Update gcore reference docs.
 2013-07-11 18:01:26 -07:00
Dirk Dougherty
c7da42d764 am f7832a35: am d6bbda24: am bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs 
* commit 'f7832a35f3961e1b6665b5428899cdad598f0544':
  Doc change: Update gcore reference docs.
 2013-07-11 17:59:22 -07:00
Vinit Deshapnde
e088428400 Merge "Allow enabling TDLS on specific routes" 2013-07-12 00:58:07 +00:00