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

32095 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
101a120c27 am 9be0105f: docs: fix several links 
* commit '9be0105fbc56eb1b1813bb7c5fe258a144867a43':
  docs: fix several links
 2012-06-22 13:33:30 -07:00
Ying Wang
8f2acd0a2b Import translations. DO NOT MERGE 
Change-Id: Idcb453e08823c584fb0f748ebe46ed036046c9d4
 2012-06-22 12:53:57 -07:00
Scott Main
9be0105fbc docs: fix several links 
Change-Id: I89d9fd64dc22c90680bb05415cc966c255165af9
 2012-06-22 12:35:08 -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
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
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
RoboErik
a3bd05f212 am b047b1f7: Merge "b/6705777 Remove \'speaker\' from strings" into jb-dev 
* commit 'b047b1f73800ff92eea4ff4b3adc62e5a20eb8df':
  b/6705777 Remove 'speaker' from strings
 2012-06-21 17:22:50 -07:00
RoboErik
b047b1f738 Merge "b/6705777 Remove 'speaker' from strings" into jb-dev 2012-06-21 17:20:55 -07:00
RoboErik
be76e21543 b/6705777 Remove 'speaker' from strings 
We should just say Tablet or Phone when selecting the local
playback instead of Tablet speakers or Phone speaker.

Change-Id: Ia6c439f711bacb7b1e70fbcf4887df8141f91b61
 2012-06-21 17:05:52 -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
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
Eric Fischer
242f1323d2 am cda69964: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'cda6996408d785f368e67afaca79a6afa6f57b1b':
  Import translations. DO NOT MERGE
 2012-06-21 13:12:08 -07:00
Eric Fischer
cda6996408 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-21 13:10:49 -07:00
Eric Fischer
ed6103d573 Import translations. DO NOT MERGE 
Change-Id: If3ebb62b4c2a912512600e51129551e23cf31553
 2012-06-21 12:57:27 -07:00
Jake Hamby
dcd6e38c6a am 65d4445b: Merge "Add config option to enable links to Cell Broadcast app." into jb-dev 
* commit '65d4445bfd3351609f786fdf6038ddd362a3d6ca':
  Add config option to enable links to Cell Broadcast app.
 2012-06-21 12:34:35 -07:00
Jake Hamby
65d4445bfd Merge "Add config option to enable links to Cell Broadcast app." into jb-dev 2012-06-21 12:32:39 -07:00
Jake Hamby
43af7e0756 Add config option to enable links to Cell Broadcast app. 
Add "config_cellBroadcastAppLinks" internal boolean config item,
defaulting to false. For devices with the Cell Broadcast app,
setting this config option to true will add a menu item to the
MMS app to jump to the list of received cell broadcasts, and a
preferences item to Settings to jump to cell broadcast settings.

Bug: 6709985
Change-Id: I9fe1919e6d76ba1dfe1e1381e2c38ecdd5e0a867
 2012-06-21 12:17:18 -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
Daniel Sandler
63d842cc4d am d5353b47: Fix docs 
* commit 'd5353b475001f19e3cbc9c1a4165c9e6038a812f':
  Fix docs
 2012-06-21 11:52:38 -07:00