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

113509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yorke Lee
a6eba00dde am 2f38d460: am 4459f498: Merge "Update javadocs for number presentation" into klp-dev 
* commit '2f38d460f38efc2cadc6dce0f924fa1523123200':
  Update javadocs for number presentation
 2013-09-10 16:33:34 -07:00
Yorke Lee
2f38d460f3 am 4459f498: Merge "Update javadocs for number presentation" into klp-dev 
* commit '4459f49869d85a4c88cfa311a9a2af45ecc8d056':
  Update javadocs for number presentation
 2013-09-10 16:30:37 -07:00
Yorke Lee
4459f49869 Merge "Update javadocs for number presentation" into klp-dev 2013-09-10 23:25:15 +00:00
Alan Viverette
b1e91e37a3 Merge "Add public attr for fragmentBreadCrumbStyle, apply in constructor" 2013-09-10 23:03:42 +00:00
Yorke Lee
49e1cf946f Update javadocs for number presentation 
Bug: 10461762
Change-Id: Idfd19fb5f522569afa775ce95e0ba975324a0ee2
 2013-09-10 15:34:34 -07:00
Craig Mautner
3f339d8193 am 88cfdae6: am cdd82540: Merge "When waiting for activity to finish don\'t reset" into klp-dev 
* commit '88cfdae667bd85931c1bf81781a54472a8fe3ac7':
  When waiting for activity to finish don't reset
 2013-09-10 15:17:23 -07:00
Craig Mautner
88cfdae667 am cdd82540: Merge "When waiting for activity to finish don\'t reset" into klp-dev 
* commit 'cdd82540f2f98e7b4374fdd81e771eb217a27573':
  When waiting for activity to finish don't reset
 2013-09-10 15:14:42 -07:00
Craig Mautner
cdd82540f2 Merge "When waiting for activity to finish don't reset" into klp-dev 2013-09-10 22:11:58 +00:00
Alan Viverette
aaca5d888a Add public attr for fragmentBreadCrumbStyle, apply in constructor 
BUG: 10680808
Change-Id: I7c22c1ff0b91892e62ea6bf6a311d33df6f13d78
 2013-09-10 15:04:10 -07:00
John Reck
2f93af4574 am 53760b4a: am 874ae2ad: Merge "Fix scissor for functor invocation" into klp-dev 
* commit '53760b4a97fb2f88e94da73d647ff80221b3c454':
  Fix scissor for functor invocation
 2013-09-10 14:08:12 -07:00
John Reck
53760b4a97 am 874ae2ad: Merge "Fix scissor for functor invocation" into klp-dev 
* commit '874ae2adf8c24c4b9d68f781239a95ad047e212a':
  Fix scissor for functor invocation
 2013-09-10 14:05:32 -07:00
John Reck
874ae2adf8 Merge "Fix scissor for functor invocation" into klp-dev 2013-09-10 21:03:48 +00:00
Tim Murray
efb6beb438 am 19c727bb: am 895a4375: Merge "Fix FontRenderer bug." into klp-dev 
* commit '19c727bbc6371924bfd2f85e804b5b6b093a8413':
  Fix FontRenderer bug.
 2013-09-10 14:03:39 -07:00
Tim Murray
19c727bbc6 am 895a4375: Merge "Fix FontRenderer bug." into klp-dev 
* commit '895a43751fcf4f33e5437963d75d05c2cd754520':
  Fix FontRenderer bug.
 2013-09-10 14:01:53 -07:00
Tim Murray
895a43751f Merge "Fix FontRenderer bug." into klp-dev 2013-09-10 21:00:37 +00:00
Tim Murray
7a454ba5fe Fix FontRenderer bug. 
bug 10691313

Change-Id: Icd5341a3c2066e337911f040ddc935c48c8d7cd1
 2013-09-10 13:46:49 -07:00
John Reck
25d2f7bc1f Fix scissor for functor invocation 
Bug: 10677765
 enableScissor() must precede setScissorFromClip() as
 otherwise setScissorFromClip() doesn't do anything.
 Also make sure to call setScissorFromClip() if
 enableScissor() returns true as enableScissor() calls
 resetScissor() if the scissor state has changed.

Change-Id: I9226b20bb256c92066aae344e4e6407540b6eae9
 2013-09-10 20:45:29 +00:00
David Braun
84166e888b am 4cd9612c: am b776122a: Merge "Factor out read/write SMS settings seperate from send/receive." into klp-dev 
* commit '4cd9612c3268277581589b34cc49ed04c93873b2':
  Factor out read/write SMS settings seperate from send/receive.
 2013-09-10 13:38:12 -07:00
David Braun
4cd9612c32 am b776122a: Merge "Factor out read/write SMS settings seperate from send/receive." into klp-dev 
* commit 'b776122a8aa9fd082fa8aaa216c8a589d709c4c9':
  Factor out read/write SMS settings seperate from send/receive.
 2013-09-10 13:35:42 -07:00
Jason Monk
96f098ea01 am b28da848: am e6b4163f: Merge "Verify inputs to PAC resolving." into klp-dev 
* commit 'b28da8489619bafcc0206d3e3b725af91134a6b4':
  Verify inputs to PAC resolving.
 2013-09-10 13:34:32 -07:00
David Braun
b776122a8a Merge "Factor out read/write SMS settings seperate from send/receive." into klp-dev 2013-09-10 20:33:28 +00:00
Jason Monk
b28da84896 am e6b4163f: Merge "Verify inputs to PAC resolving." into klp-dev 
* commit 'e6b4163f38c18072ef89ec593d4647c581dd9a8a':
  Verify inputs to PAC resolving.
 2013-09-10 13:32:08 -07:00
Jason Monk
e6b4163f38 Merge "Verify inputs to PAC resolving." into klp-dev 2013-09-10 20:27:23 +00:00
David Braun
18966a8dd8 Factor out read/write SMS settings seperate from send/receive. 
Change-Id: I161782b1508be433c910ec13c0b18e728bf7d2ba
 2013-09-10 13:14:46 -07:00
Alan Viverette
e2c6f66921 am d54529c4: am 23819e7e: Merge "Make ListView\'s illegal state exception more helpful" into klp-dev 
* commit 'd54529c43545faa10cac4e34e9b8d623de121e2e':
  Make ListView's illegal state exception more helpful
 2013-09-10 13:10:29 -07:00
Alan Viverette
d54529c435 am 23819e7e: Merge "Make ListView\'s illegal state exception more helpful" into klp-dev 
* commit '23819e7e5d3b5e2c5d4b47b1a8133bc950e1eb82':
  Make ListView's illegal state exception more helpful
 2013-09-10 13:08:07 -07:00
Alan Viverette
23819e7e5d Merge "Make ListView's illegal state exception more helpful" into klp-dev 2013-09-10 20:05:59 +00:00
Zhijun He
b87857b50b am 487a8fc9: am 82d11f8e: Merge "MediaMuxer: Add setLocation API" into klp-dev 
* commit '487a8fc9d487a68159c57b4de896ba7be88f1c2b':
  MediaMuxer: Add setLocation API
 2013-09-10 12:48:13 -07:00
Zhijun He
487a8fc9d4 am 82d11f8e: Merge "MediaMuxer: Add setLocation API" into klp-dev 
* commit '82d11f8e94e38e434cb6bc5e3e8d87250956fa1c':
  MediaMuxer: Add setLocation API
 2013-09-10 12:43:59 -07:00
Zhijun He
82d11f8e94 Merge "MediaMuxer: Add setLocation API" into klp-dev 2013-09-10 19:41:11 +00:00
Igor Murashkin
9ee3680397 am 900e04c1: am 50209368: Merge "camera2: Don\'t NPE in onStatusChanged" into klp-dev 
* commit '900e04c1a2e0529a9a99be12222efccd5f74e306':
  camera2: Don't NPE in onStatusChanged
 2013-09-10 12:34:48 -07:00
Igor Murashkin
900e04c1a2 am 50209368: Merge "camera2: Don\'t NPE in onStatusChanged" into klp-dev 
* commit '50209368626d53b1f8a4a6fdf50d280c7cf65a65':
  camera2: Don't NPE in onStatusChanged
 2013-09-10 12:31:47 -07:00
Igor Murashkin
5020936862 Merge "camera2: Don't NPE in onStatusChanged" into klp-dev 2013-09-10 19:29:27 +00:00
Kenny Root
8b79730e21 am 3ae0ffe9: am 0611f477: am 90e42717: Merge changes I5d2be3c5,I9017256b 
* commit '3ae0ffe9c65fc8aee4ce46a5c7fb30747bd4c2fa':
  Add argument to binder call to check key types
  Use hostname verifier directly instead of instance
 2013-09-10 11:58:35 -07:00
Kenny Root
3ae0ffe9c6 am 0611f477: am 90e42717: Merge changes I5d2be3c5,I9017256b 
* commit '0611f47721e32e5386884881b055fde6eec5e3c0':
  Add argument to binder call to check key types
  Use hostname verifier directly instead of instance
 2013-09-10 11:54:32 -07:00
Kenny Root
0611f47721 am 90e42717: Merge changes I5d2be3c5,I9017256b 
* commit '90e42717e590e2f7d2fb7270daae589a97271c63':
  Add argument to binder call to check key types
  Use hostname verifier directly instead of instance
 2013-09-10 11:52:16 -07:00
Kenny Root
90e42717e5 Merge changes I5d2be3c5,I9017256b 
* changes:
  Add argument to binder call to check key types
  Use hostname verifier directly instead of instance
 2013-09-10 18:50:02 +00:00
Chet Haase
b4f6d40f62 am 9f7136e9: am 59b7a4ec: Merge "Fix for transition layout suppression" into klp-dev 
* commit '9f7136e9632a2fa4b8f8b5eaae300b5b104d7807':
  Fix for transition layout suppression
 2013-09-10 11:49:40 -07:00
Kenny Root
0b83f9c805 Add argument to binder call to check key types 
Before there was only one key type supported, so we didn't need to query
a key type. Now there is DSA, EC, and RSA, so there needs to be another
argument.

(cherry picked from commit b91773bce1126d28a93f73fbef18f3a79245f24e)

Bug: 10600582
Change-Id: I5d2be3c514ff7404a90df76dc263484c5f226e6f
 2013-09-10 18:49:40 +00:00
Adam Powell
ab83c7b9b5 am 218b1163: am 6a221b3f: Fix some bizarre Spinner behavior 
* commit '218b116344688053d3856a8ea8abc3dc241bcee1':
  Fix some bizarre Spinner behavior
 2013-09-10 11:49:37 -07:00
Chet Haase
9f7136e963 am 59b7a4ec: Merge "Fix for transition layout suppression" into klp-dev 
* commit '59b7a4ec9ce6e9af3afc5a3e66c7e2f36bd74ab7':
  Fix for transition layout suppression
 2013-09-10 11:47:15 -07:00
Adam Powell
218b116344 am 6a221b3f: Fix some bizarre Spinner behavior 
* commit '6a221b3f85fbe7cbfbd11b9eeb672baca27faec2':
  Fix some bizarre Spinner behavior
 2013-09-10 11:47:12 -07:00
Chet Haase
59b7a4ec9c Merge "Fix for transition layout suppression" into klp-dev 2013-09-10 18:44:21 +00:00
Adam Powell
6a221b3f85 Fix some bizarre Spinner behavior 
* Make sure the recycler is cleared when the adapter is changed.
  Bug 10689596

* Don't add views to measure the baseline.
  Bug 10690353

Change-Id: I841dc05652eef3319721631f96332f7900d1a631
 2013-09-10 11:38:52 -07:00
Chet Haase
a56205c485 Fix for transition layout suppression 
The ChangeBounds transition causes its target view parents to suppress
layout for the duration of the transition. This is done to avoid artifacts
caused by running layout while layout bounds are being animated between
different scene values.

In order to react correctly to new transition/scene information (such as
running a new transition while another is already running), the transition
system calls pause() on all running transitions to allow layout (among other
things) to work correctly, then resume() after this is finished. This works
in general, but pause/resume do not take account of child transitions that
have already played and ended. ChangeBounds, uses pause/resume to
restore normal layout and re-enable layout suppression. This means that
when resume() is called on a ChangeBounds transition that has already
ended, that transition will leave the parent in a suppressed-layout
state, basically forever. This can cause artifacts like we're seeing in
recent ActionBar changes where the account spinner is never repopulated because
layout is never allowed to run.

The fix is to note when a transition ends and noop future calls to pause/resume.

Issue #10648936 Transitions don't work with new ActionBar functionality

Change-Id: Id9d41c0352b2270d46cfd5ad4dba130767bbf303
 2013-09-10 11:36:10 -07:00
Alan Viverette
7d8314db41 Make ListView's illegal state exception more helpful 
Change-Id: I3d3205d32c6992c184a218248ba72ebf6c45a2d1
 2013-09-10 11:22:53 -07:00
Amith Yamasani
622bf2220c Backup and restore ringtone and notification ringtone 
Use the new content provider API to canonicalize Uris.
If the provider doesn't support it, don't save the value,
unless it's a silent ringtone.

Bug: 10130785

Change-Id: Id08bb2812b9b2a7036a25801d1997661b0017629
 2013-09-10 11:08:24 -07:00
Kenny Root
4a406787c7 Use hostname verifier directly instead of instance 
Instead of local instance of the default HostnameVerifier, use it
directly from HttpsURLConnection. This avoids class preloading creating
an instance of it before it's necessary.

(cherry picked from commit 928ee1e48fa89302d02fdf8a8a2c7315d7195e7c)

Bug: 9984058
Change-Id: I9017256b3b5d137aeb5a6f455868af7bdfec7885
 2013-09-10 11:05:23 -07:00
Santos Cordon
4f7ffa90d1 Add permissions for the InCallUI Split. 
Change-Id: I7e45aeebbe8873f99fe897272390fb06f1840d2d
 2013-09-10 10:43:05 -07:00
Vinit Deshapnde
de1ef64063 am f7bea433: am ba85b970: Merge "Set country code on P2p interfaces as well" into klp-dev 
* commit 'f7bea43325e0ffe04f3a7f729cb141f690c58d2a':
  Set country code on P2p interfaces as well
 2013-09-10 10:38:02 -07:00