Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,138 Commits 3 Branches 0 Tags
48d4ab73d5b60b677cbf6d4887a67e52e62fa20b
Commit Graph

26131 Commits

Author SHA1 Message Date
Dianne Hackborn
e6c2d62efb am 9906e784: am 17990395: Merge "Fix issue #6717667: expanded notification actions don\'t work on the lock screen" into jb-dev 
* commit '9906e784faca2cc8388a04fdc544722ea93d51be':
  Fix issue #6717667: 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 #6717667: expanded notification actions don\'t work on the lock screen" into jb-dev 
* commit '17990395bc62f8ce1bae4f1880899f231a8e613b':
  Fix issue #6717667: expanded notification actions don't work on the lock screen
 2012-06-25 17:37:15 -07:00
Dianne Hackborn
17990395bc Merge "Fix issue #6717667: expanded notification actions don't work on the lock screen" into jb-dev 2012-06-25 17:35:36 -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
Michael Jurka
f25ab44975 Update documentation on max widget bitmap usage 
Change-Id: I564afccc425f7e76501cb7ffd404ad369bdd396d
 2012-06-25 15:11:21 -07:00
Dianne Hackborn
1927ae8a56 Fix issue #6717667: 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
97e0a1c6f3 docs: clean up javadoc code snippets, unescaped entities 
Change-Id: Idc21caceccaaa2cc11a6c46b453b6a9b26164f34
 2012-06-25 11:25:20 -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
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
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
Adam Powell
17f006ea92 am 8a0f63bb: am 40a9da3b: Merge "Allow sloppy touch targeting on Action Bar home/up" into jb-dev 
* commit '8a0f63bb588138a9e4f1ef7830e94282efe57c6b':
  Allow sloppy touch targeting on Action Bar home/up
 2012-06-22 14:30:33 -07:00
Adam Powell
8a0f63bb58 am 40a9da3b: Merge "Allow sloppy touch targeting on Action Bar home/up" into jb-dev 
* commit '40a9da3b9e5ae9d4d03b89f61f24ee6d96bd3bf4':
  Allow sloppy touch targeting on Action Bar home/up
 2012-06-22 14:28:26 -07:00
Adam Powell
40a9da3b9e Merge "Allow sloppy touch targeting on Action Bar home/up" into jb-dev 2012-06-22 14:26:20 -07:00
Adam Powell
6231ab8bbb Allow sloppy touch targeting on Action Bar home/up 
Bug 6521608

When there are no custom views or other actionable views next to the
action bar's home/up affordance, expand the touch target by a generous
slop value. This helps frustrating cases where a user accidentally
hits just to the right of Up and nothing happens.

Change-Id: I09ef604ce70ad380aab62a373b04c4b02007c644
 2012-06-22 14:09:25 -07:00
Scott Main
adba6ffbb9 am 101a120c: am 9be0105f: docs: fix several links 
* commit '101a120c27f68fb7d44e6221244cb9441dfc4285':
  docs: fix several links
 2012-06-22 13:35:52 -07:00
Scott Main
101a120c27 am 9be0105f: docs: fix several links 
* commit '9be0105fbc56eb1b1813bb7c5fe258a144867a43':
  docs: fix several links
 2012-06-22 13:33:30 -07:00
Scott Main
9be0105fbc docs: fix several links 
Change-Id: I89d9fd64dc22c90680bb05415cc966c255165af9
 2012-06-22 12:35:08 -07:00
Adam Powell
6081420604 am 92a175ca: am 3cd46244: Merge "Avoid memory leak by only registering callback while attached to window." into jb-dev 
* commit '92a175ca6fae7b607d81f632b14b2219c64dc791':
  Avoid memory leak by only registering callback while attached to window.
 2012-06-22 10:48:20 -07:00
Adam Powell
92a175ca6f am 3cd46244: Merge "Avoid memory leak by only registering callback while attached to window." into jb-dev 
* commit '3cd4624448dcaddecc75461ef645da72e7e5c098':
  Avoid memory leak by only registering callback while attached to window.
 2012-06-22 10:46:15 -07:00
Adam Powell
3cd4624448 Merge "Avoid memory leak by only registering callback while attached to window." into jb-dev 2012-06-22 10:44:27 -07:00
George Mount
5048cd77dc Merge "Remove unused ENABLE_ANDROID_INSTALLABLE_WEB_APPS" 2012-06-22 10:29:50 -07:00
George Mount
fb4d37cd17 Merge "Remove password change from updateTextfield." 2012-06-22 10:29:36 -07:00
Jack Palevich
101c449152 Avoid memory leak by only registering callback while attached to window. 
Bug: 6710307
Change-Id: Idf57251e6feb48ec3e75e797144ff800fa874cc8
 2012-06-22 16:06:57 +08:00
Adam Powell
3f765f783d am 9b5cdf4f: am 4dd21c8e: Volume changes in MediaRouteChooserDialog 
* commit '9b5cdf4f14557f644b913cf654159389a251bfb4':
  Volume changes in MediaRouteChooserDialog
 2012-06-21 20:51:38 -07:00
Adam Powell
9b5cdf4f14 am 4dd21c8e: Volume changes in MediaRouteChooserDialog 
* commit '4dd21c8e77c0d369ee835f50cba1701e76aa18c4':
  Volume changes in MediaRouteChooserDialog
 2012-06-21 20:49:06 -07:00
Adam Powell
4dd21c8e77 Volume changes in MediaRouteChooserDialog 
Use the max volume reported by the selected route as the max value to set.

Change-Id: I9848dfb201387843e7ed398ac61e2d13e14e3f51
 2012-06-21 19:59:53 -07:00
Adam Powell
7527b369af am 8e453a03: am 95cf8c11: Merge "Allow ungrouping media routes when a group is the only alternate route" into jb-dev 
* commit '8e453a034183e8688e05d0c6991608626702d56f':
  Allow ungrouping media routes when a group is the only alternate route
 2012-06-21 16:47:40 -07:00
Kenny Root
287a64af97 am ae017c55: am a9543a3d: Merge "Pass additional inputs when spawning apps via the Zygote and add SELinux permission checks." 
* commit 'ae017c55824ca345186b0c9fc204401153bd8a23':
  Pass additional inputs when spawning apps via the Zygote and add SELinux permission checks.
 2012-06-21 16:47:26 -07:00
Chris Wren
ef46aa157b am 70a7be07: am ed5cc0e1: revert I057b7ac0 now that the layouts are the expected height. 
* commit '70a7be0799bd1af77c0bcf2472d9c7e46f53c3c1':
  revert I057b7ac0 now that the layouts are the expected height.
 2012-06-21 16:46:58 -07:00
Daniel Sandler
60abfa5c3a am 63d842cc: am d5353b47: Fix docs 
* commit '63d842cc4da3c2eb998aaf9adacbf20e833dff02':
  Fix docs
 2012-06-21 16:46:28 -07:00
Adam Powell
8e453a0341 am 95cf8c11: Merge "Allow ungrouping media routes when a group is the only alternate route" into jb-dev 
* commit '95cf8c1121a95750358ee99169c96d8d4dfb4950':
  Allow ungrouping media routes when a group is the only alternate route
 2012-06-21 15:52:28 -07:00
Adam Powell
f7e0a328c9 Allow ungrouping media routes when a group is the only alternate route 
Fix a MediaRouteButton bug where group item counts weren't taken into
account when deciding whether to toggle between two available groups
or show the chooser dialog.

Change-Id: I6400ffd4cfe80c8072c5be360264b8ca91d71c41
 2012-06-21 15:29:40 -07:00
Irfan Sheriff
55b9821dff Move ARP test functionality to ArpPeer 
Change-Id: Iecd6037cf8e0faa626ba6c27cef014822a6bc61b
 2012-06-21 15:08:29 -07:00
Kenny Root
ae017c5582 am a9543a3d: Merge "Pass additional inputs when spawning apps via the Zygote and add SELinux permission checks." 
* commit 'a9543a3dad0da58f30580bdf99b76bc2ab97a2df':
  Pass additional inputs when spawning apps via the Zygote and add SELinux permission checks.
 2012-06-21 14:17:13 -07:00
Chris Wren
bae2fe870a resolved conflicts for merge of 0a43f67e to master 
Change-Id: I072b756bc501c7669593eff012b120905a2fd962
 2012-06-21 16:46:14 -04:00
Romain Guy
eb129a266c am 16613476: am 0d6f4c06: Dejank: don\'t allocate when scrolling lists 
* commit '16613476c80f20736ef6bd3d217ab56aa57b03c9':
  Dejank: don't allocate when scrolling lists
 2012-06-21 12:03:58 -07:00
Chris Wren
70a7be0799 am ed5cc0e1: revert I057b7ac0 now that the layouts are the expected height. 
* commit 'ed5cc0e1f7648962f5c93e1277d282be75bcd537':
  revert I057b7ac0 now that the layouts are the expected height.
 2012-06-21 12:03:43 -07:00