Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
79,742 Commits 3 Branches 0 Tags
413b5c19a681bb4fda4cc5a6e8347d37792aa905
Commit Graph

23520 Commits

Author SHA1 Message Date
Adam Powell
b0f356579e am 1ab2edbc: Merge "Fix bug in parsing attributes for MediaRouteButton" into jb-dev 
* commit '1ab2edbcff94d53856a87010e35ffa50ce4c0502':
  Fix bug in parsing attributes for MediaRouteButton
 2012-07-09 14:15:56 -07:00
Adam Powell
1ab2edbcff Merge "Fix bug in parsing attributes for MediaRouteButton" into jb-dev 2012-07-09 14:13:54 -07:00
Romain Guy
13a3a87fa7 am dc99555d: Merge "Pass SearchView suggestion cursor exception to Log." 
* commit 'dc99555d61d50820b398096bb774ee56b2500476':
  Pass SearchView suggestion cursor exception to Log.
 2012-07-06 23:52:55 -07:00
Jake Wharton
73af451694 Pass SearchView suggestion cursor exception to Log. 
When an error in fetching a column occurs in your suggestions cursor
adapter this will ensure the stacktrace is logged to provide more
context about what failed.

Change-Id: Iafe4918caebb9b0fb712b758b2d3ace329fd2512
 2012-07-06 23:15:49 -07:00
Scott Main
480785dabb am fd516987: docs: misc bugs from external tracker 
* commit 'fd516987de29a48425da5ee5aace5be40adcc674':
  docs: misc bugs from external tracker
 2012-07-03 18:15:19 -07:00
Scott Main
fd516987de docs: misc bugs from external tracker 
Change-Id: I02d0d82c220401ac3a1ca180e8331a0f6dcd9e50
 2012-07-03 18:08:19 -07:00
Scott Main
7034ed833f am 5a883824: Merge "docs: fix document issue 27549" into jb-dev 
* commit '5a883824a2e97e0ccb08b4fe30accde6542f3f39':
  docs: fix document issue 27549
 2012-07-03 11:54:11 -07:00
Scott Main
5a883824a2 Merge "docs: fix document issue 27549" into jb-dev 2012-07-03 11:51:30 -07:00
Scott Main
35cb0650c0 am 399df567: docs: various link fixes and other typos from external tracker 
* commit '399df5677bd116a016664a10a0da432da29e829d':
  docs: various link fixes and other typos from external tracker
 2012-07-02 22:00:50 -07:00
Scott Main
15279cfc56 docs: fix document issue 27549 
Change-Id: I17995fd70978657a46ccfc77fa2ae84c56a05255
 2012-07-02 21:58:46 -07:00
Scott Main
399df5677b docs: various link fixes and other typos from external tracker 
Change-Id: I2a107f7e16429c0fe80c5e4cb67ecfaf267db301
 2012-07-02 21:47:20 -07:00
Wink Saville
095c58b73a Enhance StateMachine Quitting and logging support. DO NOT MERGE 
Make StateMachine#quit non-conditional and remove the need to
process the SM_QUIT_CMD it is now private.

Rename halting to onHalting.

Add onQuitting

Change the message specific logging to be more generic and change
the xxxProcessedMessagesYyy methods to xxxLogRecXyy names. Also add
addLogRec(String) and addLogRec(String, State) as the generic logging
methods.

bug: 5678189
Change-Id: I22f66d11828bfd70498db625fe1be728b90478b7

Conflicts:

	services/java/com/android/server/NsdService.java
 2012-07-02 10:57:11 -07:00
Christopher Tate
b69c77cd19 am 1598a508: Merge "Do not back up / restore the rotation-related settings" into jb-dev 
* commit '1598a50818b638d20120f71bab01c1792ecd4b6a':
  Do not back up / restore the rotation-related settings
 2012-06-29 12:42:52 -07:00
Christopher Tate
1598a50818 Merge "Do not back up / restore the rotation-related settings" into jb-dev 2012-06-29 12:40:34 -07:00
Christopher Tate
596e1917d5 Do not back up / restore the rotation-related settings 
Change-Id: I4c5f8c31fa78acc1dfa2676e89b2c1c7bbd12a06
 2012-06-29 11:55:02 -07:00
Dianne Hackborn
4be93bbe91 am 074b54fb: Merge "Maybe fix issue #6756472: Share button is not defocusing the shade" into jb-dev 
* commit '074b54fbc0b6254c0ba308e0cf2e86c1cc929348':
  Maybe fix issue #6756472: Share button is not defocusing the shade
 2012-06-28 17:42:23 -07:00
Dianne Hackborn
a194021650 Maybe fix issue #6756472: Share button is not defocusing the shade 
I got this reproduce a few times, then wasn't able to.  I made this
change and then couldn't reproduce it.  Maybe it fixed it.

The change here is to explicitly pass in the handler class to
apply() and reapply(), instead of relying it being set as a member of
the RemoteViews class.  This is much cleaner and more explicitly about
setting that for the click callbacks.

Bug: 6756472
Change-Id: I8d029c3836501df3206c433838124b4be3890a8b
 2012-06-28 16:34:35 -07:00
Mike Cleron
9454e29896 am 98fd6405: Merge "Fix NPEs when using the APIs a little oddly." into jb-dev 
* commit '98fd6405aec16c6062f562bf6e7c5f2d50da5d60':
  Fix NPEs when using the APIs a little oddly.
 2012-06-28 14:21:28 -07:00
Mike Cleron
98fd6405ae Merge "Fix NPEs when using the APIs a little oddly." into jb-dev 2012-06-28 14:18:48 -07:00
Daniel Sandler
c08dea2aa4 Fix NPEs when using the APIs a little oddly. 
This should help developers use some of the features of
Style via subclassing rather than duplicating functionality.

Bug: 6716608
Change-Id: I048e8221c8046e9779e08e6e262ac3fb37b01cb3
 2012-06-28 08:35:24 -07:00
Adam Powell
74d762a3ee Fix bug in parsing attributes for MediaRouteButton 
Change-Id: Ib61506f7b09b1e043f3f21d2fd46281fbced00f4
 2012-06-27 16:19:45 -07:00
Matthew Xie
691976fae6 am 29775794: Merge "Get rid of the extra bt_disable call when turning on airplane mode Get rid of enabling bt when in airplane mode." into jb-dev 
* commit '29775794d6014196063534415ad61d60e84e9c9a':
  Get rid of the extra bt_disable call when turning on airplane mode Get rid of enabling bt when in airplane mode.
 2012-06-27 15:50:10 -07:00
Matthew Xie
29775794d6 Merge "Get rid of the extra bt_disable call when turning on airplane mode Get rid of enabling bt when in airplane mode." into jb-dev 2012-06-27 15:47:53 -07:00
Matthew Xie
9107e37b24 Get rid of the extra bt_disable call when turning on airplane mode 
Get rid of enabling bt when in airplane mode.

Current code has 2 paths that trying to place bluetooth in cold state when
turning airplane mode on. This caused extra call of bt_disable that
causing a kernel sleep failure. The fix removes one of the sys call.
This CL keeps Bluetooth in cold state after turning airplane mode on
instead of seting it to hotoff state
bug 6563480

Change-Id: I30c413707157acb4a8e83ded9452256cf6260899
 2012-06-27 15:12:01 -07:00
Scott Main
882c97b59a am cdb3f9c4: Merge "docs: add api overview for jb" into jb-dev 
* commit 'cdb3f9c45b97a64380f044c6b8c1863c1ba58b6a':
  docs: add api overview for jb
 2012-06-26 21:56:17 -07:00
Scott Main
cdb3f9c45b Merge "docs: add api overview for jb" into jb-dev 2012-06-26 21:54:08 -07:00
Scott Main
60dd520d37 docs: add api overview for jb 
Change-Id: Ibb916138026bb13bb424c826fe8faa563c71bf94
 2012-06-26 21:41:25 -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
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
97e0a1c6f3 docs: clean up javadoc code snippets, unescaped entities 
Change-Id: Idc21caceccaaa2cc11a6c46b453b6a9b26164f34
 2012-06-25 11:25:20 -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
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
f3b653a21c Update route count properly when MediaRouteButton detects 
grouped/ungrouped events

Change-Id: I1b00678cc3b548f347c51c3fcbfce18ecc8fbabe
 2012-06-22 19:22:38 -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
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
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
Daniel Sandler
63d842cc4d am d5353b47: Fix docs 
* commit 'd5353b475001f19e3cbc9c1a4165c9e6038a812f':
  Fix docs
 2012-06-21 11:52:38 -07:00
Daniel Sandler
0a43f67ef3 am 790024bf: Merge "Unhide new methods on RemoteViews and Notification." into jb-dev 
* commit '790024bfe6dd2765dd5e552053797459aab72da1':
  Unhide new methods on RemoteViews and Notification.
 2012-06-21 11:52:34 -07:00
Romain Guy
16613476c8 am 0d6f4c06: Dejank: don\'t allocate when scrolling lists 
* commit '0d6f4c06df0b0e35125f088ca028c7226b274dc4':
  Dejank: don't allocate when scrolling lists
 2012-06-21 11:52:22 -07:00