Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
117,421 Commits 3 Branches 0 Tags
183cd0ca649c9d79a70a6d79ba7e2217fe37fa25
Commit Graph

32742 Commits

Author SHA1 Message Date
Kenny Root
183cd0ca64 am 7a2f4ae1: am 69779458: am 7878883e: Merge "Remove direct reference to X509CertImpl" 
* commit '7a2f4ae13223bb804417e9ce3294b22bd9bda49a':
  Remove direct reference to X509CertImpl
 2013-10-14 14:07:05 -07:00
Kenny Root
7a2f4ae132 am 69779458: am 7878883e: Merge "Remove direct reference to X509CertImpl" 
* commit '69779458aeef3fa9d9c6f54487784cf558c850e8':
  Remove direct reference to X509CertImpl
 2013-10-14 14:04:55 -07:00
Kenny Root
69779458ae am 7878883e: Merge "Remove direct reference to X509CertImpl" 
* commit '7878883ed922f17c930c0d40588f62acf73f9a9c':
  Remove direct reference to X509CertImpl
 2013-10-14 14:02:52 -07:00
Kenny Root
27e549428e Remove direct reference to X509CertImpl 
This should use the system default X.509 certificate provider.

Change-Id: Ibdfd800a9d10f9dc566a360401efe7c3dc6cef5d
 2013-10-14 13:39:43 -07:00
John Spurlock
cf2d725b55 resolved conflicts for merge of f1dd32c8 to master 
Change-Id: Ied96bfce952fa95eeceb1b8cf64e53830d4d03ac
 2013-10-14 14:49:58 -04:00
Victoria Lease
f3bd8d4843 am 4c4a469c: am 677687c2: am edbab7b5: Merge "no layout = no visibility" into klp-dev 
* commit '4c4a469cbfe61f50c23b70d8b2e63f7b661745c7':
  no layout = no visibility
 2013-10-14 11:28:52 -07:00
Adam Powell
d33c97e2de am 5d96f61a: am c12f46eb: am 5db566f1: Fix updating fast scroll state for data set changes 
* commit '5d96f61a92de034cb736fa831067759809ca83f9':
  Fix updating fast scroll state for data set changes
 2013-10-14 10:53:07 -07:00
Dianne Hackborn
9d343c2606 am f2896e28: am 9e4403d4: am ef53fcc3: Merge "Fix issue #11199654: Action bar enter animation skips frames when cleared by the system" into klp-dev 
* commit 'f2896e2897cace31d82d917f73b787a9d87b21cb':
  Fix issue #11199654: Action bar enter animation skips frames when cleared by the system
 2013-10-14 10:52:33 -07:00
Aravind Akella
45484ee6bb am 67af9ce3: am c73810de: am 45ca531e: Merge "Adding stepcounter & stepdetector feature strings." into klp-dev 
* commit '67af9ce31e7642ffc5737b9c29812c4bfdf789e0':
  Adding stepcounter & stepdetector feature strings.
 2013-10-14 10:52:15 -07:00
Adam Powell
161b157b87 am 6a564f96: am 7555372f: am 85e5ed63: Merge "Account for translationY when targeting the fast scroller via touch" into klp-dev 
* commit '6a564f961675e8dd6b1a518a5c82555d616b3d04':
  Account for translationY when targeting the fast scroller via touch
 2013-10-14 10:52:00 -07:00
Svetoslav Ganov
64e4896dbb am b6fd5789: am 64655e81: am 65d7b8d0: Merge "The list of active print jobs in print service retunring wrong result." into klp-dev 
* commit 'b6fd5789ee73ae8abeaa69818d74d9461bd38165':
  The list of active print jobs in print service retunring wrong result.
 2013-10-14 10:51:37 -07:00
Svetoslav Ganov
e50c500924 am ff98feec: am 79ddf835: am bececbfa: Merge "Printed document size not persisted." into klp-dev 
* commit 'ff98feec6f37485b7f5e025d221fe5c9ae147b03':
  Printed document size not persisted.
 2013-10-14 10:50:50 -07:00
Svetoslav Ganov
132a9e2a6e am 603ece2e: am bfc8edcf: am 63ce2019: Merge "Fail only scheduled print jobs, i.e. handed to a service, if the service is disabled." into klp-dev 
* commit '603ece2e8e3f5a73007fd42d3be52123a351eef0':
  Fail only scheduled print jobs, i.e. handed to a service, if the service is disabled.
 2013-10-14 10:50:42 -07:00
Chris Craik
37c4687190 am e0db6fc6: am 8d56f667: am 709129ba: Merge "Document special case in hasOverlappingRendering" into klp-dev 
* commit 'e0db6fc6847f0404b704c179d4795b27d9025693':
  Document special case in hasOverlappingRendering
 2013-10-14 10:48:57 -07:00
Matthew Williams
d08d6686c5 resolved conflicts for merge of 94b51810 to master 
Change-Id: Ida818f066b66c356a84c80e5eab0a4e2cf4ebd49
 2013-10-14 10:39:41 -07:00
John Spurlock
f1dd32c84f am fc2ecd5e: am 774e8ad8: Merge "Implement new SYSTEM_UI_FLAG_IMMERSIVE_STICKY." into klp-dev 
* commit 'fc2ecd5e3f5b336f7955f4c02521ba6faad1e93c':
  Implement new SYSTEM_UI_FLAG_IMMERSIVE_STICKY.
 2013-10-14 10:29:12 -07:00
John Spurlock
774e8ad883 Merge "Implement new SYSTEM_UI_FLAG_IMMERSIVE_STICKY." into klp-dev 2013-10-14 17:21:33 +00:00
Victoria Lease
4c4a469cbf am 677687c2: am edbab7b5: Merge "no layout = no visibility" into klp-dev 
* commit '677687c20864d4af9c24614f22aae035c0c07ce6':
  no layout = no visibility
 2013-10-14 10:12:01 -07:00
John Spurlock
f1a36648ca Implement new SYSTEM_UI_FLAG_IMMERSIVE_STICKY. 
Migrate transient bar mode to IMMERSIVE_STICKY, and
introduce new behavior for IMMERSIVE: namely the
opaque bars are revealed by clearing the flags on swipe.

Remove low-profile optimization that confuses api demos
and other apps using low-profile as a signal.

TransientNavigationConfirmation renamed to
ImmersiveModeConfirmation, and its associated resources,
since the confirmation is now shown when the nav bar is
shown in either of the two immersive modes.

Remove unused Toast.makeBar and associated hidden framework
bits now that the confirmation uses a cling instead.

Bug:11062108
Change-Id: Iae49d31973940b9bee9f5b1827756db5eaa76aa3
 2013-10-14 13:11:21 -04:00
Victoria Lease
edbab7b582 Merge "no layout = no visibility" into klp-dev 2013-10-14 17:08:10 +00:00
Narayan Kamath
12b28ce4e8 Fix minor thread corectness issue in NetworkInfo 
Hold the right lock while copying info from another
NetworkInfo object to prevent changes being made to it
while the copy is in progress.

Change-Id: I1aa2c29e81e045b0359f957352c438e79e692823
 2013-10-14 09:07:40 +00:00
Adam Powell
5d96f61a92 am c12f46eb: am 5db566f1: Fix updating fast scroll state for data set changes 
* commit 'c12f46ebb9f93016ef11511a3e8038718a016beb':
  Fix updating fast scroll state for data set changes
 2013-10-13 19:04:50 -07:00
Adam Powell
5db566f16a Fix updating fast scroll state for data set changes 
Only looking for old/new count changes is incomplete with the current
state of things. The observer's onChanged method will update this in
some cases, stomping the different values needed to trigger a fast
scroller update. Also update the fast scroller if the data change flag
is set.

Also fix the positioning of the legacy text overlay.

Bug 11188512

Change-Id: I35b3915ce49f8494c6d82f6be6d6df7169deddd7
 2013-10-13 18:49:15 -07:00
Dianne Hackborn
f2896e2897 am 9e4403d4: am ef53fcc3: Merge "Fix issue #11199654: Action bar enter animation skips frames when cleared by the system" into klp-dev 
* commit '9e4403d4c676d5c97f39ab4fb2debf1ca2d060ec':
  Fix issue #11199654: Action bar enter animation skips frames when cleared by the system
 2013-10-13 16:09:25 -07:00
Dianne Hackborn
021d243d6d Fix issue #11199654: Action bar enter animation skips frames when cleared by the system 
We have become too aggressive about not allowing windows to draw while windw
animations are running, basically not allowing any drawing in any window when
there is any window animation.  So if you did a relayout while the status bars
were being animated, your window would stop drawing until that status bar
animation was complete.

This change relaxes those rules in two ways:

- A particular window will only be told to stop updating when *it* is
  currently involved in a window animation.  So animations in status bars
  will not stop app windows from update, and vice versa.

- If a window receives input events while it is in the "do not update"
  state, we will immediately terminate that state and start allowing it to
  draw.  If the user is actually interacting with a window, we don't want
  to wait to show feedback.

Change-Id: I72574eec048aee53115b46a78686cf27f42c42f7
 2013-10-13 15:56:29 -07:00
Aravind Akella
67af9ce31e am c73810de: am 45ca531e: Merge "Adding stepcounter & stepdetector feature strings." into klp-dev 
* commit 'c73810de2fa9184d808719ccdfe5f1a8b9864135':
  Adding stepcounter & stepdetector feature strings.
 2013-10-13 15:55:32 -07:00
Aravind Akella
45ca531e77 Merge "Adding stepcounter & stepdetector feature strings." into klp-dev 2013-10-13 22:48:03 +00:00
Victoria Lease
b9b77aecf2 no layout = no visibility 
This fixes an Editor crash when the associated TextView's Layout
is null.

Bug: 11165608
Change-Id: I061c0db6eef95bf39a7696ad6e6f919bd22bfb11
 2013-10-13 15:12:52 -07:00
Adam Powell
6a564f9616 am 7555372f: am 85e5ed63: Merge "Account for translationY when targeting the fast scroller via touch" into klp-dev 
* commit '7555372f019b06f8849e3e56e6921e505592fe23':
  Account for translationY when targeting the fast scroller via touch
 2013-10-13 14:33:04 -07:00
Adam Powell
85e5ed639d Merge "Account for translationY when targeting the fast scroller via touch" into klp-dev 2013-10-13 21:26:35 +00:00
Adam Powell
d827389684 Account for translationY when targeting the fast scroller via touch 
Bug 11188512

Change-Id: Ia8e0088760a18d5862bbe1b904610abd908a190e
 2013-10-13 13:35:27 -07:00
Svetoslav Ganov
b6fd5789ee am 64655e81: am 65d7b8d0: Merge "The list of active print jobs in print service retunring wrong result." into klp-dev 
* commit '64655e81640ad5623d6a1b03f04320c16be8b101':
  The list of active print jobs in print service retunring wrong result.
 2013-10-13 12:18:53 -07:00
Svetoslav Ganov
65d7b8d0db Merge "The list of active print jobs in print service retunring wrong result." into klp-dev 2013-10-13 19:10:12 +00:00
Eino-Ville Talvala
12e9f69913 am 914970b4: am d38b1302: Merge "DO NOT MERGE: Hide new camera API." into klp-dev 
* commit '914970b4735993df3246b02fd9a18b55f15ea8d4':
  DO NOT MERGE: Hide new camera API.
 2013-10-12 18:56:23 -07:00
Eino-Ville Talvala
d38b1302b7 Merge "DO NOT MERGE: Hide new camera API." into klp-dev 2013-10-13 01:50:30 +00:00
Aravind Akella
068b0c05fe Adding stepcounter & stepdetector feature strings. 
Change-Id: Ic8cc95612f776db7cb1d1c13a228d5cd8ed64f56
 2013-10-12 18:47:00 -07:00
Svetoslav Ganov
ff98feec6f am 79ddf835: am bececbfa: Merge "Printed document size not persisted." into klp-dev 
* commit '79ddf835227283979dc353e57711a9d6dff8edb0':
  Printed document size not persisted.
 2013-10-12 17:37:38 -07:00
Svetoslav Ganov
603ece2e8e am bfc8edcf: am 63ce2019: Merge "Fail only scheduled print jobs, i.e. handed to a service, if the service is disabled." into klp-dev 
* commit 'bfc8edcf55c4f65ec00ca5d921a3cae1b367b248':
  Fail only scheduled print jobs, i.e. handed to a service, if the service is disabled.
 2013-10-12 17:37:35 -07:00
Svetoslav Ganov
d91cb3ea61 The list of active print jobs in print service retunring wrong result. 
1. The getActivePrintJobs() method in print service is designed to return
   the active print job i.e. ones scheduled to be processed by the print
   service. Now the correct list is returned.

2. The listeners for observing the state of print jobs may be called even
   after being unregistered. Ex: state change occurs and we schedule a
   message on the app's main thread to make the notificaion. Now the app
   unregisretes the callback and on the next loop the notification message
   is handled.

bug:11200258

Change-Id: I4a497b5c9a7287a22023cafe41ce966d14300ca6
 2013-10-12 16:09:29 -07:00
Svetoslav Ganov
7d7888d1c7 Printed document size not persisted. 
We persist ongoing print jobs so they can be restarted if the device
dies. The data size of the printed document was not persisted to disc.

bug:11199352

Change-Id: I53ef1ee285aa4808917dd6a5c7335226aba1ef0a
 2013-10-12 13:18:16 -07:00
Svetoslav Ganov
9b6d3a153f Fail only scheduled print jobs, i.e. handed to a service, if the service is disabled. 
When a print service is disabled we assume all print jobs for it failed as we have
no way to know what happens to them. However we are also failing created print jobs,
i.e. ones not given to the service. Such jobs are in process of construction and
the print dialog is up. We should not fail such jobs as the dialog can still modify
their state and potentially select a print from a different service. Therefore, we
leave them alone and they will be failed if when constructed are passed to a
disabled/uninstalled service.

bug:11197432

Change-Id: Ie4fe54327e3e25776b1dd572be2dfafdd700c2e5
 2013-10-12 12:35:44 -07:00
Chris Craik
e0db6fc684 am 8d56f667: am 709129ba: Merge "Document special case in hasOverlappingRendering" into klp-dev 
* commit '8d56f667243292ed002dce81498be0e4d4a3ea59':
  Document special case in hasOverlappingRendering
 2013-10-11 17:14:12 -07:00
Chris Craik
709129ba93 Merge "Document special case in hasOverlappingRendering" into klp-dev 2013-10-12 00:08:08 +00:00
Chris Craik
c09127a7c3 Document special case in hasOverlappingRendering 
bug:11121809

Change-Id: I074ac47aa510bd2362cfda7dffc73930f07e925c
 2013-10-11 17:00:16 -07:00
Matthew Williams
94b518101c am e0a2bdaf: am 32551ae5: Merge "Fix infinite boot-loop bug in SM." into klp-dev 
* commit 'e0a2bdaf61a7a72e92d614f81f86e7fd441b38e4':
  Fix infinite boot-loop bug in SM.
 2013-10-11 14:33:18 -07:00
Matthew Williams
32551ae519 Merge "Fix infinite boot-loop bug in SM." into klp-dev 2013-10-11 21:26:19 +00:00
Chris Craik
e6931c14ba am 87e127d5: am 1ae78c07: am c2245e1a: Merge "Workaround fading edge incompatibility with alpha modulation" into klp-dev 
* commit '87e127d5a8d095b58c0d433be31ba04ce31aae98':
  Workaround fading edge incompatibility with alpha modulation
 2013-10-11 14:09:54 -07:00
Chris Craik
87e127d5a8 am 1ae78c07: am c2245e1a: Merge "Workaround fading edge incompatibility with alpha modulation" into klp-dev 
* commit '1ae78c07807e0db300f965bf3b0371f3eddc2d15':
  Workaround fading edge incompatibility with alpha modulation
 2013-10-11 14:06:38 -07:00
Svetoslav
1d4a8bf4c4 am 6346a928: am c8c943a9: am 3691dd06: Merge "Print spooler not starting." into klp-dev 
* commit '6346a9285a3a1a45da4cfda26ea6ed454a87114f':
  Print spooler not starting.
 2013-10-11 14:02:49 -07:00
Svetoslav
6346a9285a am c8c943a9: am 3691dd06: Merge "Print spooler not starting." into klp-dev 
* commit 'c8c943a93044f63e27b725901568dc62a84606a8':
  Print spooler not starting.
 2013-10-11 13:59:39 -07:00