Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
98,831 Commits 3 Branches 0 Tags
63ed1663dfa1efce442add8270e91bd28f14ee8a
Commit Graph

30164 Commits

Author SHA1 Message Date
Jeff Sharkey
50035e8396 am 89be4267: am 03bd101b: Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev 
* commit '89be4267d0a23ca258af607291bc4f905f963185':
  Move lockscreen to using haptic feedback setting.
 2012-10-10 16:32:36 -07:00
Jeff Sharkey
89be4267d0 am 03bd101b: Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev 
* commit '03bd101b887d9741230ac6a7d296d90436020b8c':
  Move lockscreen to using haptic feedback setting.
 2012-10-10 16:29:39 -07:00
Jeff Sharkey
03bd101b88 Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev 2012-10-10 16:26:49 -07:00
Jeff Sharkey
5ed9d68040 Move lockscreen to using haptic feedback setting. 
This removes lockscreen-specific "Vibrate on touch" setting, and
changes it to use the haptic feedback setting instead.

Bug: 7318772
Change-Id: I637c392a1aaa22403cb20da4723f90c3b2e3de19
 2012-10-10 16:08:47 -07:00
Fabrice Di Meglio
43c3b139e4 am e7af2a37: am ee65e1d3: am 7573b1ee: Merge "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)" into jb-mr1-dev 
* commit 'e7af2a370c2f5e108068a05a054b1b3a88fb61df':
  Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)
 2012-10-10 15:03:47 -07:00
Fabrice Di Meglio
e7af2a370c am ee65e1d3: am 7573b1ee: Merge "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)" into jb-mr1-dev 
* commit 'ee65e1d356e4d7a160e5ba26cdf804b804b2bcac':
  Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)
 2012-10-10 15:02:19 -07:00
Fabrice Di Meglio
ee65e1d356 am 7573b1ee: Merge "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)" into jb-mr1-dev 
* commit '7573b1ee8997709eae23f5b3bdee849de7380e34':
  Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)
 2012-10-10 15:00:05 -07:00
Fabrice Di Meglio
7573b1ee89 Merge "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)" into jb-mr1-dev 2012-10-10 14:57:08 -07:00
Jeff Sharkey
5a5b3b4928 am cd25032d: am 21973701: am 0dd0b144: Merge "Include all accounts in dumpsys." into jb-mr1-dev 
* commit 'cd25032d019259ed70490ec9e653a66367766450':
  Include all accounts in dumpsys.
 2012-10-10 14:36:47 -07:00
Jeff Sharkey
cd25032d01 am 21973701: am 0dd0b144: Merge "Include all accounts in dumpsys." into jb-mr1-dev 
* commit '21973701aff5c4d4ef5219a4cac5a5ff5257968b':
  Include all accounts in dumpsys.
 2012-10-10 14:34:06 -07:00
Jeff Sharkey
21973701af am 0dd0b144: Merge "Include all accounts in dumpsys." into jb-mr1-dev 
* commit '0dd0b1447c28f095265c6c108ccb7cdb4f87832c':
  Include all accounts in dumpsys.
 2012-10-10 14:32:00 -07:00
Jeff Sharkey
0dd0b1447c Merge "Include all accounts in dumpsys." into jb-mr1-dev 2012-10-10 14:29:32 -07:00
Fabrice Di Meglio
fbc21e126f Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic) 
- fix LayoutParams resolution for LinearLayout only
- apply onResolveLayoutDirection() in both measureHorizontal() and
measureVertical()

Change-Id: I5fcded9a79cd9aaeb0e12da7fd14176b71ba2fb6
 2012-10-10 14:19:12 -07:00
Jeff Sharkey
6eb9620ff2 Include all accounts in dumpsys. 
Allow accounts to be loaded when a user is stopped, but always
validate accounts against a freshly queried PMS cache when the user
actually starts.

Bug: 7276595
Change-Id: I0382064c73123c243bc6f6e5da8fc3d0a8b73442
 2012-10-10 14:06:23 -07:00
Matthew Xie
7b827ef083 am 87efb143: am e8d27539: am ccf9ef60: Merge "Reduce android.bluetooth package debug messages" into jb-mr1-dev 
* commit '87efb143a131899e6223e2b497f1567a27607500':
  Reduce android.bluetooth package debug messages
 2012-10-10 12:20:15 -07:00
Matthew Xie
87efb143a1 am e8d27539: am ccf9ef60: Merge "Reduce android.bluetooth package debug messages" into jb-mr1-dev 
* commit 'e8d275392d5c47117880dcc1588d3646323348e7':
  Reduce android.bluetooth package debug messages
 2012-10-10 12:17:50 -07:00
Matthew Xie
e8d275392d am ccf9ef60: Merge "Reduce android.bluetooth package debug messages" into jb-mr1-dev 
* commit 'ccf9ef605e1195d3748459cc3d4dc3baa953252e':
  Reduce android.bluetooth package debug messages
 2012-10-10 12:16:14 -07:00
Matthew Xie
ccf9ef605e Merge "Reduce android.bluetooth package debug messages" into jb-mr1-dev 2012-10-10 12:14:08 -07:00
Daniel Sandler
c13107046a Remove Dream windows immediately. 
Ensures that onDetachedFromWindow happens before onDestroy.

Bug: 7295929
Change-Id: Ic4ac2552bfce75a5dc43dc840e6ef0182369e24b
 2012-10-10 11:34:44 -07:00
Ken Wakasa
6637d1040a am 72da683c: am b8e6a972: am 1a5f387b: Merge "Revert "Don\'t update the text services locale in the main thread"" into jb-mr1-dev 
* commit '72da683c6edf23678fdd3f53d777811bb5bbe1f2':
  Revert "Don't update the text services locale in the main thread"
 2012-10-10 09:39:53 -07:00
Ken Wakasa
72da683c6e am b8e6a972: am 1a5f387b: Merge "Revert "Don\'t update the text services locale in the main thread"" into jb-mr1-dev 
* commit 'b8e6a9724e33e01abc6261f3387e4671b0244f45':
  Revert "Don't update the text services locale in the main thread"
 2012-10-10 09:37:51 -07:00
Ken Wakasa
b8e6a9724e am 1a5f387b: Merge "Revert "Don\'t update the text services locale in the main thread"" into jb-mr1-dev 
* commit '1a5f387bcf26a6845a4fa744b8f54449ae70082f':
  Revert "Don't update the text services locale in the main thread"
 2012-10-10 09:35:12 -07:00
Ken Wakasa
1a5f387bcf Merge "Revert "Don't update the text services locale in the main thread"" into jb-mr1-dev 2012-10-10 09:32:36 -07:00
Ken Wakasa
72fa0b35c5 Revert "Don't update the text services locale in the main thread" 
This reverts commit 8fa0838bf8

Change-Id: Ie790ae6dcb33d05d1fbf86c8ef28aec6fe60793a
 2012-10-10 09:17:18 -07:00
Jeff Sharkey
86e0935a1f am ebb97455: am 62dee3d8: am 0fca2a3e: Merge "Fix build, only invalidate when creating user." into jb-mr1-dev 
* commit 'ebb97455327161157432fc0f3effce27990075e5':
  Fix build, only invalidate when creating user.
 2012-10-10 08:42:15 -07:00
Jeff Sharkey
4a55653e34 am abd0c099: am 45ed828a: am c85e16ca: Merge "Make RegisteredServicesCache multi-user aware." into jb-mr1-dev 
* commit 'abd0c099c75d85ebca9281c7937b5b5b86f6066f':
  Make RegisteredServicesCache multi-user aware.
 2012-10-10 08:42:10 -07:00
Satoshi Kataoka
ad9d695ecc am 78bd3854: am 27e2b6c2: am 0aaffb14: Merge "Don\'t update the text services locale in the main thread" into jb-mr1-dev 
* commit '78bd3854c63261cc01321ebb41a29d9302ae1b8f':
  Don't update the text services locale in the main thread
 2012-10-10 08:42:07 -07:00
Svetoslav Ganov
3c444d2c13 am de9e026f: am d849afb1: am a726e23d: Merge "Cannot force a shown item from an ActionMode into the overflow menu." into jb-mr1-dev 
* commit 'de9e026f10fde0726db97af002989b1248e4aa51':
  Cannot force a shown item from an ActionMode into the overflow menu.
 2012-10-10 08:41:58 -07:00
Jeff Sharkey
ebb9745532 am 62dee3d8: am 0fca2a3e: Merge "Fix build, only invalidate when creating user." into jb-mr1-dev 
* commit '62dee3d8ebb3a1d1e0adfb61c9ed505ecf8e2a85':
  Fix build, only invalidate when creating user.
 2012-10-10 08:38:03 -07:00
Jeff Sharkey
abd0c099c7 am 45ed828a: am c85e16ca: Merge "Make RegisteredServicesCache multi-user aware." into jb-mr1-dev 
* commit '45ed828ae2f8030186da8aa9848764f4a9f32224':
  Make RegisteredServicesCache multi-user aware.
 2012-10-10 08:38:00 -07:00
Satoshi Kataoka
78bd3854c6 am 27e2b6c2: am 0aaffb14: Merge "Don\'t update the text services locale in the main thread" into jb-mr1-dev 
* commit '27e2b6c25f17af7515e405d7a6a4a8f9cf1225b3':
  Don't update the text services locale in the main thread
 2012-10-10 08:37:56 -07:00
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
Jeff Sharkey
62dee3d8eb am 0fca2a3e: Merge "Fix build, only invalidate when creating user." into jb-mr1-dev 
* commit '0fca2a3e229b3909b389882873d5894a0008f485':
  Fix build, only invalidate when creating user.
 2012-10-10 08:33:52 -07:00
Jeff Sharkey
45ed828ae2 am c85e16ca: Merge "Make RegisteredServicesCache multi-user aware." into jb-mr1-dev 
* commit 'c85e16cafb777607e6c38e1843c5fa194b8086b3':
  Make RegisteredServicesCache multi-user aware.
 2012-10-10 08:33:49 -07:00
Satoshi Kataoka
27e2b6c25f am 0aaffb14: Merge "Don\'t update the text services locale in the main thread" into jb-mr1-dev 
* commit '0aaffb14c8e243433bab1a1bd5773005f0f17699':
  Don't update the text services locale in the main thread
 2012-10-10 08:33:45 -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
Jeff Sharkey
0fca2a3e22 Merge "Fix build, only invalidate when creating user." into jb-mr1-dev 2012-10-10 00:09:52 -07:00
Jeff Sharkey
9d0791bf6a Fix build, only invalidate when creating user. 
Bug: 7276595
Change-Id: I322f9d76a682b2d45fc556e35381442458168fe5
 2012-10-10 00:01:26 -07:00
Jeff Sharkey
c85e16cafb Merge "Make RegisteredServicesCache multi-user aware." into jb-mr1-dev 2012-10-09 23:47:01 -07:00
Satoshi Kataoka
0aaffb14c8 Merge "Don't update the text services locale in the main thread" into jb-mr1-dev 2012-10-09 23:36:50 -07:00
Matthew Xie
563e414784 Reduce android.bluetooth package debug messages 
bug 7174712

Change-Id: I8d3fdc8edbe42068b5a550660d7b24854c3c4af4
 2012-10-09 22:10: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
Jeff Sharkey
6ab72d74b8 Make RegisteredServicesCache multi-user aware. 
RegisteredServicesCache is used to track account authenticators and
sync adapters, which can vary based on user.  This change requires
that callers now provide a userId when making cache requests.  It
continues persisting into a single file for now, which is keyed based
on UID.

It now watches for package broadcasts from all users, and scans
packages on-demand.  It changes cache callers to provide a relevant
userId, and evicts cache entries when users are stopped.

Changes SyncManager to only work with accounts from running users,
only kicking off pending syncs once a user is started.

Bug: 7276595, 7316150
Change-Id: I79466a84aa69aa37e4bd9691c5d6221d3662ff29
 2012-10-09 21:39:19 -07:00
Geremy Condra
3f54274006 am c2e3be5a: Merge "DO NOT MERGE Control access to inherited methods of jsinterface objects" into jb-dev 
* commit 'c2e3be5a8bcd3be2d6cb6fda0cda28bc87d7814d':
  DO NOT MERGE Control access to inherited methods of jsinterface objects
 2012-10-09 21:37:23 -07:00
Geremy Condra
dadea723a3 am a22000d2: Merge "DO NOT MERGE remove defunct javascript interface" into jb-dev 
* commit 'a22000d244915df2098619be5fd66bf1c4d019c8':
  DO NOT MERGE remove defunct javascript interface
 2012-10-09 21:34:33 -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
Dianne Hackborn
3c30494d44 am 572286b4: am 31af905a: am 36db9d08: Merge "Further work on issue #7307399: Framework needs a new pre-user-shutdown..." into jb-mr1-dev 
* commit '572286b4152245a73ac00ebc69b4bd8fc4bc586d':
  Further work on issue #7307399: Framework needs a new pre-user-shutdown...
 2012-10-09 19:17:09 -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
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