Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
178,392 Commits 3 Branches 0 Tags
3f8140543eb84731ae91cfe4783dcfd619903e21
Commit Graph

48652 Commits

Author SHA1 Message Date
Christoph Studer
3f8140543e am 88fb463e: am 0bb83b07: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-mr1-dev 
automerge: 2bd62b5

* commit '2bd62b53b68834cabb48be608ee350012b1e8043':
  Fix MediaStyle docs mentioning 2 max actions in compact view
 2014-12-16 18:34:33 +00:00
Christoph Studer
2bd62b53b6 am 88fb463e: am 0bb83b07: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-mr1-dev 
* commit '88fb463ea355303f03535a29ac5935bf69d8a50e':
  Fix MediaStyle docs mentioning 2 max actions in compact view
 2014-12-16 18:31:53 +00:00
Christoph Studer
88fb463ea3 am 0bb83b07: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-mr1-dev 
* commit '0bb83b07d1602c1a99c938471edfc411a47dbffc':
  Fix MediaStyle docs mentioning 2 max actions in compact view
 2014-12-16 18:26:26 +00:00
Christoph Studer
0bb83b07d1 Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-mr1-dev 2014-12-16 18:16:42 +00:00
Adam Powell
0b3d12aadf am 91ff85da: am 67af29f6: Merge "Fix touch intercept bug in ResolverDrawerLayout" into lmp-mr1-dev 
automerge: ea12691

* commit 'ea12691338cba1d3b6547b6eefb52388f1ed4a28':
  Fix touch intercept bug in ResolverDrawerLayout
 2014-12-16 18:15:21 +00:00
Adam Powell
ea12691338 am 91ff85da: am 67af29f6: Merge "Fix touch intercept bug in ResolverDrawerLayout" into lmp-mr1-dev 
* commit '91ff85da1a2a106c8ddb5e204928e0d6ef094283':
  Fix touch intercept bug in ResolverDrawerLayout
 2014-12-16 18:13:01 +00:00
Adam Powell
91ff85da1a am 67af29f6: Merge "Fix touch intercept bug in ResolverDrawerLayout" into lmp-mr1-dev 
* commit '67af29f6d642c3c578ee1b5af70dc525955982a5':
  Fix touch intercept bug in ResolverDrawerLayout
 2014-12-16 18:08:34 +00:00
Alan Viverette
b910bd7615 Merge "Allow theme attributes in <include> tag, fix <tag> context" 2014-12-16 18:01:26 +00:00
Adam Powell
67af29f6d6 Merge "Fix touch intercept bug in ResolverDrawerLayout" into lmp-mr1-dev 2014-12-16 18:01:04 +00:00
Andre Eisenbach
284e66e23c am f6b62a9d: am cd460538: Merge "Don\'t send the onServiceDisconnected callback after close." into lmp-mr1-dev 
automerge: 7ea97e2

* commit '7ea97e28e6a2271fd4d60c07b4fa83e019e3474a':
  Don't send the onServiceDisconnected callback after close.
 2014-12-16 17:30:33 +00:00
Andre Eisenbach
7ea97e28e6 am f6b62a9d: am cd460538: Merge "Don\'t send the onServiceDisconnected callback after close." into lmp-mr1-dev 
* commit 'f6b62a9d913441cb400fc60f3187fc9c1f28dc97':
  Don't send the onServiceDisconnected callback after close.
 2014-12-16 17:27:46 +00:00
Andre Eisenbach
f6b62a9d91 am cd460538: Merge "Don\'t send the onServiceDisconnected callback after close." into lmp-mr1-dev 
* commit 'cd460538a4e00cd36be478b00d298a6e2526528f':
  Don't send the onServiceDisconnected callback after close.
 2014-12-16 17:21:13 +00:00
Benjamin Franz
c88b6bdcfa Don't send the onServiceDisconnected callback after close. 
Bug: 18667402
Change-Id: Ia029fd861d643f6646fb124d76ca2a1d2a1a695a
 2014-12-16 15:33:03 +00:00
Jay Shrauner
081d7d5091 am 58d66c30: am 12b5e504: Merge "Fix NPE in Transport.applyBatch" into lmp-mr1-dev automerge: 59e96ee 
* commit '58d66c30d78a70c7bb5d2a62669ed64d6931b777':
  Fix NPE in Transport.applyBatch
 2014-12-16 01:53:20 +00:00
Jay Shrauner
58d66c30d7 am 12b5e504: Merge "Fix NPE in Transport.applyBatch" into lmp-mr1-dev 
automerge: 59e96ee

* commit '59e96ee423f4fc810f29451144143a581a8cd99a':
  Fix NPE in Transport.applyBatch
 2014-12-16 01:45:09 +00:00
Alan Viverette
866180198a Allow theme attributes in <include> tag, fix <tag> context 
BUG: 17658979
Change-Id: I1896ef88ee850f665c7cbbec522e1942897f91e9
 2014-12-15 16:58:19 -08:00
Jay Shrauner
59e96ee423 am 12b5e504: Merge "Fix NPE in Transport.applyBatch" into lmp-mr1-dev 
* commit '12b5e504fd3845fed9c649cf01cd27b84fb6742c':
  Fix NPE in Transport.applyBatch
 2014-12-16 00:55:11 +00:00
Alan Viverette
3224f3530c Merge "Clean up ViewStub inflation to ensure it has resources" 2014-12-15 23:18:14 +00:00
Alan Viverette
daed966bce Merge "Don't force hardware acceleration for services on low-end GFX" 2014-12-15 21:41:07 +00:00
Alan Viverette
9ecb73c7d8 Don't force hardware acceleration for services on low-end GFX 
BUG: 18732678
Change-Id: I136135a91296de3e7d4c089b61019a5395de4a5b
 2014-12-15 13:40:28 -08:00
Jay Shrauner
ac2506c7e3 Fix NPE in Transport.applyBatch 
Bug:18756774
Change-Id: I1da4f0131b1529598043e4cb9fb226d02bff8669
 2014-12-15 13:25:52 -08:00
Adam Powell
f0af0ea33b Fix touch intercept bug in ResolverDrawerLayout 
ResolverDrawerLayout could get into a state where it thought a drag
was in progress, but since there was no distance to drag it would
return false from onTouchEvent for ACTION_DOWN. This would cause it to
intercept all future touch events, blocking interaction with
ResolverDrawerLayout child views. This would only happen if none of
the child views wanted the initial ACTION_DOWN event and it ended up
being processed in the ResolverDrawerLayout itself, such as in
response to touching in empty space or on the title text, and if all
available options fit in view without needing to expand the drawer.

Fix this by only setting the dragging bit if we're going to claim the
rest of the touch events after ACTION_DOWN.

Bug 18563698

Change-Id: Iab2ec38528697c9ff36bbb08b1f1210a6879d5ef
 2014-12-15 13:18:06 -08:00
Alan Viverette
43cd1ddc81 Merge "Prune the resource cache before adding new caches" 2014-12-15 20:03:10 +00:00
Elliott Hughes
c4e9215fa5 am 2a6426c9: am e9e1e0d2: Merge "Reimplement reopenStdio in Java." 
automerge: 3e8484c

* commit '3e8484c3f7f615c4b3f1cb925c4164d513cc0e97':
  Reimplement reopenStdio in Java.
 2014-12-15 19:39:58 +00:00
Elliott Hughes
3e8484c3f7 am 2a6426c9: am e9e1e0d2: Merge "Reimplement reopenStdio in Java." 
* commit '2a6426c900d319c7b928242694ad050a73ad324b':
  Reimplement reopenStdio in Java.
 2014-12-15 19:38:04 +00:00
Alan Viverette
39a72dd207 Clean up ViewStub inflation to ensure it has resources 
BUG: 18642716
Change-Id: I52be9d379672ef143cd385c78a8e0744225de4ae
 2014-12-15 11:23:57 -08:00
Elliott Hughes
dac83f5e6a Reimplement reopenStdio in Java. 
Bug: 18719692
Change-Id: I4ed984cd6148c5cba75d46a60f32a0687a5bcac3
 2014-12-15 11:00:25 -08:00
Marvin Paul
111d166017 Merge "Implemented backup and restore for account sync settings." 2014-12-15 18:22:46 +00:00
Alan Viverette
4ae0d9045f am 2f11125a: am 9973643b: Merge "Give accessibility delegate the first pass at handling ACTION_CLICK" into lmp-mr1-dev 
automerge: 878a5a6

* commit '878a5a6cd7109183928b9b8b533f11347fd0591a':
  Give accessibility delegate the first pass at handling ACTION_CLICK
 2014-12-15 17:41:55 +00:00
Alan Viverette
f19ef0fdc3 am 2311ded6: am 2649c58b: Merge "Avoid self-recursion if client calls init() from date listener" into lmp-mr1-dev 
automerge: 37ea640

* commit '37ea640fa9e8de304ce5f9c9576e370baa85929e':
  Avoid self-recursion if client calls init() from date listener
 2014-12-15 17:40:42 +00:00
Alan Viverette
878a5a6cd7 am 2f11125a: am 9973643b: Merge "Give accessibility delegate the first pass at handling ACTION_CLICK" into lmp-mr1-dev 
* commit '2f11125a7186cc65713804c939a0e538538d9f35':
  Give accessibility delegate the first pass at handling ACTION_CLICK
 2014-12-15 17:38:25 +00:00
Alan Viverette
37ea640fa9 am 2311ded6: am 2649c58b: Merge "Avoid self-recursion if client calls init() from date listener" into lmp-mr1-dev 
* commit '2311ded6a3da117aee221c0cf1168c24160d9041':
  Avoid self-recursion if client calls init() from date listener
 2014-12-15 17:38:19 +00:00
Alan Viverette
2f11125a71 am 9973643b: Merge "Give accessibility delegate the first pass at handling ACTION_CLICK" into lmp-mr1-dev 
* commit '9973643bfc123fcc73803542ef8cb74e243907ce':
  Give accessibility delegate the first pass at handling ACTION_CLICK
 2014-12-15 17:31:36 +00:00
Alan Viverette
2311ded6a3 am 2649c58b: Merge "Avoid self-recursion if client calls init() from date listener" into lmp-mr1-dev 
* commit '2649c58b460c2cd841173a8db513a54180422330':
  Avoid self-recursion if client calls init() from date listener
 2014-12-15 17:31:31 +00:00
Alan Viverette
9973643bfc Merge "Give accessibility delegate the first pass at handling ACTION_CLICK" into lmp-mr1-dev 2014-12-15 17:27:24 +00:00
Alan Viverette
2649c58b46 Merge "Avoid self-recursion if client calls init() from date listener" into lmp-mr1-dev 2014-12-15 17:26:39 +00:00
Paul Crowley
c9a6ccaa1d Merge "Clean up and fix warnings in LockPatternView: make things final and private, remove unnecessary synchronization, suppress warnings where appropriate." 2014-12-15 14:24:08 +00:00
Marcin Kosiba
84644f107d Add WebView documentation about the layout height parameter. 
BUG: 12825214
Change-Id: I8e0e8b79af1a5358307de34e1b4238ec9a1d19ad
 2014-12-15 11:26:16 +00:00
Paul Crowley
a97227add8 Clean up and fix warnings in LockPatternView: make things final 
and private, remove unnecessary synchronization, suppress warnings
where appropriate.

Change-Id: Ie956f45d887e518db6eec8ab34a713565ebd3ca3
 2014-12-15 10:28:44 +00:00
Elliott Hughes
7f3a73c7b5 am 20c906a8: am a101befb: Merge "Lose some unnecessary JNI from the zygote." 
automerge: a95b568

* commit 'a95b568f9afcabb067f5ec8ef602800a89d273ee':
  Lose some unnecessary JNI from the zygote.
 2014-12-12 23:38:23 +00:00
Elliott Hughes
a95b568f9a am 20c906a8: am a101befb: Merge "Lose some unnecessary JNI from the zygote." 
* commit '20c906a8d40aed68ee35095f322739664e1e223a':
  Lose some unnecessary JNI from the zygote.
 2014-12-12 23:32:06 +00:00
Paul Miller
ee87841395 Merge "Update CookieManager documentation" 2014-12-12 22:34:08 +00:00
Alan Viverette
0cecbc9c72 Avoid self-recursion if client calls init() from date listener 
BUG: 18736166
Change-Id: Ibe04040356f4a3e4479ea55c53a0e167144ff877
 2014-12-12 14:32:43 -08:00
Alan Viverette
cd305ae3ce Give accessibility delegate the first pass at handling ACTION_CLICK 
Delegation is broken for widgets, but this fixes the most egregious issue
where TextViews that are top-level list items weren't handling CLICK
actions correctly. This will still need work, since now the focus action
won't run, but it's an improvement.

BUG: 18736135
Change-Id: I808ef628198946cc87f13c53d6245cd162a1e517
 2014-12-12 14:13:24 -08:00
Paul Miller
9d67f36651 Update CookieManager documentation 
The CookieManager documentation became incorrect after deprecating
CookieSyncManager. Remove the note about CookieSyncManager.

code.google.com/p/android/issues/detail?id=82052

Change-Id: I13bc52716cd71e47b67148186a69f7269e418864
 2014-12-12 22:08:03 +00:00
Elliott Hughes
3fe595108f Lose some unnecessary JNI from the zygote. 
Bug: 18719692
Change-Id: Ie2d50400f10f3c54cfbf94e54656f6d704eac267
 2014-12-12 14:07:34 -08:00
Svet Ganov
103f52e1b2 am e608644a: am 7486bc1f: Merge "Fix an edge case in computing click location in accessibility mode." into lmp-mr1-dev 
automerge: 1301446

* commit '1301446c01182b41c3f922121d21ed9b383cc4df':
  Fix an edge case in computing click location in accessibility mode.
 2014-12-12 21:05:01 +00:00
Svet Ganov
1301446c01 am e608644a: am 7486bc1f: Merge "Fix an edge case in computing click location in accessibility mode." into lmp-mr1-dev 
* commit 'e608644a9f0fa54a05379c171814569816145801':
  Fix an edge case in computing click location in accessibility mode.
 2014-12-12 21:02:24 +00:00
Raph Levien
8fdf39753b Merge "Revert "Fix missing ellipsis when just one character is truncated"" 2014-12-12 20:57:09 +00:00
Svet Ganov
e608644a9f am 7486bc1f: Merge "Fix an edge case in computing click location in accessibility mode." into lmp-mr1-dev 
* commit '7486bc1f5a8156e9b586ebb9c32ced218e668652':
  Fix an edge case in computing click location in accessibility mode.
 2014-12-12 20:54:38 +00:00