Baligh Uddin
ae34ca32e2
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-12 09:16:27 -07:00
Baligh Uddin
016579ed0b
am acc0e56e
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'acc0e56ea768f13ffa0e6303c658a9a2fb142d14':
Import translations. DO NOT MERGE
2012-10-12 09:15:00 -07:00
Baligh Uddin
acc0e56ea7
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-12 09:14:11 -07:00
Baligh Uddin
b07c809caf
Import translations. DO NOT MERGE
...
Change-Id: Iab3d6f1b9911ed3b1ef2472e083a3f55faa4a474
Auto-generated-cl: translation import
2012-10-11 20:22:24 -07:00
Baligh Uddin
d66c16c2ab
Import translations. DO NOT MERGE
...
Change-Id: Ib9c7e11980c3a96767486303dd786f031c6d9b37
Auto-generated-cl: translation import
2012-10-11 20:20:41 -07:00
Amith Yamasani
85cd2c5625
am 9b8055b3
: Merge "Fix a regression in exiting the activity on picking a locale" into jb-mr1-dev
...
* commit '9b8055b337c5b3efe80d87d318bf0d1df67ecf14':
Fix a regression in exiting the activity on picking a locale
2012-10-11 18:27:53 -07:00
Amith Yamasani
9b8055b337
Merge "Fix a regression in exiting the activity on picking a locale" into jb-mr1-dev
2012-10-11 18:25:41 -07:00
Amith Yamasani
552bebe04f
am 35bbbc6c
: Merge "Launch account addition activity from Settings instead of from AccountManager" into jb-mr1-dev
...
* commit '35bbbc6ca40c93c4174f426be295ea912aad82e0':
Launch account addition activity from Settings instead of from AccountManager
2012-10-11 11:54:44 -07:00
Amith Yamasani
35bbbc6ca4
Merge "Launch account addition activity from Settings instead of from AccountManager" into jb-mr1-dev
2012-10-11 11:51:35 -07:00
Dianne Hackborn
4d35affe1b
am 85badb09
: Merge "Fix issue #7328934 : change threshold of developer options countdown toast" into jb-mr1-dev
...
* commit '85badb09a5489d29ea5c916f38c2c09288d9ba56':
Fix issue #7328934 : change threshold of developer options countdown toast
2012-10-11 11:26:55 -07:00
Dianne Hackborn
85badb09a5
Merge "Fix issue #7328934 : change threshold of developer options countdown toast" into jb-mr1-dev
2012-10-11 11:25:29 -07:00
Dianne Hackborn
d6a24d505a
Fix issue #7328934 : change threshold of developer options countdown toast
...
Delay showing toasts until the third tap. Also harden the dev
settings code that pokes system property changes to not crash
if a system service throws an exception back.
Change-Id: I1351e2c950f2bcc4fc72afb60995fd7f84319e3d
2012-10-11 11:07:05 -07:00
Charles Chen
e66bfff464
am ac15b48b
: Merge "Fix accessibility gesture summary text." into jb-mr1-dev
...
* commit 'ac15b48b2b18a3096fa596fdc6f9308047f3e694':
Fix accessibility gesture summary text.
2012-10-11 10:28:54 -07:00
Charles Chen
ac15b48b2b
Merge "Fix accessibility gesture summary text." into jb-mr1-dev
2012-10-11 10:27:06 -07:00
Amith Yamasani
01f7688555
am 4465bbb7
: Merge "Fix crash in Settings for secondary users" into jb-mr1-dev
...
* commit '4465bbb7e14020e10620cda70fc51896b57ced67':
Fix crash in Settings for secondary users
2012-10-10 22:28:19 -07:00
Amith Yamasani
4465bbb7e1
Merge "Fix crash in Settings for secondary users" into jb-mr1-dev
2012-10-10 22:27:04 -07:00
Baligh Uddin
55dba5ea08
am 73d49b3b
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '73d49b3bd996f38115ea47a51d54241aee55e9de':
Import translations. DO NOT MERGE
2012-10-10 21:49:07 -07:00
Baligh Uddin
73d49b3bd9
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-10 21:47:57 -07:00
Baligh Uddin
69d8b40c9d
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-10 21:47:05 -07:00
Amith Yamasani
b99f864d3f
Fix crash in Settings for secondary users
...
Bug: 7328485
Change-Id: If766d1f28f48fb1853ea64c2b2a9294df9bcf22b
2012-10-10 21:44:15 -07:00
Amith Yamasani
53b14f57c3
Fix a regression in exiting the activity on picking a locale
...
Bug: 7326748
Change-Id: I5db57c805c104bf01c256f65990aec6deae27789
2012-10-10 19:45:15 -07:00
Jeff Sharkey
f4e7417e69
am 84b90d53
: Merge "Switch to IPackageManager.getServiceInfo()." into jb-mr1-dev
...
* commit '84b90d533275be792954efc37e14f0c8fd409681':
Switch to IPackageManager.getServiceInfo().
2012-10-10 17:01:49 -07:00
Jeff Sharkey
84b90d5332
Merge "Switch to IPackageManager.getServiceInfo()." into jb-mr1-dev
2012-10-10 16:59:48 -07:00
Amith Yamasani
cbabf19cbb
Launch account addition activity from Settings instead of from AccountManager
...
This enables us to watch for failure cases from certain authenticators that
misbehave.
Bug: 7318390
Change-Id: I43398e7622214cabd1d1bf171502c6a988af00a3
2012-10-10 16:42:20 -07:00
Jeff Sharkey
631c0bde10
am 2264a643
: Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev
...
* commit '2264a64331b39b0770b72a71a453601cc1b9b9ac':
Move lockscreen to using haptic feedback setting.
2012-10-10 16:29:36 -07:00
Jeff Sharkey
2264a64331
Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev
2012-10-10 16:27:27 -07:00
Jeff Sharkey
0e092f4eb0
Switch to IPackageManager.getServiceInfo().
...
Bug: 7095093
Change-Id: I79b9f077c9d69c5629b7dd0071a11ccda50839cd
2012-10-10 16:20:46 -07:00
Dianne Hackborn
a2638d3e0e
am af0cea0a
: Merge "Fix issue #7318666 : hide developer options from user build" into jb-mr1-dev
...
* commit 'af0cea0a2148f8915a57c50a571636911feed9d3':
Fix issue #7318666 : hide developer options from user build
2012-10-10 15:55:22 -07:00
Dianne Hackborn
af0cea0a21
Merge "Fix issue #7318666 : hide developer options from user build" into jb-mr1-dev
2012-10-10 15:53:57 -07:00
Jeff Sharkey
e656031ff8
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: Id6931903b3ebeca6aeacef9b127490a381cd40b4
2012-10-10 15:38:58 -07:00
Baligh Uddin
2625b9c106
Import translations. DO NOT MERGE
...
Change-Id: I9dbc7f4fa1f07b43c24be35b63f5dafe24876a61
Auto-generated-cl: translation import
2012-10-10 15:28:23 -07:00
Baligh Uddin
1e42f2a2e9
Import translations. DO NOT MERGE
...
Change-Id: I3f206ba064e3ec18bc583ca62acc69324d16bf71
Auto-generated-cl: translation import
2012-10-10 15:26:51 -07:00
Dianne Hackborn
caefa9b5f0
Fix issue #7318666 : hide developer options from user build
...
Change-Id: I4c5a66bd5f4d3fc36d439228a7a276d694291606
2012-10-10 15:05:42 -07:00
Jeff Sharkey
2a6f25115f
am 33080be2
: Merge "Use user-specific PackageManager." into jb-mr1-dev
...
* commit '33080be20a58d340f860feed444167edb527d689':
Use user-specific PackageManager.
2012-10-10 14:30:30 -07:00
Jeff Sharkey
33080be20a
Merge "Use user-specific PackageManager." into jb-mr1-dev
2012-10-10 14:29:08 -07:00
Svetoslav Ganov
ec994cd777
am 289a3396
: Merge "Accessibility enabled by gesture not reflected in settings screen." into jb-mr1-dev
...
* commit '289a3396291f05d8ffb6adeabbf935d9e75203b1':
Accessibility enabled by gesture not reflected in settings screen.
2012-10-10 14:20:01 -07:00
Svetoslav Ganov
289a339629
Merge "Accessibility enabled by gesture not reflected in settings screen." into jb-mr1-dev
2012-10-10 14:16:50 -07:00
Svetoslav Ganov
849d64bc1d
Accessibility enabled by gesture not reflected in settings screen.
...
1. We have added a global gesture to enable accessibility which is long press
on power followed by a long press with two fingers. If this gesture is
performed when the settings for an accessibility service are on the screen,
accessibility and the screen-reader are enabled while the UI does not reflect
that and the user may try to enable the already enabled screen-reader which
will show two irrelevant warning dialogs - one for enabling the screen-reader
and one for enabling explore by touch (assuming the screen-reader requests it).
This change adds a simple content observer for the relevant accessibility
settings which upon a change calls the functions to refresh the settings UI.
bug:7309127
Change-Id: I214c64877086eeb1fe156bcc195aa4e2931d6bdb
2012-10-10 13:50:40 -07:00
Adam Powell
2b383419b9
am 68dac84c
: Merge "Fix padding for PagerTabStrip on large screen devices" into jb-mr1-dev
...
* commit '68dac84c4133b91db87642743f30657604a4fb77':
Fix padding for PagerTabStrip on large screen devices
2012-10-10 13:15:09 -07:00
Adam Powell
68dac84c41
Merge "Fix padding for PagerTabStrip on large screen devices" into jb-mr1-dev
2012-10-10 13:13:42 -07:00
Jeff Sharkey
7cb4780870
Use user-specific PackageManager.
...
Bug: 7095093
Change-Id: Ia97065d4bdf5203372b76b62a6dfd72858892234
2012-10-10 13:10:23 -07:00
Adam Powell
c5e436c18f
Fix padding for PagerTabStrip on large screen devices
...
Bug 7323241
Change-Id: I83cd4d4e1eea150817c519328bb2572b6043b3b7
2012-10-10 12:52:10 -07:00
Russell Brenner
7f9b56818e
am 553074f0
: Merge "Return RESULT_OK when wifi connection established" into jb-mr1-dev
...
* commit '553074f0fc2aa46f44797b72f1457146697645b6':
Return RESULT_OK when wifi connection established
2012-10-10 10:33:42 -07:00
Amith Yamasani
fee5c228c7
am 7f2824b9
: Merge "Go back to top of list when Settings is relaunched" into jb-mr1-dev
...
* commit '7f2824b924775e78192fb12c342b38558cf304b5':
Go back to top of list when Settings is relaunched
2012-10-10 10:33:41 -07:00
Russell Brenner
553074f0fc
Merge "Return RESULT_OK when wifi connection established" into jb-mr1-dev
2012-10-10 10:31:59 -07:00
Amith Yamasani
7f2824b924
Merge "Go back to top of list when Settings is relaunched" into jb-mr1-dev
2012-10-10 10:31:59 -07:00
Amith Yamasani
ef6172304b
Go back to top of list when Settings is relaunched
...
Also fixes slight movements when coming back from Add account.
Bug: 7312513
Bug: 7318452
Change-Id: I5b07262de52e6bdf98e75fff98a032afd74fc0e5
2012-10-09 16:57:25 -07:00
Irfan Sheriff
196f1bd0d0
am a92f380f
: Merge "Have poor network avoidance turned off by default" into jb-mr1-dev
...
* commit 'a92f380f866be566d2f47ffa14ade81e6551ca56':
Have poor network avoidance turned off by default
2012-10-09 16:33:51 -07:00
Irfan Sheriff
a92f380f86
Merge "Have poor network avoidance turned off by default" into jb-mr1-dev
2012-10-09 16:32:25 -07:00
Irfan Sheriff
ba50175b1c
Have poor network avoidance turned off by default
...
Bug: 7318044
Change-Id: I1c86ffd2dae168a3eb35f08cd09096a7f28de2a9
2012-10-09 16:18:36 -07:00