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

26163 Commits

Author SHA1 Message Date
Dianne Hackborn
c32e190ea6 resolved conflicts for merge of a9c38461 to master 
Change-Id: Ie7044c4f9f15384c3edd328fa8e2932c731d9d5c
 2012-06-29 16:23:49 -07:00
Dianne Hackborn
a9c3846194 am bfb752f8: Merge "Fix issue #6761130: Clearing app data in settings does not clear app\'s USB storage" into jb-dev 
* commit 'bfb752f8f0e4d73dc251c19d2ef79649fbbe4fd1':
  Fix issue #6761130: Clearing app data in settings does not clear app's USB storage
 2012-06-29 15:43:37 -07:00
Dianne Hackborn
bfb752f8f0 Merge "Fix issue #6761130: Clearing app data in settings does not clear app's USB storage" into jb-dev 2012-06-29 15:40:18 -07:00
Dianne Hackborn
183ce028f1 Fix issue #6761130: Clearing app data in settings does not clear app's USB storage 
The package manager calls to clear data / clear cache were not also
having default container service clear the data on external storage.  Now
they do.

Change-Id: Ib5e5eb6adf2cac5a4cc094cc1a02ac8cfb6a2edf
 2012-06-29 15:00:21 -07:00
Michael Jurka
4efade8a85 Merge "Removing setChildrenLayersEnabled" 2012-06-29 12:57:26 -07:00
Christopher Tate
b2d8f3f747 am b69c77cd: am 1598a508: Merge "Do not back up / restore the rotation-related settings" into jb-dev 
* commit 'b69c77cd194ccbe24a8b1e5d8457b44d150f9a96':
  Do not back up / restore the rotation-related settings
 2012-06-29 12:45:57 -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
Michael Jurka
ba64974141 Removing setChildrenLayersEnabled 
Change-Id: I88d8228eadb59160648f2c4e131fcd85945f2109
 2012-06-28 19:15:20 -07:00
Dianne Hackborn
acc3da02e8 am 4be93bbe: am 074b54fb: Merge "Maybe fix issue #6756472: Share button is not defocusing the shade" into jb-dev 
* commit '4be93bbe911c1a4471f81f0e261e9b13d9212c36':
  Maybe fix issue #6756472: Share button is not defocusing the shade
 2012-06-28 17:45:40 -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
667ca82189 am 9454e298: am 98fd6405: Merge "Fix NPEs when using the APIs a little oddly." into jb-dev 
* commit '9454e29896e22268416082c99931d13a37b7c71e':
  Fix NPEs when using the APIs a little oddly.
 2012-06-28 14:24:20 -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
Gilles Debunne
6640891125 Merge "Added comments describing the span limit attributes" 2012-06-27 17:21:47 -07:00
Teng-Hui Zhu
06d0aa8ed1 Merge "Avoid redundant reload in inline mode after exit from full screen." 2012-06-27 16:28:11 -07:00
Matthew Xie
530c843a8f am 691976fa: 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 '691976fae6ff7ef925e411e9e7b273d2623072bf':
  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:53:07 -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
Teng-Hui Zhu
c3a2858de9 Avoid redundant reload in inline mode after exit from full screen. 
bug:5710646

First, if we exit the full screen mode while playing, we can continue to play
in inline mode.

If it is paused, then we can avoid a reload if user try to play the same video
again after the full screen mode.

webkit change:
https://android-git.corp.google.com/g/#/c/202138/

Change-Id: Ia69fa22a50d916cd8dd2b995cf3531fe9b637531
 2012-06-27 15:48:02 -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
Gilles Debunne
d3236dc167 Merge "Ensure batch edit mode is ended on window focus loss" 2012-06-27 15:23:08 -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
de6082551d am 882c97b5: am cdb3f9c4: Merge "docs: add api overview for jb" into jb-dev 
* commit '882c97b59a8ef89ff8efa9064829f8014b9a7638':
  docs: add api overview for jb
 2012-06-26 21:59:44 -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
Gilles Debunne
dd0c25c921 Added comments describing the span limit attributes 
Patch: replaced left/right by before/after and added a comment on RTL.

Change-Id: Iccd70adfbba4cb5f76d2729eeb81fed9b50403ae
 2012-06-26 15:18:49 -07:00
Gilles Debunne
c72fba82a6 Ensure batch edit mode is ended on window focus loss 
This is a translation of this open source contribution:
https://android-review.googlesource.com/38503

Change-Id: I4d3adf89d0752e6fd5ec2cdad3a54d4e764a1fe7
 2012-06-26 14:48:07 -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 #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