Amith Yamasani
4e69679c5b
am c97332cb: am 31cee479: Merge "Fix a runtime restart when cycling between 4 users" into jb-mr1-dev
...
* commit 'c97332cb8751356d2fa5ecf8a92cea73d277cadc':
Fix a runtime restart when cycling between 4 users
2012-10-10 22:43:42 -07:00
Amith Yamasani
c97332cb87
am 31cee479: Merge "Fix a runtime restart when cycling between 4 users" into jb-mr1-dev
...
* commit '31cee479fc43fc422b481f6360fa499a7b4fc70a':
Fix a runtime restart when cycling between 4 users
2012-10-10 22:40:01 -07:00
Amith Yamasani
9535c915b6
Fix a runtime restart when cycling between 4 users
...
Some refactoring in Sync Manager caused mUserManager to be initialized too late.
Make sure this is initialized in the constructor now.
Bug: 7328386
Change-Id: Ic67915e172c3b8ef368852147667287e38c0213b
2012-10-10 21:48:33 -07:00
Fabrice Di Meglio
ce6e952cd2
am 91622961: am f6215e55: Fix the build
...
* commit '91622961171c5710a36a4123e2c8f406b026f51a':
Fix the build
2012-10-10 18:29:44 -07:00
Fabrice Di Meglio
9162296117
am f6215e55: Fix the build
...
* commit 'f6215e55df1ab4f6cda33dd081c0a91062a1be63':
Fix the build
2012-10-10 18:28:02 -07:00
Fabrice Di Meglio
f6215e55df
Fix the build
...
Change-Id: I9c79677ee4f68d6fc82b754d08e701229725c2a6
2012-10-10 18:23:00 -07:00
Fabrice Di Meglio
f4a1dad63d
am 5b04d032: am b8021a88: Merge "Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)" into jb-mr1-dev
...
* commit '5b04d0320b877693fe10f70773657585c1c4aa58':
Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)
2012-10-10 17:32:47 -07:00
Fabrice Di Meglio
5b04d0320b
am b8021a88: Merge "Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)" into jb-mr1-dev
...
* commit 'b8021a88e5c00ebd985a348b56af29c95a178a90':
Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)
2012-10-10 17:29:52 -07:00
Svetoslav Ganov
c41609408b
am e34b3243: am 02f0daa5: Merge "Fix WebView accessibility scripts." into jb-mr1-dev
...
* commit 'e34b32430ab8885951dbedc0a2c339da654c989c':
Fix WebView accessibility scripts.
2012-10-10 17:29:25 -07:00
Fabrice Di Meglio
b8021a88e5
Merge "Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)" into jb-mr1-dev
2012-10-10 17:26:41 -07:00
Svetoslav Ganov
e34b32430a
am 02f0daa5: Merge "Fix WebView accessibility scripts." into jb-mr1-dev
...
* commit '02f0daa580a3d97f64e126198e42c3247ee37517':
Fix WebView accessibility scripts.
2012-10-10 17:26:17 -07:00
Svetoslav Ganov
02f0daa580
Merge "Fix WebView accessibility scripts." into jb-mr1-dev
2012-10-10 17:23:48 -07:00
alanv
df313699ba
Fix WebView accessibility scripts.
...
Ensures A11y APIs are added to WebView before page loads. Prevents calls
to TTS before init and after shutdown. Ensures calls to TTS are thread-
safe. Activates and deactivates feedback from AndroidVox when view is
attached and detached. Adds a flag for logging debug output, as well as
a lot of debug output.
Bug: 7326781
Change-Id: I5d4ab7f9fb1669f98ef05ae207e897565d3086c9
2012-10-10 17:09:11 -07:00
Fabrice Di Meglio
2918ab6c32
Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)
...
- rename to LayoutParams.resolveLayoutDirection(int)
- upate 17.txt too
Change-Id: I54fe28dc47cfdb65ef0b5b0244dabbe1d675c781
2012-10-10 16:47:51 -07:00
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
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
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
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
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
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
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
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
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
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
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