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

35567 Commits

Author SHA1 Message Date
Svetoslav Ganov
de9e026f10 am d849afb1: am a726e23d: Merge "Cannot force a shown item from an ActionMode into the overflow menu." into jb-mr1-dev 
* commit 'd849afb172e9e82a6814baa5c6d2fdcb8cf7736b':
  Cannot force a shown item from an ActionMode into the overflow menu.
 2012-10-10 08:37:46 -07:00
Svetoslav Ganov
d849afb172 am a726e23d: Merge "Cannot force a shown item from an ActionMode into the overflow menu." into jb-mr1-dev 
* commit 'a726e23d7b13824ede2cdc185ce846238d348604':
  Cannot force a shown item from an ActionMode into the overflow menu.
 2012-10-10 08:33:37 -07:00
Svetoslav Ganov
a726e23d7b Merge "Cannot force a shown item from an ActionMode into the overflow menu." into jb-mr1-dev 2012-10-09 22:01:55 -07:00
Svetoslav Ganov
14c4669916 Cannot force a shown item from an ActionMode into the overflow menu. 
1. An app showing an action mode with a visible item that decides to move this item
   to the overflow menu cannot do so since the action menu is not updated properly.
   Specifically, ActionMenuPresenter does not clear the "is action button" property
   of a menu item neither requires nor requests an action button, i.e. the item's
   "show as action" property changed to be never shown on the action bar.

bug:7319766

Change-Id: I5cfda6269466fafca1f039a3bab6397392ae9f17
 2012-10-09 19:20:27 -07:00
Baligh Uddin
f72c9d0309 am 07cfed1b: am 64ad9540: Merge "Revert "Revert "Add config resource to help ATT prepaid""" into jb-mr1-dev 
* commit '07cfed1b4f1ea04cf551c886e07f4318cfc11006':
  Revert "Revert "Add config resource to help ATT prepaid""
 2012-10-09 19:20:15 -07:00
Baligh Uddin
07cfed1b4f am 64ad9540: Merge "Revert "Revert "Add config resource to help ATT prepaid""" into jb-mr1-dev 
* commit '64ad9540850e2ffc1583564039510592c06264f5':
  Revert "Revert "Add config resource to help ATT prepaid""
 2012-10-09 19:17:55 -07:00
Baligh Uddin
64ad954085 Merge "Revert "Revert "Add config resource to help ATT prepaid""" into jb-mr1-dev 2012-10-09 19:14:37 -07:00
Dianne Hackborn
572286b415 am 31af905a: am 36db9d08: Merge "Further work on issue #7307399: Framework needs a new pre-user-shutdown..." into jb-mr1-dev 
* commit '31af905ac5388339fd0ffd87e6f25bd2a293dc0e':
  Further work on issue #7307399: Framework needs a new pre-user-shutdown...
 2012-10-09 19:14:24 -07:00
Baligh Uddin
b7c6a62a09 Revert "Revert "Add config resource to help ATT prepaid"" 
Revert the revert - change is good.

This reverts commit 2133caf515660d957bb7fd05b35e7eb2f2391d48

Change-Id: I987d5533e8ce909a3adfa38bceeac5c42e22da19
 2012-10-09 19:13:31 -07:00
Dianne Hackborn
31af905ac5 am 36db9d08: Merge "Further work on issue #7307399: Framework needs a new pre-user-shutdown..." into jb-mr1-dev 
* commit '36db9d0879640a1cb9a8723d6649068a1c4c08de':
  Further work on issue #7307399: Framework needs a new pre-user-shutdown...
 2012-10-09 19:13:13 -07:00
Dianne Hackborn
36db9d0879 Merge "Further work on issue #7307399: Framework needs a new pre-user-shutdown..." into jb-mr1-dev 2012-10-09 19:10:49 -07:00
Baligh Uddin
54f0cb4846 am 3decc4b5: am 2aee7c18: Merge "Revert "Add config resource to help ATT prepaid"" into jb-mr1-dev 
* commit '3decc4b59764c4fbd0b8630606dae325c414bf3a':
  Revert "Add config resource to help ATT prepaid"
 2012-10-09 18:00:26 -07:00
Dianne Hackborn
c0bd747b06 Further work on issue #7307399: Framework needs a new pre-user-shutdown... 
...phase & callback API

I realized there were a few things wrong with what was there.  The new
ACTION_USER_STARTING was not being sent for the first user at boot, and
there was an existing problem where ACTION_USER_STARTED was sent every
time there was a user switch.

Also improved some debug output of broadcasts to make it easier to see
what is going on in this stuff, and better reporting of why a service
couldn't be started.

Change-Id: Id8a536defbbad1f73d94a37d13762436b822fbe3
 2012-10-09 17:57:14 -07:00
Svetoslav Ganov
8ca8e02bf2 am 52c59ddf: am 27258209: Merge "Return true on successful accessiblity action click/long click." into jb-mr1-dev 
* commit '52c59ddfee480fe974194af6a6abe7fbd19aba9d':
  Return true on successful accessiblity action click/long click.
 2012-10-09 17:57:06 -07:00
Baligh Uddin
3decc4b597 am 2aee7c18: Merge "Revert "Add config resource to help ATT prepaid"" into jb-mr1-dev 
* commit '2aee7c1843670f5b7a81261079ad0eb1e4ebb9ef':
  Revert "Add config resource to help ATT prepaid"
 2012-10-09 17:56:45 -07:00
Svetoslav Ganov
52c59ddfee am 27258209: Merge "Return true on successful accessiblity action click/long click." into jb-mr1-dev 
* commit '27258209fee11a45154875c3c5493962f55904d2':
  Return true on successful accessiblity action click/long click.
 2012-10-09 17:54:58 -07:00
Baligh Uddin
2aee7c1843 Merge "Revert "Add config resource to help ATT prepaid"" into jb-mr1-dev 2012-10-09 17:53:37 -07:00
Baligh Uddin
2133caf515 Revert "Add config resource to help ATT prepaid" 
breaking jb-mr1-release

This reverts commit 901ac560cafe0b8d76fd7441cbaf8749be33577c

Change-Id: I5fab4097a40e0ba31dc716967ef921c113a795a7
 2012-10-09 17:52:52 -07:00
Svetoslav Ganov
27258209fe Merge "Return true on successful accessiblity action click/long click." into jb-mr1-dev 2012-10-09 17:52:01 -07:00
Dianne Hackborn
7beb70a94a am e5456645: am 840590dd: Merge "Fix issue #7311376: Add API to allow apps to know if they are..." into jb-mr1-dev 
* commit 'e54566457869a15d606870c230662b76c02456cb':
  Fix issue #7311376: Add API to allow apps to know if they are...
 2012-10-09 17:51:13 -07:00
Dianne Hackborn
e545664578 am 840590dd: Merge "Fix issue #7311376: Add API to allow apps to know if they are..." into jb-mr1-dev 
* commit '840590dd642719f402491092944a12475d6d6a8e':
  Fix issue #7311376: Add API to allow apps to know if they are...
 2012-10-09 17:49:11 -07:00
Dianne Hackborn
840590dd64 Merge "Fix issue #7311376: Add API to allow apps to know if they are..." into jb-mr1-dev 2012-10-09 17:46:36 -07:00
Chris Wren
b0a230174d am f37e38a0: am f966cf35: Merge "default the screen on during the dream." into jb-mr1-dev 
* commit 'f37e38a0b3284aaa27a153a3c017a60be1018e3e':
  default the screen on during the dream.
 2012-10-09 17:42:28 -07:00
Chris Wren
f37e38a0b3 am f966cf35: Merge "default the screen on during the dream." into jb-mr1-dev 
* commit 'f966cf353942690ca691e52a5b396a824fd52829':
  default the screen on during the dream.
 2012-10-09 17:41:05 -07:00
Chris Wren
f966cf3539 Merge "default the screen on during the dream." into jb-mr1-dev 2012-10-09 17:38:30 -07:00
Dianne Hackborn
a8a9bd65bf Fix issue #7311376: Add API to allow apps to know if they are... 
...running as the foreground user

Add UserManager.isUserRunning() which is the public version of the
existing method on ActivityManager.

Also add UserManager.isUserRunningOrStopping() since that seems like
it will be useful.

And fix the internal function that returns the array of currently
running users to not include stopped users.

Change-Id: I84672fa8748fc027fd402729586b5603f640e498
 2012-10-09 17:00:31 -07:00
Svetoslav Ganov
96985fccdc Return true on successful accessiblity action click/long click. 
1. If a view is clickable or long clickable perfroming the corresponding
   accessiblity action should return true no matter whether there is a
   registered on click/long click listener. Currently true is returned
   only if there is a listener but it is also possible that a sub-class
   overrides performClick and does work there. For example CompoundButton.
   Now if the view is clickable or long clickable we will call the
   perfrom* method and return true, which is we clicked.

2. Fixed some JavaDoc indentation.

bug:7318777

Change-Id: Id603fee378b8f7d07f1128b5641ede57640bab53
 2012-10-09 16:32:50 -07:00
Christopher Tate
fcd4db9b81 am 711b4fca: am c9c47f82: Merge "Back up / restore the "Avoid poor connections" wifi setting" into jb-mr1-dev 
* commit '711b4fcadda2948b73e97f4ff3dc3e96b5316499':
  Back up / restore the "Avoid poor connections" wifi setting
 2012-10-09 16:05:25 -07:00
Christopher Tate
711b4fcadd am c9c47f82: Merge "Back up / restore the "Avoid poor connections" wifi setting" into jb-mr1-dev 
* commit 'c9c47f821af22c6fae4c97fe185c6a651a6f9b67':
  Back up / restore the "Avoid poor connections" wifi setting
 2012-10-09 16:01:59 -07:00
Christopher Tate
c9c47f821a Merge "Back up / restore the "Avoid poor connections" wifi setting" into jb-mr1-dev 2012-10-09 15:57:06 -07:00
Christopher Tate
16eb7cd457 Back up / restore the "Avoid poor connections" wifi setting 
Bug 7318177

Change-Id: I8fdc037f823b8c57727e7d49c5bffdc9b3c10ebb
 2012-10-09 15:26:30 -07:00
Eino-Ville Talvala
c2b90f77bd am 685a5128: am cbdb2136: Merge "Camera: Query AudioService for shutter sound enforcement." into jb-mr1-dev 
* commit '685a512868a7da11f7097282fd1a4a2af070d816':
  Camera: Query AudioService for shutter sound enforcement.
 2012-10-09 15:26:07 -07:00
Eino-Ville Talvala
685a512868 am cbdb2136: Merge "Camera: Query AudioService for shutter sound enforcement." into jb-mr1-dev 
* commit 'cbdb21364653910179da1eddd43f4b932420b75b':
  Camera: Query AudioService for shutter sound enforcement.
 2012-10-09 15:23:54 -07:00
Eino-Ville Talvala
cbdb213646 Merge "Camera: Query AudioService for shutter sound enforcement." into jb-mr1-dev 2012-10-09 15:21:36 -07:00
Robert Greenwalt
6f4fcc73b4 am b24373e0: am 64cb35c0: Merge "Add config resource to help ATT prepaid" into jb-mr1-dev 
* commit 'b24373e04a767d81d2f58c1398495214ef181328':
  Add config resource to help ATT prepaid
 2012-10-09 13:34:07 -07:00
Robert Greenwalt
b24373e04a am 64cb35c0: Merge "Add config resource to help ATT prepaid" into jb-mr1-dev 
* commit '64cb35c078d58d9025d2f14b3674ca59f2e6d80b':
  Add config resource to help ATT prepaid
 2012-10-09 13:30:49 -07:00
Adam Powell
d338b9775b am db380410: am 16062128: Merge "Allow more scaling values to be tuned in resource overlays" into jb-mr1-dev 
* commit 'db38041002c6c9f297e8c8c1eade6471646045b2':
  Allow more scaling values to be tuned in resource overlays
 2012-10-09 13:29:38 -07:00
Robert Greenwalt
64cb35c078 Merge "Add config resource to help ATT prepaid" into jb-mr1-dev 2012-10-09 13:27:45 -07:00
Adam Powell
db38041002 am 16062128: Merge "Allow more scaling values to be tuned in resource overlays" into jb-mr1-dev 
* commit '160621280d7eaba7eeddc183c4c11aa49d32e30e':
  Allow more scaling values to be tuned in resource overlays
 2012-10-09 13:27:42 -07:00
Adam Powell
160621280d Merge "Allow more scaling values to be tuned in resource overlays" into jb-mr1-dev 2012-10-09 13:25:12 -07:00
Victoria Lease
45e001a3ce am 45bdc2c1: am c0c0c0e6: Merge "Multiuser love for LocationManager" into jb-mr1-dev 
* commit '45bdc2c170d37ac4821423f28cda141687256ab2':
  Multiuser love for LocationManager
 2012-10-09 12:27:08 -07:00
Victoria Lease
45bdc2c170 am c0c0c0e6: Merge "Multiuser love for LocationManager" into jb-mr1-dev 
* commit 'c0c0c0e612e1ccf1e55eb2a9338ddfff40d8d7f2':
  Multiuser love for LocationManager
 2012-10-09 12:24:42 -07:00
Victoria Lease
c0c0c0e612 Merge "Multiuser love for LocationManager" into jb-mr1-dev 2012-10-09 12:22:03 -07:00
Robert Greenwalt
901ac560ca Add config resource to help ATT prepaid 
bug:7306353
Change-Id: I8da9e7591ad5e28d5b319df11435333da44fb7d3
 2012-10-09 12:20:08 -07:00
Eric Laurent
69427e3515 am 542e0afa: am 14dfe4e0: Merge "enforce camera sound according to country code" into jb-mr1-dev 
* commit '542e0afa5114583f357d6f65ede036a444f694e7':
  enforce camera sound according to country code
 2012-10-09 11:35:08 -07:00
Eric Laurent
542e0afa51 am 14dfe4e0: Merge "enforce camera sound according to country code" into jb-mr1-dev 
* commit '14dfe4e0abe21782236af987f39d01dfb38e6ff3':
  enforce camera sound according to country code
 2012-10-09 11:32:36 -07:00
Eric Laurent
14dfe4e0ab Merge "enforce camera sound according to country code" into jb-mr1-dev 2012-10-09 11:29:11 -07:00
Adam Powell
3307958c6b Allow more scaling values to be tuned in resource overlays 
Bug 7267507

Change-Id: I3fba6882a0ac4cb7d34430ba36dec83c030a73cd
 2012-10-09 11:21:08 -07:00
Jeff Brown
33c30e36a5 am 102e97bb: am 8f4baad3: Merge "Blank or unblank all displays as need." into jb-mr1-dev 
* commit '102e97bb6dda1b211acbc4e6e3d3ae58039c9a0d':
  Blank or unblank all displays as need.
 2012-10-09 00:07:05 -07:00
Jeff Brown
102e97bb6d am 8f4baad3: Merge "Blank or unblank all displays as need." into jb-mr1-dev 
* commit '8f4baad387d8ad63efbc05cfa8c4e4c472793deb':
  Blank or unblank all displays as need.
 2012-10-09 00:05:26 -07:00