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

77529 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Dong
16ff4fbab7 am f4513bb9: am 909c4b85: Merge "Improve notifying TimedText by reducing marshall/unmarshalling." into jb-dev 
* commit 'f4513bb95b6c8b831b747bf08accd74f96ce712b':
  Improve notifying TimedText by reducing marshall/unmarshalling.
 2012-05-14 08:36:21 -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
Craig Mautner
cf462d65d2 am ba523324: am ab1c5456: Merge "Keep launcher screen from flashing over lockscreen" into jb-dev 
* commit 'ba523324f32ca55221e07e31b2d0699826daa2fe':
  Keep launcher screen from flashing over lockscreen
 2012-05-14 08:36:05 -07:00
Fabrice Di Meglio
96469491b7 am 791044c2: am 6788e028: Merge "Fix bug #6480486 Zero width non-joiner and zero width joiner rendered weirdly" into jb-dev 
* commit '791044c2bf80d53ac2e1c2af153fb9d857374259':
  Fix bug #6480486 Zero width non-joiner and zero width joiner rendered weirdly
 2012-05-14 08:35:59 -07:00
Kenny Root
0a0e3468aa am 0058ae9d: am c559e3b7: Merge "Add in constant for WPA supplication settings" into jb-dev 
* commit '0058ae9d7bdcb5d677d1aad44079155b6e99b188':
  Add in constant for WPA supplication settings
 2012-05-14 08:35:48 -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
Eric Fischer
694ddb6dee am 9f382b09: (-s ours) am 42097f5c: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '9f382b093feb76a9f7f7fc68cf5b131d59c658fe':
  Import translations. DO NOT MERGE
 2012-05-14 08:35:16 -07:00
Eric Fischer
4f6831c51d am a7faeb0c: (-s ours) am 3fd57b57: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'a7faeb0c6b97c8a43339e45e3f37056c30e4c685':
  Import translations. DO NOT MERGE
 2012-05-14 07:49:28 -07:00
Irfan Sheriff
8c898e1e43 am aa7b072d: am ba1db8a5: Merge "Fix wifi direct issues" into jb-dev 
* commit 'aa7b072dffa8ba12e74f770cafe0b7acb5b81e02':
  Fix wifi direct issues
 2012-05-14 07:49:15 -07:00
Stephen Hines
4106d56b6e am 8470381b: am dcc1996b: Merge "Test clamp (full and relaxed precision)." into jb-dev 
* commit '8470381b0c6866a0d2fabda2ff02ae550ca60715':
  Test clamp (full and relaxed precision).
 2012-05-14 07:48:56 -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
Raph Levien
641f1c917e am 7dbf4ee4: (-s ours) am 3816174b: Add explicit id for fontFamily attribute. 
* commit '7dbf4ee416172f44df227e550e6fc1babecd5061':
  Add explicit id for fontFamily attribute.
 2012-05-14 07:47:42 -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
Raph Levien
faed6dbec4 am 641ce591: am c9c275fe: Merge "Add RobotoCondensed family and optimized Roboto Light." into jb-dev 
* commit '641ce591a697eae74a75b7766e091691942f77e5':
  Add RobotoCondensed family and optimized Roboto Light.
 2012-05-12 16:46:32 -07:00
James Dong
f4513bb95b am 909c4b85: Merge "Improve notifying TimedText by reducing marshall/unmarshalling." into jb-dev 
* commit '909c4b855a372dbc70ce6777df64d12ae93ad2d5':
  Improve notifying TimedText by reducing marshall/unmarshalling.
 2012-05-11 16:48:05 -07:00
James Dong
909c4b855a Merge "Improve notifying TimedText by reducing marshall/unmarshalling." into jb-dev 2012-05-11 16:45:19 -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
Craig Mautner
ba523324f3 am ab1c5456: Merge "Keep launcher screen from flashing over lockscreen" into jb-dev 
* commit 'ab1c5456b789205ef305b19e5a7682b6561aacac':
  Keep launcher screen from flashing over lockscreen
 2012-05-11 16:09:31 -07:00
Craig Mautner
ab1c5456b7 Merge "Keep launcher screen from flashing over lockscreen" into jb-dev 2012-05-11 16:07:10 -07:00
Fabrice Di Meglio
791044c2bf am 6788e028: Merge "Fix bug #6480486 Zero width non-joiner and zero width joiner rendered weirdly" into jb-dev 
* commit '6788e028c363583406d513d66d9a78576f984302':
  Fix bug #6480486 Zero width non-joiner and zero width joiner rendered weirdly
 2012-05-11 15:55:59 -07:00
Fabrice Di Meglio
6788e028c3 Merge "Fix bug #6480486 Zero width non-joiner and zero width joiner rendered weirdly" into jb-dev 2012-05-11 15:54:06 -07:00
Kenny Root
0058ae9d7b am c559e3b7: Merge "Add in constant for WPA supplication settings" into jb-dev 
* commit 'c559e3b7f4be5d4ddde23443449f364b359432fe':
  Add in constant for WPA supplication settings
 2012-05-11 15:52:08 -07:00
Kenny Root
c559e3b7f4 Merge "Add in constant for WPA supplication settings" into jb-dev 2012-05-11 15:49:22 -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
Fabrice Di Meglio
f8c1ce7a0d Fix bug #6480486 Zero width non-joiner and zero width joiner rendered weirdly 
- add missing ZWS (uni200B), ZWNJ (uni200C), ZWJ (uni200D)

Change-Id: I2e70bbaa855a75e0172c375cfcbc8544325030da
 2012-05-11 15:46:27 -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
Eric Fischer
9f382b093f am 42097f5c: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '42097f5c26551e81ca397f6ff787fdbe4046b59b':
  Import translations. DO NOT MERGE
 2012-05-11 15:30:32 -07:00
Jim Miller
2b5cebebb6 Merge "Fix 6040870: Update MultiWaveView for new device" into jb-dev 2012-05-11 15:29:50 -07:00
Eric Fischer
444805e389 Merge "Import translations. DO NOT MERGE" 2012-05-11 15:29:09 -07:00
Eric Fischer
42097f5c26 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-11 15:28:35 -07:00
Robert Greenwalt
a25a77485e Merge "Add logging for Tethering." 2012-05-11 15:02:46 -07:00
Eric Fischer
a7faeb0c6b am 3fd57b57: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '3fd57b5726bb968152457c1d5ba31a1a495146cb':
  Import translations. DO NOT MERGE
 2012-05-11 14:54:25 -07:00
Eric Fischer
6dfe380a85 Merge "Import translations. DO NOT MERGE" 2012-05-11 14:52:25 -07:00
Eric Fischer
3fd57b5726 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-11 14:52:11 -07:00
Irfan Sheriff
aa7b072dff am ba1db8a5: Merge "Fix wifi direct issues" into jb-dev 
* commit 'ba1db8a5912c989e493269b8751c7e9d312e0eae':
  Fix wifi direct issues
 2012-05-11 14:48:32 -07:00