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

32969 Commits

Author SHA1 Message Date
Dianne Hackborn
0e5416f661 Merge "Use two fingers to work some magic..." 2012-06-26 18:16:01 -07:00
Gilles Debunne
704c79a497 am 034a5776: am f6656b80: Merge "Reducing the contrast of text underline" into jb-dev 
* commit '034a57764b6791fd894285df78e02ad2d20992cd':
  Reducing the contrast of text underline
 2012-06-26 13:16:35 -07:00
Gilles Debunne
034a57764b am f6656b80: Merge "Reducing the contrast of text underline" into jb-dev 
* commit 'f6656b80c203a2537aa30682f7e682a69e742e21':
  Reducing the contrast of text underline
 2012-06-26 13:14:23 -07:00
Gilles Debunne
f6656b80c2 Merge "Reducing the contrast of text underline" into jb-dev 2012-06-26 13:12:07 -07:00
Raph Levien
e3bfa279cc Merge "Initialize shaper offset array. Needed for bug 5443796." 2012-06-26 09:46:27 -07:00
Raph Levien
f62034d896 Initialize shaper offset array. Needed for bug 5443796. 
Harfbuzz apparently requires the offset array to be initialized to zero,
otherwise it can report corrupt glyph positions. This change also
contains a small amount of refactoring to avoid code duplication.

Change-Id: I2553974f40bc8e0549876c7d31243960ca92a8a2
 2012-06-26 08:59:17 -07:00
Dianne Hackborn
a4b7f2f75e Use two fingers to work some magic... 
Change-Id: Ibcb3dbd3d158c22da8277e544d81fb47eadccd49
 2012-06-25 19:19:15 -07:00
Dianne Hackborn
e6c2d62efb am 9906e784: am 17990395: Merge "Fix issue : expanded notification actions don\'t work on the lock screen" into jb-dev 
* commit '9906e784faca2cc8388a04fdc544722ea93d51be':
  Fix issue : expanded notification actions don't work on the lock screen
 2012-06-25 18:17:15 -07:00
Dianne Hackborn
9906e784fa am 17990395: Merge "Fix issue : expanded notification actions don\'t work on the lock screen" into jb-dev 
* commit '17990395bc62f8ce1bae4f1880899f231a8e613b':
  Fix issue : expanded notification actions don't work on the lock screen
 2012-06-25 17:37:15 -07:00
Dianne Hackborn
17990395bc Merge "Fix issue : expanded notification actions don't work on the lock screen" into jb-dev 2012-06-25 17:35:36 -07:00
Gilles Debunne
fca8947f49 Reducing the contrast of text underline 
Alpha set to 50%.

Bug: 6712694
Change-Id: Ic292b6e24a97426e835fa379b1fd60d3b7912e99
 2012-06-25 16:42:51 -07:00
Michael Jurka
85a2d7f94e am c4d7721c: am 806a3602: Merge "Update documentation on max widget bitmap usage" into jb-dev 
* commit 'c4d7721cb08cc797ea592f54797135f372689f6a':
  Update documentation on max widget bitmap usage
 2012-06-25 15:31:25 -07:00
Michael Jurka
c4d7721cb0 am 806a3602: Merge "Update documentation on max widget bitmap usage" into jb-dev 
* commit '806a360275b3963d1941130ca2998a8abd76126f':
  Update documentation on max widget bitmap usage
 2012-06-25 15:28:48 -07:00
Michael Jurka
806a360275 Merge "Update documentation on max widget bitmap usage" into jb-dev 2012-06-25 15:26:48 -07:00
Raph Levien
3b00fc2eca Merge "Fix broken build when DEBUG_GLYPHS is set" 2012-06-25 15:18:45 -07:00
Michael Jurka
f25ab44975 Update documentation on max widget bitmap usage 
Change-Id: I564afccc425f7e76501cb7ffd404ad369bdd396d
 2012-06-25 15:11:21 -07:00
Raph Levien
6212a4f2ed Fix broken build when DEBUG_GLYPHS is set 
Some of the logging lines referred to the "path" variable which no
longer exists. We log the Harfbuzz script instead, which hopefully
provides enough context.

This change only affects debug builds, but we will want to be working
intensively in this space.

Change-Id: I86c3b58c9fa2a8c47812ef5f0b5ce64fd8dcdc20
 2012-06-25 14:29:52 -07:00
Dianne Hackborn
1927ae8a56 Fix issue : expanded notification actions don't work on the lock screen 
FLAG_ACTIVITY_CLOSE_SYSTEM_DIALOGS was a mistake.

Instead, and the infrastructure for the status bar to take care
of closing and hiding things itself when you press these buttons,
just like it does for the main Intent of the notification.

Bug: 6717667
Change-Id: I1b22186e0cedc05f46a1a3ec78053a72afaf61b1
 2012-06-25 14:28:48 -07:00
Scott Main
f20a2a8af8 am 451f0341: am e9b4b3e9: Merge "docs: clean up javadoc code snippets, unescaped entities" into jb-dev 
* commit '451f0341445e8a05933d2fc2d6ec2b1aa3683602':
  docs: clean up javadoc code snippets, unescaped entities
 2012-06-25 12:37:09 -07:00
Scott Main
451f034144 am e9b4b3e9: Merge "docs: clean up javadoc code snippets, unescaped entities" into jb-dev 
* commit 'e9b4b3e94d396d176338c62f8c9f4c183b340f9b':
  docs: clean up javadoc code snippets, unescaped entities
 2012-06-25 12:33:55 -07:00
Scott Main
e9b4b3e94d Merge "docs: clean up javadoc code snippets, unescaped entities" into jb-dev 2012-06-25 12:31:11 -07:00
Eric Fischer
764d1368d6 am c5fc8f5c: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'c5fc8f5c1b97665d6b8b0a9d18d737f9fd2460f4':
  Import translations. DO NOT MERGE
 2012-06-25 11:34:58 -07:00
Eric Fischer
6135e52e82 Import translations. DO NOT MERGE 
Change-Id: Ia19fe79fc797b8048b90a6d074b1117c2e362c8f
 2012-06-25 11:32:05 -07:00
Scott Main
97e0a1c6f3 docs: clean up javadoc code snippets, unescaped entities 
Change-Id: Idc21caceccaaa2cc11a6c46b453b6a9b26164f34
 2012-06-25 11:25:20 -07:00
Eric Fischer
d7e646d6d7 Import translations. DO NOT MERGE 
Change-Id: I829c0795e2bf76fe1e2315977aeab8d63d3ed76d
 2012-06-25 11:24:00 -07:00
Glenn Kasten
4f967c2fd7 Merge "Remove AudioRecord record_flags" 2012-06-25 08:35:56 -07:00
Scott Main
0584367b55 am 0c511988: am b0efc7fc: eat comment so it doesn\'t appear in docs 
* commit '0c511988065a1dac77dead1055a8ab482ff009cc':
  eat comment so it doesn't appear in docs
 2012-06-23 12:49:05 -07:00
Scott Main
0c51198806 am b0efc7fc: eat comment so it doesn\'t appear in docs 
* commit 'b0efc7fce7967b043dae8896e8f9bf4d11274cf4':
  eat comment so it doesn't appear in docs
 2012-06-23 12:46:23 -07:00
Scott Main
b0efc7fce7 eat comment so it doesn't appear in docs 
Change-Id: Id2b539fc80422edb32c86fa17ad888abbc48ba49
 2012-06-23 12:36:17 -07:00
Jean-Baptiste Queru
bd705ea55f am 695b2d08: am 5f77f82e: Merge "Another case of extra ">"" 
* commit '695b2d089ec4dcb2256383e7ee8dd7e2979e13b7':
  Another case of extra ">"
 2012-06-23 07:15:42 -07:00
Jean-Baptiste Queru
c516507404 am 6c1f2b13: am b8b47c22: Merge "Remove redundant ">"" 
* commit '6c1f2b136b2fc55ddd2df7db6b6e48a8665acc98':
  Remove redundant ">"
 2012-06-23 07:15:39 -07:00
Jean-Baptiste Queru
41e6e0c49f am c34188a9: resolved conflicts for merge of f8f76d52 to jb-dev-plus-aosp 
* commit 'c34188a95405526416325604386af4f48ba20918':
  Add the possibility to modify the View focus rect
 2012-06-23 07:13:25 -07:00
Jean-Baptiste Queru
695b2d089e am 5f77f82e: Merge "Another case of extra ">"" 
* commit '5f77f82e609b24504e026751228b399b8dc57ab5':
  Another case of extra ">"
 2012-06-23 07:12:19 -07:00
Jean-Baptiste Queru
6c1f2b136b am b8b47c22: Merge "Remove redundant ">"" 
* commit 'b8b47c22c8dc1f5facfbb4729511772630cc3aa6':
  Remove redundant ">"
 2012-06-23 07:12:16 -07:00
Jean-Baptiste Queru
c34188a954 resolved conflicts for merge of f8f76d52 to jb-dev-plus-aosp 
Change-Id: I83beeb45320de2c3fc3a00c2f5cd86a17ac1dc9f
 2012-06-23 07:08:59 -07:00
Jean-Baptiste Queru
5f77f82e60 Merge "Another case of extra ">"" 2012-06-23 05:59:11 -07:00
Jean-Baptiste Queru
b8b47c22c8 Merge "Remove redundant ">"" 2012-06-23 05:58:56 -07:00
Jean-Baptiste Queru
f8f76d52a7 Merge "Add the possibility to modify the View focus rect" 2012-06-23 05:52:53 -07:00
Adam Powell
f681e74064 am 56fbd14f: am 1b4ea7ef: Sanity check while updating volume in MediaRouteChooserDialog 
* commit '56fbd14f3d02220eb3b35b3d62750d12ae402c6e':
  Sanity check while updating volume in MediaRouteChooserDialog
 2012-06-23 05:39:26 -07:00
Adam Powell
0c26f97684 am 3b939b72: am fd3fd482: Merge "Update route count properly when MediaRouteButton detects grouped/ungrouped events" into jb-dev 
* commit '3b939b7242f9c4155f4d8b34cb474abc77c6417f':
  Update route count properly when MediaRouteButton detects grouped/ungrouped events
 2012-06-23 05:39:23 -07:00
Adam Powell
56fbd14f3d am 1b4ea7ef: Sanity check while updating volume in MediaRouteChooserDialog 
* commit '1b4ea7eff50545f4673ca01b664e5edccc784688':
  Sanity check while updating volume in MediaRouteChooserDialog
 2012-06-23 05:36:58 -07:00
Adam Powell
3b939b7242 am fd3fd482: Merge "Update route count properly when MediaRouteButton detects grouped/ungrouped events" into jb-dev 
* commit 'fd3fd482ab6ab67b687696f51fa67714bd36fa49':
  Update route count properly when MediaRouteButton detects grouped/ungrouped events
 2012-06-23 05:36:54 -07:00
Adam Powell
1b4ea7eff5 Sanity check while updating volume in MediaRouteChooserDialog 
Bug 6720224

When a window dies it's possible to receive a lingering ACTION_CANCEL
event to the SeekBar for volume. Be sure that we don't try to mess
with something that's already gone by that point.

Change-Id: I4f6119718fc21204d9013d591bc984b785b698b4
 2012-06-22 20:41:31 -07:00
Adam Powell
f3b653a21c Update route count properly when MediaRouteButton detects 
grouped/ungrouped events

Change-Id: I1b00678cc3b548f347c51c3fcbfce18ecc8fbabe
 2012-06-22 19:22:38 -07:00
Irfan Sheriff
491906a7f1 Merge "Move ARP test functionality to ArpPeer" 2012-06-22 16:38:09 -07:00
Jeff Brown
dc6f8b2b8c Merge "Deprecate DatabaseUtils.InsertHelper." 2012-06-22 15:34:33 -07:00
Jeff Brown
b33eb4e32a Deprecate DatabaseUtils.InsertHelper. 
This class does not offer any advantages over SQLiteStatement
and just makes code more complex and error-prone.

Documented that the class is not thread-safe.

Removed a potential deadlock in insert() and replace() caused
by the insertInternal() method being synchronized in the case
where the class was being used concurrently (woe to you!).

Thread A would start a transaction.
Thread B would call insertInternal() and acquire the object monitor,
but block because it could not obtain the db connection because
thread A is holding onto it.
Thread A would call insertInternal() and block because Thread B
was holding the object monitor.
Deadlock.

Changed this code to use a transaction instead of a lock,
which provides the necessary mutual exclusion guarantee without
the potential for a deadlock.  Even so, the class really isn't
thread safe.

Bug: 6625094
Change-Id: I51d9a15567a6f2bad6f25e550b48f8f6ffcab2a7
 2012-06-22 15:24:26 -07:00
Ying Wang
5539e720b4 am ddeb7bd3: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'ddeb7bd3c7593d51d4d2bfd9fe39d5f0ffa05d89':
  Import translations. DO NOT MERGE
 2012-06-22 15:01:52 -07:00
Ying Wang
ddeb7bd3c7 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-22 14:58:39 -07:00
Ying Wang
604d3eb76a Merge "Import translations. DO NOT MERGE" 2012-06-22 14:58:26 -07:00