Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
76,244 Commits 3 Branches 0 Tags
8ca2f07de60fe0407aaf89c4a89c1e36db2bfc17
Commit Graph

24176 Commits

Author SHA1 Message Date
John Reck
8ca2f07de6 am 17c61ea5: am 9a793c91: Merge "Add missing null check" into jb-dev 
* commit '17c61ea555e418b0eb5658168c1a136046ede08e':
  Add missing null check
 2012-05-02 16:22:25 -07:00
Jeff Sharkey
4ed162e672 am 0fdcadf2: am 9a671137: Merge "Set tmpdir to application cache directory." into jb-dev 
* commit '0fdcadf28e265f0992214cd3f0cdfd2a5c5dba8d':
  Set tmpdir to application cache directory.
 2012-05-02 16:19:22 -07:00
John Reck
17c61ea555 am 9a793c91: Merge "Add missing null check" into jb-dev 
* commit '9a793c91b6cdd4b78a574e1fe5e701dc76fc78e5':
  Add missing null check
 2012-05-02 16:18:57 -07:00
Jeff Sharkey
0fdcadf28e am 9a671137: Merge "Set tmpdir to application cache directory." into jb-dev 
* commit '9a671137dc95e243009dab34971da75f0d598456':
  Set tmpdir to application cache directory.
 2012-05-02 16:16:11 -07:00
John Reck
9a793c91b6 Merge "Add missing null check" into jb-dev 2012-05-02 16:15:51 -07:00
John Reck
bae0427dfa am 40e07b9c: am 2f612bdf: Merge "Rewrite PictureSet" into jb-dev 
* commit '40e07b9ce83e1cbf01e19dc67fff9f1113a2aec3':
  Rewrite PictureSet
 2012-05-02 16:15:43 -07:00
John Reck
40e07b9ce8 am 2f612bdf: Merge "Rewrite PictureSet" into jb-dev 
* commit '2f612bdfbd7bf94111015d06ba3fa4e864d0972b':
  Rewrite PictureSet
 2012-05-02 16:13:23 -07:00
Jeff Sharkey
9a671137dc Merge "Set tmpdir to application cache directory." into jb-dev 2012-05-02 16:12:49 -07:00
John Reck
2f612bdfbd Merge "Rewrite PictureSet" into jb-dev 2012-05-02 16:11:17 -07:00
Jim Miller
07fd2a9b81 am 07a42cfc: am 1771ee34: Merge "Revert "Fix for layout parameter validation bug in GridLayout."" into jb-dev 
* commit '07a42cfcd4e193b1c7a5842ca003fc661fc1bf4b':
  Revert "Fix for layout parameter validation bug in GridLayout."
 2012-05-02 16:06:01 -07:00
Jim Miller
07a42cfcd4 am 1771ee34: Merge "Revert "Fix for layout parameter validation bug in GridLayout."" into jb-dev 
* commit '1771ee34d1d308193e61a1b75368149f2d06aa6c':
  Revert "Fix for layout parameter validation bug in GridLayout."
 2012-05-02 16:02:38 -07:00
Jim Miller
1771ee34d1 Merge "Revert "Fix for layout parameter validation bug in GridLayout."" into jb-dev 2012-05-02 15:59:27 -07:00
Jim Miller
782c04b864 Revert "Fix for layout parameter validation bug in GridLayout." 
This reverts commit 8a36e05443 which was causing
keyguard_screen_tab_unlock.xml to have a bad layout.

Change-Id: I50bdc6dbdf8d7b98ef77eae532860d375574213e
 2012-05-02 15:50:30 -07:00
Adam Powell
8015d3fa25 am 020d5322: am fbbdbc2d: Merge "Fix setting action bar home-as-up from AB style" into jb-dev 
* commit '020d53224c26edcf643a2a305868e8e8b479c0a4':
  Fix setting action bar home-as-up from AB style
 2012-05-02 15:47:54 -07:00
Adam Powell
020d53224c am fbbdbc2d: Merge "Fix setting action bar home-as-up from AB style" into jb-dev 
* commit 'fbbdbc2d2326e96ce31950baccddd2f295fe594c':
  Fix setting action bar home-as-up from AB style
 2012-05-02 15:44:45 -07:00
Adam Powell
d40423a7ad Fix setting action bar home-as-up from AB style 
Bug 6427860

Change-Id: I0052417a2c97560ade768509781b27b5e064660d
 2012-05-02 14:06:03 -07:00
Jeff Sharkey
e1d330a071 Set tmpdir to application cache directory. 
Otherwise File.createTempFile() uses /sdcard which most apps don't
have write access to.

Bug: 6347289
Change-Id: Ibde191a63e4dbb9b03437406f8c999f192bcfa21
 2012-05-02 13:47:37 -07:00
Adam Powell
98423989b8 am 56de3296: am 0cd4f671: Merge "Fix documentation of Activity#navigateUpTo() to describe its actual behavior." into jb-dev 
* commit '56de329630384891f6ebc3a623128e8261957388':
  Fix documentation of Activity#navigateUpTo() to describe its actual behavior.
 2012-05-02 12:07:15 -07:00
Gilles Debunne
98c6f8f4e6 am 0bab2b06: am 54562cfb: Merge "Better horizontal internal scroll handling in Text." into jb-dev 
* commit '0bab2b068c63508b1f20e182d86f09ab06a88fef':
  Better horizontal internal scroll handling in Text.
 2012-05-02 12:07:13 -07:00
Chet Haase
64d6143c0d am dcc81035: am fe5984f4: Merge "Corrects invalidation logic for layered views" into jb-dev 
* commit 'dcc81035423c1c221409f20b28ba94a8ca74d55d':
  Corrects invalidation logic for layered views
 2012-05-02 12:04:21 -07:00
Adam Powell
56de329630 am 0cd4f671: Merge "Fix documentation of Activity#navigateUpTo() to describe its actual behavior." into jb-dev 
* commit '0cd4f6718b3d9b9d147a28e32bbb3c0f9147d5a9':
  Fix documentation of Activity#navigateUpTo() to describe its actual behavior.
 2012-05-02 12:03:31 -07:00
Gilles Debunne
0bab2b068c am 54562cfb: Merge "Better horizontal internal scroll handling in Text." into jb-dev 
* commit '54562cfbcd97a3b9d3ac9fb74f7a0d0d4bb9b8a0':
  Better horizontal internal scroll handling in Text.
 2012-05-02 12:03:29 -07:00
Chet Haase
dcc8103542 am fe5984f4: Merge "Corrects invalidation logic for layered views" into jb-dev 
* commit 'fe5984f43a5be9f95d1febb806f3aee8601c7ff4':
  Corrects invalidation logic for layered views
 2012-05-02 12:00:24 -07:00
Adam Powell
0cd4f6718b Merge "Fix documentation of Activity#navigateUpTo() to describe its actual behavior." into jb-dev 2012-05-02 11:59:55 -07:00
Gilles Debunne
54562cfbcd Merge "Better horizontal internal scroll handling in Text." into jb-dev 2012-05-02 11:59:54 -07:00
Chet Haase
fe5984f43a Merge "Corrects invalidation logic for layered views" into jb-dev 2012-05-02 11:56:56 -07:00
Adam Powell
35c064b2e8 Fix documentation of Activity#navigateUpTo() to describe its actual 
behavior.

Change-Id: I804fcef5df6f5885b47b7a1c7703ed301bea09b0
 2012-05-02 11:38:57 -07:00
Adam Cohen
e100fb16a3 am 9edbb235: am dfed49a2: Merge "Changing app widget "extras" to "options" and another small API Review issue" into jb-dev 
* commit '9edbb235779d16e768143f47c241c56a422df580':
  Changing app widget "extras" to "options" and another small API Review issue
 2012-05-02 11:11:14 -07:00
Adam Cohen
9edbb23577 am dfed49a2: Merge "Changing app widget "extras" to "options" and another small API Review issue" into jb-dev 
* commit 'dfed49a2852e9336e212f6934dcddec7dd743c26':
  Changing app widget "extras" to "options" and another small API Review issue
 2012-05-02 11:08:17 -07:00
Chet Haase
810a8676df Corrects invalidation logic for layered views 
A bug in the invalidation logic meant that changes to a view
would not cause parents in the view hiearchy that were set to have
a layer (e.g., View.LAYER_TYPE_HARDWARE) to get invalidated properly.
So even though the child view was all set to recreate its display list
according to the property change, the layer in the tree above it would stay
as-is, meaning that the change would not show up on the screen.

Issue #5887530 DropTarget text does not change color with the icon

Change-Id: Ie6eac4f406d172cb437822d9fe76340ab2afaf1c
 2012-05-02 10:44:33 -07:00
Adam Cohen
dfed49a285 Merge "Changing app widget "extras" to "options" and another small API Review issue" into jb-dev 2012-05-02 10:38:01 -07:00
Gilles Debunne
fd5bc01f70 Better horizontal internal scroll handling in Text. 
Bug 6378843

Corrects CL 183460, which would clip text with a width greater than
twice the TextView's width.

Internal horizontal translation is now handled in a similar way to
vertical scrolling.

Internal scrolling is indeed handled by the TextView, which translates
the canvas and sets the clipping bounds accordingly.

When drawing the internal DL, we tighten the horizontal bounds like we
did for the vertical bounds using top and bottom. As in Touch.java, we
use the getHorizontallyScrolling() method to know if we indeed have to
measure the actual text width.  If there is no horizontal scrolling we
use the TextView's width as a safe upper estimate in order to avoid an
actual computation. Note that horizontal scrolling is typically only
used for long single-lined text, so that the measurement loop is quick.

As a result, the internal DLs represent the entire text, and there is no
need to invalidate them when an internal scrolling takes place. This
behavior replaces the draw-only-what-is-needed we had before, but is
more consistent with what we do for long texts inside of a ScrollView
with no noticeable performance change, even on very long text.

Change-Id: I47c24c0ae988547d4f1e9f87d136225c93a3056d
 2012-05-02 10:30:03 -07:00
Matthew Xie
44c727943e am 478b2194: am e318c9a5: Merge "Check null of address in onDeviceCreated" into jb-dev 
* commit '478b2194e3729fc06221e94161e18c2d31884bf1':
  Check null of address in onDeviceCreated
 2012-05-02 10:20:34 -07:00
Matthew Xie
478b2194e3 am e318c9a5: Merge "Check null of address in onDeviceCreated" into jb-dev 
* commit 'e318c9a5f1819e953a2c78b32bced3c7fc427dbf':
  Check null of address in onDeviceCreated
 2012-05-02 10:17:32 -07:00
Matthew Xie
e318c9a5f1 Merge "Check null of address in onDeviceCreated" into jb-dev 2012-05-02 10:15:00 -07:00
Adam Cohen
d2097ebacf Changing app widget "extras" to "options" and another small API Review issue 
-> (issue 6427146), (issue 6427861)

Change-Id: Ib69a9b3717a5b62317ec227936bc3b2fd5954043
 2012-05-02 09:32:42 -07:00
satok
c6b939789a am e849230f: Merge "DO NOT MERGE : Backport I5723f627ce323b0d12b Reduce window resizing during IME transition" into jb-dev 
* commit 'e849230f444653e692024b4321044cb9f6188919':
  DO NOT MERGE : Backport I5723f627ce323b0d12b Reduce window resizing during IME transition
 2012-05-02 01:43:17 -07:00
satok
e849230f44 Merge "DO NOT MERGE : Backport I5723f627ce323b0d12b Reduce window resizing during IME transition" into jb-dev 2012-05-02 01:41:23 -07:00
satok
1bc0a49e3c DO NOT MERGE : Backport I5723f627ce323b0d12b Reduce window resizing during IME transition 
Bug: 5137498
Change-Id: Ieb8fd700d193eddaa31b0c5ebd8c7f7885586372
 2012-05-02 17:30:45 +09:00
satok
fb04fa5ff4 Merge "Reduce window resizing during IME transition" 2012-05-02 01:28:00 -07:00
Adam Powell
53dc75339a am a60ce985: am 39f412d8: Merge "API modifications for TaskStackBuilder" into jb-dev 
* commit 'a60ce9859366b66bcec2a16414abbd670d988de1':
  API modifications for TaskStackBuilder
 2012-05-01 19:17:28 -07:00
Adam Powell
a60ce98593 am 39f412d8: Merge "API modifications for TaskStackBuilder" into jb-dev 
* commit '39f412d8deed2ba46153c8a819bc8635979cec6b':
  API modifications for TaskStackBuilder
 2012-05-01 19:14:35 -07:00
Adam Powell
39f412d8de Merge "API modifications for TaskStackBuilder" into jb-dev 2012-05-01 19:10:32 -07:00
Adam Powell
f78a8444a9 API modifications for TaskStackBuilder 
Change-Id: Ic9e11caa4541962d32b2c197f4f7b19ee67a0eda
 2012-05-01 18:51:40 -07:00
Jeff Brown
92f29230ed am c3cca664: am 0632b35b: Merge "Improve handling of built-in keyboard." into jb-dev 
* commit 'c3cca66404571454ee13b341925fe45efd5036e6':
  Improve handling of built-in keyboard.
 2012-05-01 18:44:02 -07:00
Jeff Brown
c3cca66404 am 0632b35b: Merge "Improve handling of built-in keyboard." into jb-dev 
* commit '0632b35b6828cd4324b3d218c2e38f895e819aad':
  Improve handling of built-in keyboard.
 2012-05-01 18:41:00 -07:00
Jeff Brown
0632b35b68 Merge "Improve handling of built-in keyboard." into jb-dev 2012-05-01 18:39:00 -07:00
John Reck
33b019b183 Rewrite PictureSet 
Removes no longer supported splitPicture
Removes unnused code

Bulk of the change is in webkit CL: https://android-git.corp.google.com/g/#/c/185850/

Change-Id: I4eca363ba3cb4a6d6fccc82bf5ea8588df780a4b
 2012-05-01 17:24:38 -07:00
John Reck
273b8c2e7f Add missing null check 
Change-Id: I05e288762c00d80f4c0842584daa88c205196b6f
 2012-05-01 17:22:25 -07:00
Matthew Xie
02c4b353f7 Check null of address in onDeviceCreated 
address can be null that returned from getAddressFromObjectPath.
If it is null case, donot continue  call getRemoteDeviceProperties.
Otherwise it causes null pointer exception and crash the system.
Bug 6338780

Change-Id: Ib190342032ab2ad11c49f44fa6d4b2509a861514
 2012-05-01 17:15:10 -07:00