Jim Miller
98ada59c9f
am 8c113503: am 5a588dbe: Merge "Fix 6486099: Fix clipping issues with MultiWaveView on phone/tablet" into jb-dev
...
* commit '8c113503669fea3fda44e5672ec027e6b15d438f':
Fix 6486099: Fix clipping issues with MultiWaveView on phone/tablet
2012-05-14 08:38:04 -07:00
Jeff Brown
ac592fb3b6
am a4881637: am 58770232: Merge "Move power HAL interactions to PowerManagerService." into jb-dev
...
* commit 'a48816375f68a8b4a945efcb68e405308a50adc9':
Move power HAL interactions to PowerManagerService.
2012-05-14 08:37:26 -07:00
Jeff Brown
93a076819e
am 1f85b46b: am dca5fb9e: Merge "Enable SQLite configuration to be set with system properties." into jb-dev
...
* commit '1f85b46b3f4764f13c79203564ccb56be7cdf603':
Enable SQLite configuration to be set with system properties.
2012-05-14 08:37:13 -07:00
Jamie Gennis
ba6f4ee86d
am 131006b8: am d83fdd03: Merge "Trace: add a tracing tag for video" into jb-dev
...
* commit '131006b810121c50425f727a5d879428f1709420':
Trace: add a tracing tag for video
2012-05-14 08:37:02 -07:00
Jamie Gennis
671543f762
am 592cbb83: am c9e27d4b: Merge "Surface: replace active rect with window crop" into jb-dev
...
* commit '592cbb835aa5ed104badf7de6c144a7b90300620':
Surface: replace active rect with window crop
2012-05-14 08:36:58 -07:00
Adam Powell
e60a635919
am e48c70e4: am 7fc4fbcc: Merge "Automatic persistent text selection for ListViews" into jb-dev
...
* commit 'e48c70e4d9302795d5f02d352c7907302ca5c8b6':
Automatic persistent text selection for ListViews
2012-05-14 08:36:17 -07:00
Gilles Debunne
579cc204a2
am b00ceecb: am 0ae107ff: Merge "Cut long text into multiple DL at start" into jb-dev
...
* commit 'b00ceecb96063a30bb73b13e156a6da00e3900e7':
Cut long text into multiple DL at start
2012-05-14 08:36:08 -07:00
Jeff Sharkey
d640d0641a
am f2fe4cb1: am cd586258: Merge "Enforce READ_EXTERNAL through Settings.Secure." into jb-dev
...
* commit 'f2fe4cb11b2b93acf1a983e856efe26b6bb79683':
Enforce READ_EXTERNAL through Settings.Secure.
2012-05-14 08:35:42 -07:00
Jim Miller
dc3ee963bf
am 07827454: am 2b5cebeb: Merge "Fix 6040870: Update MultiWaveView for new device" into jb-dev
...
* commit '07827454efef7f46d46e923a5091d8cf1e5d0d8c':
Fix 6040870: Update MultiWaveView for new device
2012-05-14 08:35:24 -07:00
John Reck
e6d1d4d4bb
am 51688c51: am dee9d9ab: Merge "Prevent updateStateTrackers from being affected by preventDefault()" into jb-dev
...
* commit '51688c51c14e7e92bc6d6139a099cf701b1608b0':
Prevent updateStateTrackers from being affected by preventDefault()
2012-05-14 07:48:44 -07:00
Jeff Brown
d4bef4b786
am 47272c93: am b12b6b51: Merge "Minor refactoring before starting on velocity tracker changes." into jb-dev
...
* commit '47272c932ab6157022aaefd015e5d1df9dc5bd2f':
Minor refactoring before starting on velocity tracker changes.
2012-05-14 07:48:31 -07:00
Teng-Hui Zhu
e947752c0f
am 08df9eac: am ef279363: Merge "Fix a crash." into jb-dev
...
* commit '08df9eac6e7ef246afb5ccd9d7cccadcb131e7b2':
Fix a crash.
2012-05-14 07:48:21 -07:00
Chet Haase
7008d7b7f3
am fd086b95: am 76f08218: Merge "Fix quickReject logic for transformed views" into jb-dev
...
* commit 'fd086b95103e8c7fbe853f5702aaa7d04f2141f0':
Fix quickReject logic for transformed views
2012-05-14 07:47:59 -07:00
Jeff Brown
179817387b
am f4df93ce: am 2f095760: Rename kcm attribute to keyboardLayout.
...
* commit 'f4df93cec62861e3f185979612360c27dd80e043':
Rename kcm attribute to keyboardLayout.
2012-05-14 07:47:52 -07:00
Chet Haase
ad4fc6f764
am 4a70bc72: am 26511012: Merge "Clear animations in DisplayLists when done" into jb-dev
...
* commit '4a70bc72a87427115d9d64516145283dc96745f2':
Clear animations in DisplayLists when done
2012-05-14 07:26:23 -07:00
Romain Guy
d6a98aafab
am 30b013bf: am d303dd3d: Merge "Prevent NPE in TextureView.getBitmap()" into jb-dev
...
* commit '30b013bfbad60e20b7f812d0c5e41893fb7503fa':
Prevent NPE in TextureView.getBitmap()
2012-05-12 16:46:55 -07:00
Teng-Hui Zhu
cffefb7062
am 9895881b: am 9ac32040: Merge "Keep the controller when video ended." into jb-dev
...
* commit '9895881b2ca944e57b625368df18f40d3feeeba8':
Keep the controller when video ended.
2012-05-12 16:46:44 -07:00
Teng-Hui Zhu
87084281ca
am b5005a54: am 6df5ca08: Merge "Avoid inline->fullscreen reload for html5 video." into jb-dev
...
* commit 'b5005a544f779a7df9bfe960003ac135257487ef':
Avoid inline->fullscreen reload for html5 video.
2012-05-12 16:46:40 -07:00
Jim Miller
8c11350366
am 5a588dbe: Merge "Fix 6486099: Fix clipping issues with MultiWaveView on phone/tablet" into jb-dev
...
* commit '5a588dbe6e3d246523d7c04258f0129ba37df069':
Fix 6486099: Fix clipping issues with MultiWaveView on phone/tablet
2012-05-12 14:56:28 -07:00
Jim Miller
5a588dbe6e
Merge "Fix 6486099: Fix clipping issues with MultiWaveView on phone/tablet" into jb-dev
2012-05-12 14:54:06 -07:00
Jim Miller
c6e523ea9b
Fix 6486099: Fix clipping issues with MultiWaveView on phone/tablet
...
This fixes a problem where the bounds of the view weren't being
calculated properly when a separate outer radius was specified.
The code now takes the maximum of the ring drawable's width/height
and that specified in the resource files.
This gives it the best default look on all devices while still
allowing minor tweaks.
Change-Id: I5daa40ff4f14653c8cc89b39102816afb976e4f7
2012-05-12 14:23:23 -07:00
Jeff Brown
a48816375f
am 58770232: Merge "Move power HAL interactions to PowerManagerService." into jb-dev
...
* commit '58770232216cd735afdfd3dd53151070e06de5ce':
Move power HAL interactions to PowerManagerService.
2012-05-11 19:35:23 -07:00
Jeff Brown
5877023221
Merge "Move power HAL interactions to PowerManagerService." into jb-dev
2012-05-11 19:32:56 -07:00
Jeff Brown
7304c34382
Move power HAL interactions to PowerManagerService.
...
This refactoring sets the stage for a follow-on change that
will make use additional functions of the power HAL.
Moved functionality from android.os.Power into PowerManagerService.
None of these functions make sense being called outside of the
system server. Moving them to the PowerManagerService makes it
easier to ensure that the power HAL is initialized exactly once.
Similarly, moved ShutdownThread out of the policy package and into
the services package where it can tie into the PowerManagerService
as needed.
Bug: 6435382
Change-Id: I958241bb124fb4410d96f5d5eb00ed68d60b29e5
2012-05-11 18:42:42 -07:00
Jeff Brown
1f85b46b3f
am dca5fb9e: Merge "Enable SQLite configuration to be set with system properties." into jb-dev
...
* commit 'dca5fb9e7e193d6aed233e0650691675a56022a3':
Enable SQLite configuration to be set with system properties.
2012-05-11 18:22:12 -07:00
Jeff Brown
dca5fb9e7e
Merge "Enable SQLite configuration to be set with system properties." into jb-dev
2012-05-11 18:19:39 -07:00
Jamie Gennis
131006b810
am d83fdd03: Merge "Trace: add a tracing tag for video" into jb-dev
...
* commit 'd83fdd03a1daaf577d80c8abda86c7c01bf6d3bb':
Trace: add a tracing tag for video
2012-05-11 17:19:53 -07:00
Jamie Gennis
592cbb835a
am c9e27d4b: Merge "Surface: replace active rect with window crop" into jb-dev
...
* commit 'c9e27d4ba1f46eb29aa8a794685ecb7c492d5d83':
Surface: replace active rect with window crop
2012-05-11 17:19:50 -07:00
Jamie Gennis
d83fdd03a1
Merge "Trace: add a tracing tag for video" into jb-dev
2012-05-11 17:17:47 -07:00
Jamie Gennis
c9e27d4ba1
Merge "Surface: replace active rect with window crop" into jb-dev
2012-05-11 17:17:31 -07:00
Jeff Brown
888da152ec
Enable SQLite configuration to be set with system properties.
...
This change does not alter the behavior of the system except to
enable the use of system properties to override SQLite configuration
options for debugging.
Bug: 6484633
Change-Id: I8908a3ba07910a1193396e2e45791e9faa7be349
2012-05-11 16:36:24 -07:00
Adam Powell
e48c70e4d9
am 7fc4fbcc: Merge "Automatic persistent text selection for ListViews" into jb-dev
...
* commit '7fc4fbccd6129e286a1f9c640eb3229b91792bce':
Automatic persistent text selection for ListViews
2012-05-11 16:36:11 -07:00
Adam Powell
7fc4fbccd6
Merge "Automatic persistent text selection for ListViews" into jb-dev
2012-05-11 16:34:15 -07:00
Gilles Debunne
b00ceecb96
am 0ae107ff: Merge "Cut long text into multiple DL at start" into jb-dev
...
* commit '0ae107ff34dd998dbe86736297e9325051ad5152':
Cut long text into multiple DL at start
2012-05-11 16:16:23 -07:00
Gilles Debunne
0ae107ff34
Merge "Cut long text into multiple DL at start" into jb-dev
2012-05-11 16:14:02 -07:00
Jeff Sharkey
f2fe4cb11b
am cd586258: Merge "Enforce READ_EXTERNAL through Settings.Secure." into jb-dev
...
* commit 'cd5862586ab555b53ffd0a62488843838d1aa94d':
Enforce READ_EXTERNAL through Settings.Secure.
2012-05-11 15:49:00 -07:00
Jeff Sharkey
cd5862586a
Merge "Enforce READ_EXTERNAL through Settings.Secure." into jb-dev
2012-05-11 15:47:01 -07:00
Jim Miller
07827454ef
am 2b5cebeb: Merge "Fix 6040870: Update MultiWaveView for new device" into jb-dev
...
* commit '2b5cebebb60c33fe864bed71778253837cbddb54':
Fix 6040870: Update MultiWaveView for new device
2012-05-11 15:33:55 -07:00
Gilles Debunne
71afc39d68
Cut long text into multiple DL at start
...
Bug 5763685
To improve performance, preventively cut the the into display
list of 3-10 lines of text. Further updates to small parts of
the text (such as adding an underline on a word) will only
invalidate and redraw the affected sub display list.
DLs are aligned with paragraphs, just like they will be during
text edition.
Change-Id: I0d60debc7fdaea8b29080a6eacb2d60205e7d547
2012-05-11 15:32:43 -07:00
Jeff Sharkey
f53857716a
Enforce READ_EXTERNAL through Settings.Secure.
...
Always defers to user-defined setting, when present.
Bug: 6389556
Change-Id: I079d2a41b772facfdac74eefc4c8072fc9284f97
2012-05-11 15:31:39 -07:00
Jim Miller
2b5cebebb6
Merge "Fix 6040870: Update MultiWaveView for new device" into jb-dev
2012-05-11 15:29:50 -07:00
Adam Powell
057a585fba
Automatic persistent text selection for ListViews
...
Use View transient state tracking to allow selection to persist across
ListView-style item view recycling.
Fix some bugs with transient state tracking.
Bug 6110122
Change-Id: Ic084b8fc2289bff718b19478a37ce64459b3ed4c
2012-05-11 14:26:17 -07:00
John Reck
51688c51c1
am dee9d9ab: Merge "Prevent updateStateTrackers from being affected by preventDefault()" into jb-dev
...
* commit 'dee9d9ab9f8843bdbc1fc5d29e92c12a2d0407b2':
Prevent updateStateTrackers from being affected by preventDefault()
2012-05-11 14:25:55 -07:00
John Reck
dee9d9ab9f
Merge "Prevent updateStateTrackers from being affected by preventDefault()" into jb-dev
2012-05-11 14:23:18 -07:00
Jeff Brown
47272c932a
am b12b6b51: Merge "Minor refactoring before starting on velocity tracker changes." into jb-dev
...
* commit 'b12b6b5116e3d76474296b45f570693bb10d6c99':
Minor refactoring before starting on velocity tracker changes.
2012-05-11 14:06:30 -07:00
Jeff Brown
b12b6b5116
Merge "Minor refactoring before starting on velocity tracker changes." into jb-dev
2012-05-11 14:03:38 -07:00
John Reck
387c2e8d42
Prevent updateStateTrackers from being affected by preventDefault()
...
Bug: 6477996
Calling e.preventDefault() on a javascript touch handler is apparantly
not supposed to prevent the default gesture detector, who knew?
Change-Id: I6ee36e2fbc485b289b6dbb3464d8562c88e3be49
2012-05-11 13:50:57 -07:00
Teng-Hui Zhu
08df9eac6e
am ef279363: Merge "Fix a crash." into jb-dev
...
* commit 'ef279363716706192b4da543fcae3e92cc14d27e':
Fix a crash.
2012-05-11 13:47:38 -07:00
Teng-Hui Zhu
ef27936371
Merge "Fix a crash." into jb-dev
2012-05-11 13:45:13 -07:00
Chet Haase
fd086b9510
am 76f08218: Merge "Fix quickReject logic for transformed views" into jb-dev
...
* commit '76f082189ec451433d942fcee5ca2913f4132e6b':
Fix quickReject logic for transformed views
2012-05-11 13:02:43 -07:00