Michael Jurka
1a6e3e175d
Disable security widgets for now
...
Change-Id: Ia4627d697514c4029fb0fb3250d674ed25495f97
2012-10-11 00:07:38 +02: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
7d20d459a7
am 2737b449: am 2a6f2511: am 33080be2: Merge "Use user-specific PackageManager." into jb-mr1-dev
...
* commit '2737b4492e20a92700f54209de55f8bae2c401f0':
Use user-specific PackageManager.
2012-10-10 14:34:14 -07:00
Jeff Sharkey
2737b4492e
am 2a6f2511: am 33080be2: Merge "Use user-specific PackageManager." into jb-mr1-dev
...
* commit '2a6f25115feeb66f8cf1ea06524a7496cb9c3037':
Use user-specific PackageManager.
2012-10-10 14:32:34 -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
b815878f2c
am 283291b7: am ec994cd7: am 289a3396: Merge "Accessibility enabled by gesture not reflected in settings screen." into jb-mr1-dev
...
* commit '283291b78982604690e4150b5f6cab9a2bbcfc1e':
Accessibility enabled by gesture not reflected in settings screen.
2012-10-10 14:24:23 -07:00
Svetoslav Ganov
283291b789
am ec994cd7: am 289a3396: Merge "Accessibility enabled by gesture not reflected in settings screen." into jb-mr1-dev
...
* commit 'ec994cd777d7102ff6d1e752552ef75515049f89':
Accessibility enabled by gesture not reflected in settings screen.
2012-10-10 14:22:20 -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
The Android Automerger
e55eb8136e
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-10 14:07:00 -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
0bba3a4bd2
am 3686b02a: am 2b383419: am 68dac84c: Merge "Fix padding for PagerTabStrip on large screen devices" into jb-mr1-dev
...
* commit '3686b02afe0953b84692721c1f9cc745d4797f58':
Fix padding for PagerTabStrip on large screen devices
2012-10-10 13:19:17 -07:00
Adam Powell
3686b02afe
am 2b383419: am 68dac84c: Merge "Fix padding for PagerTabStrip on large screen devices" into jb-mr1-dev
...
* commit '2b383419b9da3857347b9656c3fda8e23ef29ee5':
Fix padding for PagerTabStrip on large screen devices
2012-10-10 13:17:00 -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
f3bc6c939f
am 18be472e: am 7f9b5681: am 553074f0: Merge "Return RESULT_OK when wifi connection established" into jb-mr1-dev
...
* commit '18be472ef46d2320a98173a6d68d9d62b60b6ccc':
Return RESULT_OK when wifi connection established
2012-10-10 10:36:58 -07:00
Amith Yamasani
d36e524206
am 86ac45c1: am fee5c228: am 7f2824b9: Merge "Go back to top of list when Settings is relaunched" into jb-mr1-dev
...
* commit '86ac45c13aebcd5b368d7571c6f1fc433d1a71c8':
Go back to top of list when Settings is relaunched
2012-10-10 10:36:57 -07:00
Russell Brenner
18be472ef4
am 7f9b5681: am 553074f0: Merge "Return RESULT_OK when wifi connection established" into jb-mr1-dev
...
* commit '7f9b56818ebf055cf5596dc1b75ca58614952284':
Return RESULT_OK when wifi connection established
2012-10-10 10:34:57 -07:00
Amith Yamasani
86ac45c13a
am fee5c228: am 7f2824b9: Merge "Go back to top of list when Settings is relaunched" into jb-mr1-dev
...
* commit 'fee5c228c752c92c3d0b0e868caec38826d91d0a':
Go back to top of list when Settings is relaunched
2012-10-10 10:34:56 -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
The Android Open Source Project
2ecc837717
am e27230bc: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
* commit 'e27230bcc0f100b8b87a4e98d054716b344678ce':
2012-10-10 09:51:05 -07:00
The Android Open Source Project
e27230bcc0
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
Change-Id: Ife169d168234a820ca8b769bb06fcd01be6c36a9
2012-10-10 09:45:51 -07:00
The Android Automerger
40aa4b6c00
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
2012-10-10 08:58:47 -07:00
The Android Automerger
1fde70549d
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-10 06:59:49 -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
1de6b8b648
am f3153e3b: am 196f1bd0: am a92f380f: Merge "Have poor network avoidance turned off by default" into jb-mr1-dev
...
* commit 'f3153e3b232a0f5af9c91372df1d9ef938e6f25d':
Have poor network avoidance turned off by default
2012-10-09 16:37:14 -07:00
Irfan Sheriff
f3153e3b23
am 196f1bd0: am a92f380f: Merge "Have poor network avoidance turned off by default" into jb-mr1-dev
...
* commit '196f1bd0d03255d25c907390d907f9114e3d4749':
Have poor network avoidance turned off by default
2012-10-09 16:35:52 -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
Russell Brenner
3067fbce2e
Return RESULT_OK when wifi connection established
...
Two new exit points were not setting a return result. Since the
default result for an activity is RESULT_CANCEL, Setup Wizard was
continuing as if no connection was made.
Bug: 7298234
Change-Id: I44085f38ed021b7d417f9794b3341747f00300e9
2012-10-09 16:17:12 -07:00
alanv
f4f1b8002a
Fix accessibility gesture summary text.
...
Bug: 7309663
Change-Id: I669e26d0ffafe73f0fc9296c4ba91c7c08a89ae0
2012-10-09 11:05:45 -07:00
The Android Open Source Project
ddc709cf15
am e0ad4582: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'e0ad4582ba0ff711137674dc35d207f835d62af8':
2012-10-09 07:35:40 -07:00
The Android Open Source Project
e0ad4582ba
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I15288380319ae85b0f1cf03ab6b83913bf2525dd
2012-10-09 07:30:44 -07:00
The Android Automerger
28eee7ea10
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-09 06:59:52 -07:00
Baligh Uddin
ced865f736
am f5f09b9d: (-s ours) am 11e3cdc0: am 2fc94035: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'f5f09b9d8962b032b782e6aacbf54719bef01463':
Import translations. DO NOT MERGE
2012-10-08 22:01:02 -07:00
Baligh Uddin
9d3f5f169b
am 4210c223: (-s ours) am 2d56d320: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '4210c2234d65f536cad91861ad6de66419ccda13':
Import translations. DO NOT MERGE
2012-10-08 21:59:36 -07:00
Baligh Uddin
f5f09b9d89
am 11e3cdc0: am 2fc94035: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '11e3cdc02131e5ac67b50c1868ed1c0fd3a31a29':
Import translations. DO NOT MERGE
2012-10-08 21:59:25 -07:00
Baligh Uddin
4210c2234d
am 2d56d320: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '2d56d3204b0457aecb740e8f7c64908496ac027b':
Import translations. DO NOT MERGE
2012-10-08 21:58:00 -07:00
Baligh Uddin
11e3cdc021
am 2fc94035: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '2fc940351f907e3bea533363bd4a103be65c3855':
Import translations. DO NOT MERGE
2012-10-08 21:57:43 -07:00
Baligh Uddin
d4c0565398
Merge "Import translations. DO NOT MERGE"
2012-10-08 21:57:07 -07:00
Baligh Uddin
2d56d3204b
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-08 21:56:21 -07:00
Baligh Uddin
2fc940351f
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-08 21:56:00 -07:00
Baligh Uddin
5cf8e655f0
Import translations. DO NOT MERGE
...
Change-Id: Ied31eb583a98a19d64eec636404fdcfcbe822db6
Auto-generated-cl: translation import
2012-10-08 19:34:34 -07:00
