Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
131,692 Commits 3 Branches 0 Tags
26f31dccfdf699f2c8394ca0d68907409441df89
Commit Graph

35623 Commits

Author SHA1 Message Date
Craig Mautner
26f31dccfd am 7ad27288: am c00c89b1: am f4c909bc: Fix ActivityView lifecycle 
* commit '7ad27288f1b66733a4fcb2bdcb17dd5db6c6423d':
  Fix ActivityView lifecycle
 2014-04-22 13:39:20 +00:00
Craig Mautner
7ad27288f1 am c00c89b1: am f4c909bc: Fix ActivityView lifecycle 
* commit 'c00c89b1add5bcbf6a76287c9a3384877449c746':
  Fix ActivityView lifecycle
 2014-04-22 13:32:54 +00:00
Craig Mautner
c00c89b1ad am f4c909bc: Fix ActivityView lifecycle 
* commit 'f4c909bcb87d6f103c9f9e8255fa61bd86f4de67':
  Fix ActivityView lifecycle
 2014-04-22 13:27:44 +00:00
Alan Viverette
8c6c260aa4 am 4899e66d: Merge "Add touch feedback to edit text" 
* commit '4899e66db9897279e4ae704b139c50b384a1ae34':
  Add touch feedback to edit text
 2014-04-22 13:24:30 +00:00
Youngsang Cho
ac27f9f488 am 6b2c07cb: Merge "Add overlay view in Tv Input Framework" 
* commit '6b2c07cb3655b0f98990961e15c2b6077aaad5ca':
  Add overlay view in Tv Input Framework
 2014-04-22 13:24:24 +00:00
Jeff Davidson
71dd3d9121 am 2ca3962b: Merge "Initial implementation of NetworkScoreManager\'s backing service." 
* commit '2ca3962bc0168d360cf9567a313608347da51944':
  Initial implementation of NetworkScoreManager's backing service.
 2014-04-22 13:24:14 +00:00
Alan Viverette
4899e66db9 Merge "Add touch feedback to edit text" 2014-04-22 00:31:55 +00:00
Alan Viverette
c3f35b01b5 Add touch feedback to edit text 
Change-Id: Id25692bfa40f5145d6ca807111bbd5d0c4774d07
 2014-04-21 17:30:22 -07:00
Youngsang Cho
6b2c07cb36 Merge "Add overlay view in Tv Input Framework" 2014-04-22 00:29:49 +00:00
Jeff Davidson
2ca3962bc0 Merge "Initial implementation of NetworkScoreManager's backing service." 2014-04-22 00:02:47 +00:00
Jeff Davidson
6a4b220f12 Initial implementation of NetworkScoreManager's backing service. 
This service will ultimately be responsible for propagating scores
down to lower-level network subsystems. For now, it just keeps scores
in memory and exposes these for debugging purposes via "adb shell
dumpsys network_score".

This change also adds provisioning of a default scorer. When
NetworkScoreService is first initialized, it checks to see if it has
ever set a default scorer; if not, it reads a package name from a
build config property and attempts to set it as the default.

Also add autogenerated equals/hashCode methods to all parcelables.

Bug: 14111427
Bug: 13786258
Change-Id: I02271171653d42e12acd240b73b9e23950744f6b
 2014-04-21 16:04:05 -07:00
Craig Mautner
f4c909bcb8 Fix ActivityView lifecycle 
Major changes to maintain the VirtualDisplay across repeated
attach/detach cycles of an ActivityView. This keeps the activities
and VirtualDisplays in the ActivityView from getting into bad states.

Fixes bug 14107002.

Change-Id: Idc2aaf85ac496eab0eeb436736cb10a2020040e8
 2014-04-21 15:28:42 -07:00
Dianne Hackborn
129e1dc6d0 am ec687133: Merge "Try to always print time stamp in battery history." 
* commit 'ec687133e01d6650d630511ce96f184c6d829482':
  Try to always print time stamp in battery history.
 2014-04-21 20:56:53 +00:00
Dianne Hackborn
ec687133e0 Merge "Try to always print time stamp in battery history." 2014-04-21 20:52:49 +00:00
Adam Lesinski
892bf987f3 am 49d8fa47: am a281be67: am 370cda70: Merge "Allow InputEvents to propagate w/o IME" into klp-modular-dev 
* commit '49d8fa473970265a182549cc1673719e5101320e':
  Allow InputEvents to propagate w/o IME
 2014-04-21 20:29:19 +00:00
Adam Lesinski
49d8fa4739 am a281be67: am 370cda70: Merge "Allow InputEvents to propagate w/o IME" into klp-modular-dev 
* commit 'a281be67030a834d455a84ce62c173140564211a':
  Allow InputEvents to propagate w/o IME
 2014-04-21 20:25:03 +00:00
Adam Lesinski
a281be6703 am 370cda70: Merge "Allow InputEvents to propagate w/o IME" into klp-modular-dev 
* commit '370cda7074a02139fa5374bbdd94c37be376ca7a':
  Allow InputEvents to propagate w/o IME
 2014-04-21 20:21:13 +00:00
Adam Lesinski
370cda7074 Merge "Allow InputEvents to propagate w/o IME" into klp-modular-dev 2014-04-21 20:18:11 +00:00
Dianne Hackborn
99009ea7dc Try to always print time stamp in battery history. 
Also fix printing of string pool to quote the strings
and escape characters, and change history time stamps
to print starting at 0 and going up.

Change-Id: I2d0c080f2b5de7b27b20a7357c2c0cf481c82d8c
 2014-04-21 13:10:38 -07:00
Ariel Gertzenstein
6788110191 am fe755054: Merge "DO NOT MERGE Tear down PAN if we can\'t successfully complete a DHCP request after establishing a PANU connection." into klp-modular-dev 
* commit 'fe7550548d036b6c536840fd1daa954160d0b2c8':
  DO NOT MERGE    Tear down PAN if we can't successfully complete a DHCP request after establishing a PANU connection.
 2014-04-21 18:47:40 +00:00
Ariel Gertzenstein
a2d8706ca8 DO NOT MERGE Tear down PAN if we can't successfully complete a DHCP request 
after establishing a PANU connection.

http://b/13731957

Change-Id: I0c808d5196c66783b52942ba7b7212bdce9f1c07
 2014-04-21 14:26:56 -04:00
Jianing Wei
f1fa3bb824 am 2bcd4023: Merge "Camera2 API: fix bug in Camera2 CTS test failure." 
* commit '2bcd40235e5a9a73adfb3f685fe78577b35d3ba5':
  Camera2 API: fix bug in Camera2 CTS test failure.
 2014-04-21 13:37:27 +00:00
Christopher Tate
3405022b0a am 23975123: Merge "Handle /oem and /vendor as well" 
* commit '239751237c3431c9b9683fc08219c05f884f37d8':
  Handle /oem and /vendor as well
 2014-04-21 13:37:24 +00:00
Jianing Wei
2bcd40235e Merge "Camera2 API: fix bug in Camera2 CTS test failure." 2014-04-19 01:21:56 +00:00
Christopher Tate
239751237c Merge "Handle /oem and /vendor as well" 2014-04-19 00:55:08 +00:00
Christopher Tate
740888f62e Handle /oem and /vendor as well 
Bug 13170859

Change-Id: I95dec4cd68e3d64517d08b3f08eefb849ce37b86
 2014-04-18 17:50:29 -07:00
Jianing Wei
baf0c650b3 Camera2 API: fix bug in Camera2 CTS test failure. 
* The bug is caused by the fact that we did not update the frame
  tracker when the listener is null or camera is closed.
* This change fixes the bug 14151933.

Bug: 14151933
Change-Id: I00e3024e403503a056834be805c44604cb1a8a6d
 2014-04-18 17:35:00 -07:00
Michael Wright
452e1f40f4 am 5b5def54: Fixed a typo implying intents must and must not be explicit. 
* commit '5b5def547201b213bc2325400371c37d1612732e':
  Fixed a typo implying intents must and must not be explicit.
 2014-04-18 22:50:58 +00:00
Michael Wright
5b5def5472 Fixed a typo implying intents must and must not be explicit. 
Change-Id: Id9746fad2e475b94d8d45f641bc5e2eaf9c874ae
 2014-04-18 22:45:27 +00:00
Fabrice Di Meglio
0fd5b81c90 am fbb54b83: Merge "Improve Preference highlighting" 
* commit 'fbb54b8363b66e0b22d519ee20d1a50e8b5340ee':
  Improve Preference highlighting
 2014-04-18 22:37:07 +00:00
Adam Lesinski
c0f6eed40f Allow InputEvents to propagate w/o IME 
If no IME was present, InputEvents such as KeyEvents
would simple be dropped instead of going through
to the Activity's View hierarchy.

Change-Id: I9de25bdbf5d1564b77b25679e19dae18591a8c1c
 2014-04-18 14:52:04 -07:00
Fabrice Di Meglio
fbb54b8363 Merge "Improve Preference highlighting" 2014-04-18 20:48:27 +00:00
Mark Salyzyn
ca463a2266 am c726f6b5: am b90e504e: am 649da9b5: am 5a47a9f6: Merge "Native Runtime: Add LOG_ID_CRASH" 
* commit 'c726f6b537c5913600bc35ff866f1fb32800b9be':
  Native Runtime: Add LOG_ID_CRASH
 2014-04-18 18:13:35 +00:00
Mark Salyzyn
c726f6b537 am b90e504e: am 649da9b5: am 5a47a9f6: Merge "Native Runtime: Add LOG_ID_CRASH" 
* commit 'b90e504ec17a7f509521c21f2b937a2ebefaf6ab':
  Native Runtime: Add LOG_ID_CRASH
 2014-04-18 16:25:59 +00:00
Youngsang Cho
9a22f0f0a6 Add overlay view in Tv Input Framework 
A TvInputService app developers sometimes want to draw UI above a surface
playing TV. For this purpose, we add a window in TIS and allow developers to
attach their customized view on the TV surface.

Change-Id: I65c3dffa17580b8d4c42fac58bbfc8dad338c185
 2014-04-18 08:36:06 -07:00
Mark Salyzyn
b90e504ec1 am 649da9b5: am 5a47a9f6: Merge "Native Runtime: Add LOG_ID_CRASH" 
* commit '649da9b505498ff87d75da56d376d46c22e50782':
  Native Runtime: Add LOG_ID_CRASH
 2014-04-18 15:08:56 +00:00
Selim Gurun
292601f96f am 14cd25f6: Merge "Provide an API to set print document name." 
* commit '14cd25f619fe981455aec9c79dc1abd89f4f5d8c':
  Provide an API to set print document name.
 2014-04-18 14:53:41 +00:00
Selim Gurun
14cd25f619 Merge "Provide an API to set print document name." 2014-04-18 14:49:25 +00:00
Fabrice Di Meglio
8a86d734e5 Improve Preference highlighting 
- add PreferenceFragment.onBindPreferences() so that we can know
when the binding as been done
- use the Preference's key as a tag for its View (so that we can
locate it latter in the View hierarchy)

Change-Id: Ifb3b30e576048b7464af63643834d278a46a8543
 2014-04-17 19:42:05 -07:00
Ricardo Cervera
c50a14e91a am 92f4a346: am fa711a33: am d09e1bff: am ed5b8c06: am 6aeea454: Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs 
* commit '92f4a3465ea2521523b5659f8006097e07a9be58':
  docs: Added the play from search intent. Bug: 13473141.
 2014-04-18 02:07:44 +00:00
Ricardo Cervera
92f4a3465e am fa711a33: am d09e1bff: am ed5b8c06: am 6aeea454: Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs 
* commit 'fa711a33be265d1fcd08efd850085615ec66dd89':
  docs: Added the play from search intent. Bug: 13473141.
 2014-04-18 02:03:14 +00:00
Ricardo Cervera
fa711a33be am d09e1bff: am ed5b8c06: am 6aeea454: Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs 
* commit 'd09e1bffe412ace61a411873cc8d0a3759540e46':
  docs: Added the play from search intent. Bug: 13473141.
 2014-04-18 01:59:03 +00:00
Ricardo Cervera
d09e1bffe4 am ed5b8c06: am 6aeea454: Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs 
* commit 'ed5b8c06bbc70facbe553a9ca257a277ac3758ca':
  docs: Added the play from search intent. Bug: 13473141.
 2014-04-18 01:54:31 +00:00
Ricardo Cervera
ed5b8c06bb am 6aeea454: Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs 
* commit '6aeea4549787ec282d2ca42b8495b87645958fc9':
  docs: Added the play from search intent. Bug: 13473141.
 2014-04-18 01:49:50 +00:00
Ricardo Cervera
6aeea45497 Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs 2014-04-18 01:46:25 +00:00
Michael Kolb
dfbcf0ca33 am f4399e72: resolved conflict for merge from d42eeab2 to master 
* commit 'f4399e7243c35bef3eabfd20582246818a0bbbd3':
  Populate isRound from config.xml to WindowInsets
 2014-04-18 01:17:38 +00:00
Michael Kolb
f4399e7243 resolved conflict for merge from d42eeab2 to master 
Change-Id: I41bd238f0628110c923b79259de4cd11a783340c
 2014-04-17 18:00:40 -07:00
Selim Cinek
8d19d37938 am 47391720: Merge "ViewGroup now applies clipBounds to its children" 
* commit '473917208961a90ca76fa9b9341b95902859b682':
  ViewGroup now applies clipBounds to its children
 2014-04-18 00:49:39 +00:00
Michael Kolb
d42eeab20f am 4abbd0a6: Merge "Populate isRound from config.xml to WindowInsets" into klp-modular-dev 
* commit '4abbd0a685cb418eb3cfc1f030d3091ef394a7e3':
  Populate isRound from config.xml to WindowInsets
 2014-04-18 00:48:13 +00:00
Michael Kolb
4abbd0a685 Merge "Populate isRound from config.xml to WindowInsets" into klp-modular-dev 2014-04-18 00:44:35 +00:00