Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,961 Commits 3 Branches 0 Tags
591a708ea06acc1cdb017fb00e04118eceabc85a
Commit Graph

82961 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
591a708ea0 am 08532ab9: Merge "Fix indeterminate ProgressBars with weird sizes and padding; optimize ActionBar measurement" into jb-mr1-dev 
* commit '08532ab9ba073c217e39272db00740d75f00248a':
  Fix indeterminate ProgressBars with weird sizes and padding; optimize ActionBar measurement
 2012-08-08 16:07:33 -07:00
Adam Powell
08532ab9ba Merge "Fix indeterminate ProgressBars with weird sizes and padding; optimize ActionBar measurement" into jb-mr1-dev 2012-08-08 16:04:35 -07:00
Adam Powell
6322af54cf Fix indeterminate ProgressBars with weird sizes and padding; optimize 
ActionBar measurement

Fix a bug where preserved aspect ratios in ProgressBar indeterminate
drawables were causing drawable bounds to be calculated incorrectly
when the ProgressBar had padding specified.

Measure the ActionBar menu view's height with EXACT measure mode,
preventing an extra measure pass to match child heights for some
cases.

Change-Id: I8c4678662a015b57ba2686d5b5c5fc27d4ef8d36
 2012-08-08 16:02:36 -07:00
Romain Guy
091b517139 am c89b14bb: It seems that apparently useless public APIs are actually useful Bug #6953651 
* commit 'c89b14bba0f6cc2c91629080617f7ed215f697f3':
  It seems that apparently useless public APIs are actually useful Bug #6953651
 2012-08-08 15:01:43 -07:00
Romain Guy
c89b14bba0 It seems that apparently useless public APIs are actually useful 
Bug #6953651

Change-Id: Ic47ce504e63262711f5d3edc76f7d2b9c12471ad
 2012-08-08 14:58:54 -07:00
Kenny Root
3d1235a51b am 6ab4511a: Merge "Use TrustedCertificateStore for chain building" into jb-mr1-dev 
* commit '6ab4511aa61f48cd2b4fe0444077d78cd404bab7':
  Use TrustedCertificateStore for chain building
 2012-08-08 14:50:59 -07:00
Kenny Root
6ab4511aa6 Merge "Use TrustedCertificateStore for chain building" into jb-mr1-dev 2012-08-08 14:49:30 -07:00
Subir Jhanb
95c29a8bbc am 603af61a: Add a new permission to have access to Gal Provider BUG:6897999 
* commit '603af61a7cd49f214743b286520419a3fe460774':
  Add a new permission to have access to Gal Provider BUG:6897999
 2012-08-08 14:37:42 -07:00
Subir Jhanb
603af61a7c Add a new permission to have access to Gal Provider 
BUG:6897999

Change-Id: Ie60963b7f3911b402b971e794178754e1b4f0a43
 2012-08-08 14:31:45 -07:00
Jean-Baptiste Queru
c366e19823 am 9951b7c4: am e5c46fae: am 6d0dd51e: Merge "Return early when checking divider before child zero." 
* commit '9951b7c4f094d39db70626ed665f848971220c48':
  Return early when checking divider before child zero.
 2012-08-08 14:10:57 -07:00
Jean-Baptiste Queru
1cc9386e96 am 88a42921: am 807c7ae0: am 7835d4fb: Merge "Fix SurfaceView notifies on invalid surfaces." 
* commit '88a4292186fef902db476d63529d0b15a17d9d4d':
  Fix SurfaceView notifies on invalid surfaces.
 2012-08-08 14:10:53 -07:00
Jean-Baptiste Queru
9039f65ca2 am b6039811: am 05e97e81: am 0be33f2d: Merge "Add shortcut to avoid potential divide by zero in some case" 
* commit 'b6039811fa0fbc23f25c47491810faeb04ce3125':
  Add shortcut to avoid potential divide by zero in some case
 2012-08-08 14:10:50 -07:00
Jean-Baptiste Queru
9951b7c4f0 am e5c46fae: am 6d0dd51e: Merge "Return early when checking divider before child zero." 
* commit 'e5c46faefb9deda885cff308ec9b1926636ca8bc':
  Return early when checking divider before child zero.
 2012-08-08 14:08:42 -07:00
Jean-Baptiste Queru
88a4292186 am 807c7ae0: am 7835d4fb: Merge "Fix SurfaceView notifies on invalid surfaces." 
* commit '807c7ae00bc5b8a7fe68ba4acbfa3909a955ae70':
  Fix SurfaceView notifies on invalid surfaces.
 2012-08-08 14:08:38 -07:00
Jean-Baptiste Queru
b6039811fa am 05e97e81: am 0be33f2d: Merge "Add shortcut to avoid potential divide by zero in some case" 
* commit '05e97e81a5fa2c9cab4cdda15aa2d036243a0c0e':
  Add shortcut to avoid potential divide by zero in some case
 2012-08-08 14:08:35 -07:00
Jean-Baptiste Queru
e5c46faefb am 6d0dd51e: Merge "Return early when checking divider before child zero." 
* commit '6d0dd51ebb170a89bea614a558b96f1dff3e7723':
  Return early when checking divider before child zero.
 2012-08-08 14:04:08 -07:00
Jean-Baptiste Queru
807c7ae00b am 7835d4fb: Merge "Fix SurfaceView notifies on invalid surfaces." 
* commit '7835d4fb4e99bac698599a269ce7f84f2de1fb46':
  Fix SurfaceView notifies on invalid surfaces.
 2012-08-08 14:04:02 -07:00
Jean-Baptiste Queru
05e97e81a5 am 0be33f2d: Merge "Add shortcut to avoid potential divide by zero in some case" 
* commit '0be33f2d522f76f48062a59ddb520815a0851875':
  Add shortcut to avoid potential divide by zero in some case
 2012-08-08 14:03:58 -07:00
Rich Cannings
22c5c52d43 am a56d9cec: Merge "Revert "Pass URLs to package verifiers"" into jb-mr1-dev 
* commit 'a56d9cecee8a34e0554770ac6253dd3a76b9199c':
  Revert "Pass URLs to package verifiers"
 2012-08-08 13:53:27 -07:00
Rich Cannings
a56d9cecee Merge "Revert "Pass URLs to package verifiers"" into jb-mr1-dev 2012-08-08 13:50:56 -07:00
John Grossman
ae839035c1 am f007bd3c: common_time: Fix a small build warning. 
* commit 'f007bd3cf8cacd75287781c1bb37fe4167c79cba':
  common_time: Fix a small build warning.
 2012-08-08 13:23:05 -07:00
Jason Simmons
b2977a45f6 am 5017f232: Call systemReady on the lock settings before doing so on the window manager 
* commit '5017f2328407447002ab2d0cae1fe8ef87c50501':
  Call systemReady on the lock settings before doing so on the window manager
 2012-08-08 13:22:59 -07:00
Jean-Baptiste Queru
6d0dd51ebb Merge "Return early when checking divider before child zero." 2012-08-08 13:20:07 -07:00
Jean-Baptiste Queru
7835d4fb4e Merge "Fix SurfaceView notifies on invalid surfaces." 2012-08-08 13:20:00 -07:00
Jean-Baptiste Queru
0be33f2d52 Merge "Add shortcut to avoid potential divide by zero in some case" 2012-08-08 13:17:26 -07:00
John Grossman
f007bd3cf8 common_time: Fix a small build warning. 
(cherry picked from commit f19c7a64a5)

> common_time: Fix a small build warning.
>
> Change-Id: I9a3652c8191ec86089117dbe6c16ff8612a911a3
> Signed-off-by: John Grossman <johngro@google.com>

Change-Id: I9d04f457d8a7f45249c86c4ad69bfd71fdd77245
Signed-off-by: John Grossman <johngro@google.com>
 2012-08-08 13:15:45 -07:00
Jason Simmons
5017f23284 Call systemReady on the lock settings before doing so on the window manager 
At systemReady time, the window manager needs to obtain values from the lock
settings service (e.g. whether the lock screen is disabled).  During the
initial boot of a wiped device, the window manager was getting the wrong
values because LockSettingsService.systemReady/migrateOldData had not yet been
called.

Change-Id: I60825d0e4fad53a5b4349dabf9e5e299b863d0d0

(cherry pick of 2458abaf6676d5015af733c1010ecd67a085e9e2 from jb-aah-dev)
 2012-08-08 13:15:00 -07:00
Jean-Baptiste Queru
a2848806a7 am 86d09388: am bce41358: am 9ab84c20: Merge "Fix wrong count return for getPhoneSignalStrengthCount" 
* commit '86d09388ee1b98513de40dfff5de6e7c3b24cc07':
  Fix wrong count return for getPhoneSignalStrengthCount
 2012-08-08 13:13:45 -07:00
Jean-Baptiste Queru
d81486d208 am 04c7923c: am 74913572: am 6fb8fe9a: Merge "StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)" 
* commit '04c7923c74eca791d1bea853b9ac246af2ad3db0':
  StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)
 2012-08-08 13:13:41 -07:00
Jean-Baptiste Queru
f2fc4204b0 am 1bcc24d1: am 6736cca0: am 52410be8: Merge "mediacodec: Don\'t suggest calling getOutputFormat() immediately" 
* commit '1bcc24d123f8f319d7f5af06d9c30a056d709ede':
  mediacodec: Don't suggest calling getOutputFormat() immediately
 2012-08-08 13:13:38 -07:00
Jean-Baptiste Queru
86d09388ee am bce41358: am 9ab84c20: Merge "Fix wrong count return for getPhoneSignalStrengthCount" 
* commit 'bce413587973eae29a783d7e273dc2f7db06f7c9':
  Fix wrong count return for getPhoneSignalStrengthCount
 2012-08-08 13:11:33 -07:00
Jean-Baptiste Queru
04c7923c74 am 74913572: am 6fb8fe9a: Merge "StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)" 
* commit '749135722c6edb681fc27fcbab5beba25f938d82':
  StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)
 2012-08-08 13:11:28 -07:00
Jean-Baptiste Queru
1bcc24d123 am 6736cca0: am 52410be8: Merge "mediacodec: Don\'t suggest calling getOutputFormat() immediately" 
* commit '6736cca08df84328913962f9a14fafa13a25d390':
  mediacodec: Don't suggest calling getOutputFormat() immediately
 2012-08-08 13:11:24 -07:00
Jean-Baptiste Queru
bce4135879 am 9ab84c20: Merge "Fix wrong count return for getPhoneSignalStrengthCount" 
* commit '9ab84c203fea0521135e0b0983aa15ce1afdc5ec':
  Fix wrong count return for getPhoneSignalStrengthCount
 2012-08-08 13:08:31 -07:00
Jean-Baptiste Queru
749135722c am 6fb8fe9a: Merge "StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)" 
* commit '6fb8fe9aba75681509d84f68d536ed78d292bd44':
  StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)
 2012-08-08 13:08:27 -07:00
Jean-Baptiste Queru
6736cca08d am 52410be8: Merge "mediacodec: Don\'t suggest calling getOutputFormat() immediately" 
* commit '52410be8ec092bfa7e84f2d8facdc161d6107ac3':
  mediacodec: Don't suggest calling getOutputFormat() immediately
 2012-08-08 13:08:21 -07:00
Jean-Baptiste Queru
9ab84c203f Merge "Fix wrong count return for getPhoneSignalStrengthCount" 2012-08-08 12:59:06 -07:00
Rich Cannings
e1d7c711df Revert "Pass URLs to package verifiers" 
This reverts commit 24713907fe

Change-Id: Ie04ba73475b813635c4a74915c45e83250801b6b
 2012-08-08 12:46:06 -07:00
Katie McCormick
b25382c881 am a7f86bf6: am be3d2cf1: am 2f8cc17f: cherrypick from ics-mr1 docs: source for nw app Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2 
* commit 'a7f86bf6c2605fc32ddafcd33d5d8d775d549627':
  cherrypick from ics-mr1 docs: source for nw app Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2
 2012-08-08 12:18:07 -07:00
Katie McCormick
a7f86bf6c2 am be3d2cf1: am 2f8cc17f: cherrypick from ics-mr1 docs: source for nw app Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2 
* commit 'be3d2cf10b79ebee5455854823ff6947dc919d8e':
  cherrypick from ics-mr1 docs: source for nw app Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2
 2012-08-08 12:16:14 -07:00
Katie McCormick
be3d2cf10b am 2f8cc17f: cherrypick from ics-mr1 docs: source for nw app Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2 
* commit '2f8cc17f5fbc2e05ac0889fbbddf4e530750087b':
  cherrypick from ics-mr1 docs: source for nw app Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2
 2012-08-08 12:14:24 -07:00
Jean-Baptiste Queru
6fb8fe9aba Merge "StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)" 2012-08-08 12:06:26 -07:00
Jean-Baptiste Queru
52410be8ec Merge "mediacodec: Don't suggest calling getOutputFormat() immediately" 2012-08-08 12:06:03 -07:00
Jean-Baptiste Queru
41aa460860 am c386ee56: am c1c55afb: am e67f8c8c: Merge "Normalize output from aapt d xmltree" 
* commit 'c386ee56b995ec6562c4a20238ace2297562834b':
  Normalize output from aapt d xmltree
 2012-08-08 12:05:17 -07:00
Jean-Baptiste Queru
c386ee56b9 am c1c55afb: am e67f8c8c: Merge "Normalize output from aapt d xmltree" 
* commit 'c1c55afb474dd85a6205bc8ab94065f3ac38aa77':
  Normalize output from aapt d xmltree
 2012-08-08 12:03:43 -07:00
Jean-Baptiste Queru
c1c55afb47 am e67f8c8c: Merge "Normalize output from aapt d xmltree" 
* commit 'e67f8c8c279e20fff5f426eccd062b709e6280ed':
  Normalize output from aapt d xmltree
 2012-08-08 12:01:35 -07:00
James Dong
da1007d151 am aef4af4c: Merge "Add MEDIA_ERROR_SERVER_DIED error constant to MediaRecorder.java class" into jb-mr1-dev 
* commit 'aef4af4cd122ca5713110ccc7539828ce6e2f642':
  Add MEDIA_ERROR_SERVER_DIED error constant to MediaRecorder.java class
 2012-08-08 11:39:37 -07:00
James Dong
aef4af4cd1 Merge "Add MEDIA_ERROR_SERVER_DIED error constant to MediaRecorder.java class" into jb-mr1-dev 2012-08-08 11:38:05 -07:00
Nick Kralevich
1ce2a926ea am 2caec6c6: Fix link typo. 
* commit '2caec6c682853ccbfe73ef5ae15c1d03ea043e8a':
  Fix link typo.
 2012-08-08 11:37:59 -07:00
Nick Kralevich
2caec6c682 Fix link typo. 
Change-Id: I182b9c04caddcc4a985f206eddf5c23b06afe0e3
 2012-08-08 11:33:17 -07:00