OSDN Git Service

android-x86/packages-apps-Settings.git
11 years agoam 2737b449: am 2a6f2511: am 33080be2: Merge "Use user-specific PackageManager."...
Jeff Sharkey [Wed, 10 Oct 2012 21:34:14 +0000 (14:34 -0700)]
am 2737b449: am 2a6f2511: am 33080be2: Merge "Use user-specific PackageManager." into jb-mr1-dev

* commit '2737b4492e20a92700f54209de55f8bae2c401f0':
  Use user-specific PackageManager.

11 years agoam 2a6f2511: am 33080be2: Merge "Use user-specific PackageManager." into jb-mr1-dev
Jeff Sharkey [Wed, 10 Oct 2012 21:32:34 +0000 (14:32 -0700)]
am 2a6f2511: am 33080be2: Merge "Use user-specific PackageManager." into jb-mr1-dev

* commit '2a6f25115feeb66f8cf1ea06524a7496cb9c3037':
  Use user-specific PackageManager.

11 years agoam 33080be2: Merge "Use user-specific PackageManager." into jb-mr1-dev
Jeff Sharkey [Wed, 10 Oct 2012 21:30:30 +0000 (14:30 -0700)]
am 33080be2: Merge "Use user-specific PackageManager." into jb-mr1-dev

* commit '33080be20a58d340f860feed444167edb527d689':
  Use user-specific PackageManager.

11 years agoMerge "Use user-specific PackageManager." into jb-mr1-dev
Jeff Sharkey [Wed, 10 Oct 2012 21:29:08 +0000 (14:29 -0700)]
Merge "Use user-specific PackageManager." into jb-mr1-dev

11 years agoam 283291b7: am ec994cd7: am 289a3396: Merge "Accessibility enabled by gesture not...
Svetoslav Ganov [Wed, 10 Oct 2012 21:24:23 +0000 (14:24 -0700)]
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.

11 years agoam ec994cd7: am 289a3396: Merge "Accessibility enabled by gesture not reflected in...
Svetoslav Ganov [Wed, 10 Oct 2012 21:22:20 +0000 (14:22 -0700)]
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.

11 years agoam 289a3396: Merge "Accessibility enabled by gesture not reflected in settings screen...
Svetoslav Ganov [Wed, 10 Oct 2012 21:20:01 +0000 (14:20 -0700)]
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.

11 years agoMerge "Accessibility enabled by gesture not reflected in settings screen." into jb...
Svetoslav Ganov [Wed, 10 Oct 2012 21:16:49 +0000 (14:16 -0700)]
Merge "Accessibility enabled by gesture not reflected in settings screen." into jb-mr1-dev

11 years agoAccessibility enabled by gesture not reflected in settings screen.
Svetoslav Ganov [Wed, 10 Oct 2012 20:50:36 +0000 (13:50 -0700)]
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

11 years agoam 3686b02a: am 2b383419: am 68dac84c: Merge "Fix padding for PagerTabStrip on large...
Adam Powell [Wed, 10 Oct 2012 20:19:17 +0000 (13:19 -0700)]
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

11 years agoam 2b383419: am 68dac84c: Merge "Fix padding for PagerTabStrip on large screen device...
Adam Powell [Wed, 10 Oct 2012 20:17:00 +0000 (13:17 -0700)]
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

11 years agoam 68dac84c: Merge "Fix padding for PagerTabStrip on large screen devices" into jb...
Adam Powell [Wed, 10 Oct 2012 20:15:09 +0000 (13:15 -0700)]
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

11 years agoMerge "Fix padding for PagerTabStrip on large screen devices" into jb-mr1-dev
Adam Powell [Wed, 10 Oct 2012 20:13:41 +0000 (13:13 -0700)]
Merge "Fix padding for PagerTabStrip on large screen devices" into jb-mr1-dev

11 years agoUse user-specific PackageManager.
Jeff Sharkey [Wed, 10 Oct 2012 18:43:22 +0000 (11:43 -0700)]
Use user-specific PackageManager.

Bug: 7095093
Change-Id: Ia97065d4bdf5203372b76b62a6dfd72858892234

11 years agoFix padding for PagerTabStrip on large screen devices
Adam Powell [Wed, 10 Oct 2012 18:31:34 +0000 (11:31 -0700)]
Fix padding for PagerTabStrip on large screen devices

Bug 7323241

Change-Id: I83cd4d4e1eea150817c519328bb2572b6043b3b7

11 years agoam 18be472e: am 7f9b5681: am 553074f0: Merge "Return RESULT_OK when wifi connection...
Russell Brenner [Wed, 10 Oct 2012 17:36:58 +0000 (10:36 -0700)]
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

11 years agoam 86ac45c1: am fee5c228: am 7f2824b9: Merge "Go back to top of list when Settings...
Amith Yamasani [Wed, 10 Oct 2012 17:36:57 +0000 (10:36 -0700)]
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

11 years agoam 7f9b5681: am 553074f0: Merge "Return RESULT_OK when wifi connection established...
Russell Brenner [Wed, 10 Oct 2012 17:34:57 +0000 (10:34 -0700)]
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

11 years agoam fee5c228: am 7f2824b9: Merge "Go back to top of list when Settings is relaunched...
Amith Yamasani [Wed, 10 Oct 2012 17:34:56 +0000 (10:34 -0700)]
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

11 years agoam 553074f0: Merge "Return RESULT_OK when wifi connection established" into jb-mr1-dev
Russell Brenner [Wed, 10 Oct 2012 17:33:42 +0000 (10:33 -0700)]
am 553074f0: Merge "Return RESULT_OK when wifi connection established" into jb-mr1-dev

* commit '553074f0fc2aa46f44797b72f1457146697645b6':
  Return RESULT_OK when wifi connection established

11 years agoam 7f2824b9: Merge "Go back to top of list when Settings is relaunched" into jb-mr1-dev
Amith Yamasani [Wed, 10 Oct 2012 17:33:41 +0000 (10:33 -0700)]
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

11 years agoMerge "Return RESULT_OK when wifi connection established" into jb-mr1-dev
Russell Brenner [Wed, 10 Oct 2012 17:31:58 +0000 (10:31 -0700)]
Merge "Return RESULT_OK when wifi connection established" into jb-mr1-dev

11 years agoMerge "Go back to top of list when Settings is relaunched" into jb-mr1-dev
Amith Yamasani [Wed, 10 Oct 2012 00:13:33 +0000 (17:13 -0700)]
Merge "Go back to top of list when Settings is relaunched" into jb-mr1-dev

11 years agoam e27230bc: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do...
The Android Open Source Project [Wed, 10 Oct 2012 16:51:05 +0000 (09:51 -0700)]
am e27230bc: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'e27230bcc0f100b8b87a4e98d054716b344678ce':

11 years agoReconcile with jb-mr1-factory-release jb-mr1-release - do not merge
The Android Open Source Project [Wed, 10 Oct 2012 16:45:51 +0000 (09:45 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Ife169d168234a820ca8b769bb06fcd01be6c36a9

11 years agomerge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 10 Oct 2012 15:58:47 +0000 (08:58 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 10 Oct 2012 13:59:49 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoGo back to top of list when Settings is relaunched
Amith Yamasani [Tue, 9 Oct 2012 23:57:25 +0000 (16:57 -0700)]
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

11 years agoam f3153e3b: am 196f1bd0: am a92f380f: Merge "Have poor network avoidance turned...
Irfan Sheriff [Tue, 9 Oct 2012 23:37:14 +0000 (16:37 -0700)]
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

11 years agoam 196f1bd0: am a92f380f: Merge "Have poor network avoidance turned off by default...
Irfan Sheriff [Tue, 9 Oct 2012 23:35:52 +0000 (16:35 -0700)]
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

11 years agoam a92f380f: Merge "Have poor network avoidance turned off by default" into jb-mr1-dev
Irfan Sheriff [Tue, 9 Oct 2012 23:33:51 +0000 (16:33 -0700)]
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

11 years agoMerge "Have poor network avoidance turned off by default" into jb-mr1-dev
Irfan Sheriff [Tue, 9 Oct 2012 23:32:25 +0000 (16:32 -0700)]
Merge "Have poor network avoidance turned off by default" into jb-mr1-dev

11 years agoHave poor network avoidance turned off by default
Irfan Sheriff [Tue, 9 Oct 2012 23:03:38 +0000 (16:03 -0700)]
Have poor network avoidance turned off by default

Bug: 7318044
Change-Id: I1c86ffd2dae168a3eb35f08cd09096a7f28de2a9

11 years agoReturn RESULT_OK when wifi connection established
Russell Brenner [Tue, 9 Oct 2012 22:13:46 +0000 (15:13 -0700)]
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

11 years agoam e0ad4582: (-s ours) Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Tue, 9 Oct 2012 14:35:40 +0000 (07:35 -0700)]
am e0ad4582: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'e0ad4582ba0ff711137674dc35d207f835d62af8':

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Tue, 9 Oct 2012 14:30:44 +0000 (07:30 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: I15288380319ae85b0f1cf03ab6b83913bf2525dd

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 9 Oct 2012 13:59:52 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam f5f09b9d: (-s ours) am 11e3cdc0: am 2fc94035: Merge "Import translations. DO NOT...
Baligh Uddin [Tue, 9 Oct 2012 05:01:02 +0000 (22:01 -0700)]
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

11 years agoam 4210c223: (-s ours) am 2d56d320: Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Tue, 9 Oct 2012 04:59:36 +0000 (21:59 -0700)]
am 4210c223: (-s ours) am 2d56d320: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '4210c2234d65f536cad91861ad6de66419ccda13':
  Import translations. DO NOT MERGE

11 years agoam 11e3cdc0: am 2fc94035: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Tue, 9 Oct 2012 04:59:25 +0000 (21:59 -0700)]
am 11e3cdc0: am 2fc94035: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '11e3cdc02131e5ac67b50c1868ed1c0fd3a31a29':
  Import translations. DO NOT MERGE

11 years agoam 2d56d320: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Tue, 9 Oct 2012 04:58:00 +0000 (21:58 -0700)]
am 2d56d320: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '2d56d3204b0457aecb740e8f7c64908496ac027b':
  Import translations. DO NOT MERGE

11 years agoam 2fc94035: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Tue, 9 Oct 2012 04:57:43 +0000 (21:57 -0700)]
am 2fc94035: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '2fc940351f907e3bea533363bd4a103be65c3855':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 9 Oct 2012 04:57:06 +0000 (21:57 -0700)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Tue, 9 Oct 2012 04:56:21 +0000 (21:56 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Tue, 9 Oct 2012 04:56:00 +0000 (21:56 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 9 Oct 2012 02:34:34 +0000 (19:34 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ied31eb583a98a19d64eec636404fdcfcbe822db6
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 9 Oct 2012 02:29:33 +0000 (19:29 -0700)]
Import translations. DO NOT MERGE

Change-Id: Id0bdf68adcdbafb85d848aacc2ceccc5f619fba3
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 9 Oct 2012 02:26:32 +0000 (19:26 -0700)]
Import translations. DO NOT MERGE

Change-Id: Id639ce95426ed53b9ef62c0c59866cc43faf5c39
Auto-generated-cl: translation import

11 years agoam e002c0f0: am f04ac7ee: am a1e406b5: Merge "Accessibility settings should update...
Svetoslav Ganov [Mon, 8 Oct 2012 23:41:37 +0000 (16:41 -0700)]
am e002c0f0: am f04ac7ee: am a1e406b5: Merge "Accessibility settings should update after gesture to enable accessibility." into jb-mr1-dev

* commit 'e002c0f088e1bbf6f730ecbf79f29f330ceaa345':
  Accessibility settings should update after gesture to enable accessibility.

11 years agoam f04ac7ee: am a1e406b5: Merge "Accessibility settings should update after gesture...
Svetoslav Ganov [Mon, 8 Oct 2012 23:39:52 +0000 (16:39 -0700)]
am f04ac7ee: am a1e406b5: Merge "Accessibility settings should update after gesture to enable accessibility." into jb-mr1-dev

* commit 'f04ac7eed178ebc47fc672774804b72005325642':
  Accessibility settings should update after gesture to enable accessibility.

11 years agoam a1e406b5: Merge "Accessibility settings should update after gesture to enable...
Svetoslav Ganov [Mon, 8 Oct 2012 23:38:00 +0000 (16:38 -0700)]
am a1e406b5: Merge "Accessibility settings should update after gesture to enable accessibility." into jb-mr1-dev

* commit 'a1e406b58ece0ee7fc3bc5f0ee39c81a61216e74':
  Accessibility settings should update after gesture to enable accessibility.

11 years agoMerge "Accessibility settings should update after gesture to enable accessibility...
Svetoslav Ganov [Mon, 8 Oct 2012 23:35:52 +0000 (16:35 -0700)]
Merge "Accessibility settings should update after gesture to enable accessibility." into jb-mr1-dev

11 years agoAccessibility settings should update after gesture to enable accessibility.
Svetoslav Ganov [Mon, 8 Oct 2012 22:54:09 +0000 (15:54 -0700)]
Accessibility settings should update after gesture to enable accessibility.

1. We have added a global gesture to enable accessibility which is long press
   on power follower by a long press with two fingers. If this gesture is
   performed when accessibility settings 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: I45851d7789e24e9e0a5bc5aaac39db9a12b60e0c

11 years agoam 563e4506: am 902ad875: am 86508085: Remove further logging
Vikram Aggarwal [Mon, 8 Oct 2012 20:38:10 +0000 (13:38 -0700)]
am 563e4506: am 902ad875: am 86508085: Remove further logging

* commit '563e45063092ab1e2e722cae60a07a58f32ac4de':
  Remove further logging

11 years agoam 902ad875: am 86508085: Remove further logging
Vikram Aggarwal [Mon, 8 Oct 2012 20:35:18 +0000 (13:35 -0700)]
am 902ad875: am 86508085: Remove further logging

* commit '902ad8759cd22d9e1c90e75aa068a6d5cb9f9532':
  Remove further logging

11 years agoam 86508085: Remove further logging
Vikram Aggarwal [Mon, 8 Oct 2012 20:32:52 +0000 (13:32 -0700)]
am 86508085: Remove further logging

* commit '86508085ea181f2d514569a5cf4fe0633d90b843':
  Remove further logging

11 years agoRemove further logging
Vikram Aggarwal [Mon, 8 Oct 2012 19:57:49 +0000 (12:57 -0700)]
Remove further logging

Bug: 7302014 CryptKeeper logs PII data

Change-Id: Ifb18c428c70e97f28ceeced2fa0aa6e9247a5372

11 years agoam 58f59428: am 837bb033: am 283dce21: Merge "Allow disconnected BT profiles to be...
Jake Hamby [Mon, 8 Oct 2012 19:19:46 +0000 (12:19 -0700)]
am 58f59428: am 837bb033: am 283dce21: Merge "Allow disconnected BT profiles to be unchecked in Settings." into jb-mr1-dev

* commit '58f594284efb98737f5435b8463ab0e28895fe60':
  Allow disconnected BT profiles to be unchecked in Settings.

11 years agoam 837bb033: am 283dce21: Merge "Allow disconnected BT profiles to be unchecked in...
Jake Hamby [Mon, 8 Oct 2012 19:18:10 +0000 (12:18 -0700)]
am 837bb033: am 283dce21: Merge "Allow disconnected BT profiles to be unchecked in Settings." into jb-mr1-dev

* commit '837bb033200ccd988586af7a0b6032ee9d6b9673':
  Allow disconnected BT profiles to be unchecked in Settings.

11 years agoam 283dce21: Merge "Allow disconnected BT profiles to be unchecked in Settings."...
Jake Hamby [Mon, 8 Oct 2012 19:15:46 +0000 (12:15 -0700)]
am 283dce21: Merge "Allow disconnected BT profiles to be unchecked in Settings." into jb-mr1-dev

* commit '283dce21b4902b1d0fa77c26f37f885203647d3a':
  Allow disconnected BT profiles to be unchecked in Settings.

11 years agoMerge "Allow disconnected BT profiles to be unchecked in Settings." into jb-mr1-dev
Jake Hamby [Mon, 8 Oct 2012 19:13:14 +0000 (12:13 -0700)]
Merge "Allow disconnected BT profiles to be unchecked in Settings." into jb-mr1-dev

11 years agoam f36ebae7: am 075dfeaa: am c3ebad20: Remove verbose logging
Vikram Aggarwal [Mon, 8 Oct 2012 17:57:18 +0000 (10:57 -0700)]
am f36ebae7: am 075dfeaa: am c3ebad20: Remove verbose logging

* commit 'f36ebae7a29387452af71730767aba6a00f23094':
  Remove verbose logging

11 years agoam 42466cdd: (-s ours) am e5351aab: am df54b396: Merge "Import translations. DO NOT...
Baligh Uddin [Mon, 8 Oct 2012 17:56:26 +0000 (10:56 -0700)]
am 42466cdd: (-s ours) am e5351aab: am df54b396: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '42466cddc3ec20823669b07693bf1d764b737577':
  Import translations. DO NOT MERGE

11 years agoam cd8234e6: (-s ours) am 36391cc6: Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Mon, 8 Oct 2012 17:56:25 +0000 (10:56 -0700)]
am cd8234e6: (-s ours) am 36391cc6: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit 'cd8234e6065d8dfa6c8a701df07c98a5864b1d30':
  Import translations. DO NOT MERGE

11 years agoam 075dfeaa: am c3ebad20: Remove verbose logging
Vikram Aggarwal [Mon, 8 Oct 2012 17:06:05 +0000 (10:06 -0700)]
am 075dfeaa: am c3ebad20: Remove verbose logging

* commit '075dfeaaac139a20cf24890b3d6e4c395124621e':
  Remove verbose logging

11 years agoam c3ebad20: Remove verbose logging
Vikram Aggarwal [Mon, 8 Oct 2012 17:04:04 +0000 (10:04 -0700)]
am c3ebad20: Remove verbose logging

* commit 'c3ebad20f24299a680caa4ab70e22e9042df405e':
  Remove verbose logging

11 years agoRemove verbose logging
Vikram Aggarwal [Mon, 8 Oct 2012 16:11:06 +0000 (09:11 -0700)]
Remove verbose logging

Bug: 7302014 CryptKeeper logs PII data

Change-Id: I4dec3a827a5b6880b1c0995b8adebf34315c4773

11 years agoam e5351aab: am df54b396: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 8 Oct 2012 14:55:56 +0000 (07:55 -0700)]
am e5351aab: am df54b396: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'e5351aab40c39f44d28bb6bc0213b67ef3adb9d2':
  Import translations. DO NOT MERGE

11 years agoam 36391cc6: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Mon, 8 Oct 2012 14:55:55 +0000 (07:55 -0700)]
am 36391cc6: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '36391cc61a013e6932513c100a2128a668ac4e27':
  Import translations. DO NOT MERGE

11 years agoam df54b396: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 8 Oct 2012 14:55:08 +0000 (07:55 -0700)]
am df54b396: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'df54b396941adb14107ce54a61b78f2a9378ec09':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 8 Oct 2012 14:54:50 +0000 (07:54 -0700)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Mon, 8 Oct 2012 14:54:28 +0000 (07:54 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 8 Oct 2012 14:53:45 +0000 (07:53 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sun, 7 Oct 2012 23:05:35 +0000 (16:05 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 0f136cfd: am 40cbecb8: am 29707a50: Merge "Fix layout for decryption password...
Amith Yamasani [Sun, 7 Oct 2012 21:08:26 +0000 (14:08 -0700)]
am 0f136cfd: am 40cbecb8: am 29707a50: Merge "Fix layout for decryption password entry." into jb-mr1-dev

* commit '0f136cfd4fcb570a94157f4f2044c0e6e7bff74e':
  Fix layout for decryption password entry.

11 years agoam 40cbecb8: am 29707a50: Merge "Fix layout for decryption password entry." into...
Amith Yamasani [Sun, 7 Oct 2012 21:06:03 +0000 (14:06 -0700)]
am 40cbecb8: am 29707a50: Merge "Fix layout for decryption password entry." into jb-mr1-dev

* commit '40cbecb8c3081c778c2a83d80b71981f2f4bb169':
  Fix layout for decryption password entry.

11 years agoam 29707a50: Merge "Fix layout for decryption password entry." into jb-mr1-dev
Amith Yamasani [Sun, 7 Oct 2012 21:04:10 +0000 (14:04 -0700)]
am 29707a50: Merge "Fix layout for decryption password entry." into jb-mr1-dev

* commit '29707a501c6f61108e479a6129e89791dc5a1f36':
  Fix layout for decryption password entry.

11 years agoMerge "Fix layout for decryption password entry." into jb-mr1-dev
Amith Yamasani [Sun, 7 Oct 2012 21:02:25 +0000 (14:02 -0700)]
Merge "Fix layout for decryption password entry." into jb-mr1-dev

11 years agoam 5c9283fb: am 450a7ad6: am 7e54c544: Clean up \'accessibility shortcut\' screen.
Svetoslav Ganov [Sun, 7 Oct 2012 19:07:29 +0000 (12:07 -0700)]
am 5c9283fb: am 450a7ad6: am 7e54c544: Clean up \'accessibility shortcut\' screen.

* commit '5c9283fbf824c6ca50ed6f28cccdd9c1ab0c1db2':
  Clean up 'accessibility shortcut' screen.

11 years agoam 450a7ad6: am 7e54c544: Clean up \'accessibility shortcut\' screen.
Svetoslav Ganov [Sun, 7 Oct 2012 19:05:13 +0000 (12:05 -0700)]
am 450a7ad6: am 7e54c544: Clean up \'accessibility shortcut\' screen.

* commit '450a7ad6a35c25d1307c90e364590b32ea44d2fa':
  Clean up 'accessibility shortcut' screen.

11 years agoam 7e54c544: Clean up \'accessibility shortcut\' screen.
Svetoslav Ganov [Sun, 7 Oct 2012 19:03:45 +0000 (12:03 -0700)]
am 7e54c544: Clean up \'accessibility shortcut\' screen.

* commit '7e54c544aa3b16245486cf3787e79cab5bbdb651':
  Clean up 'accessibility shortcut' screen.

11 years agoClean up 'accessibility shortcut' screen.
Svetoslav Ganov [Sun, 7 Oct 2012 18:48:53 +0000 (11:48 -0700)]
Clean up 'accessibility shortcut' screen.

1. Last polishes to the accessibility shortcut screen.

bug:7298927

Change-Id: I8109f215c63eeaa6ea4bf589aa4af897d09c5e03

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sun, 7 Oct 2012 13:59:55 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoFix layout for decryption password entry.
Amith Yamasani [Sat, 6 Oct 2012 04:13:53 +0000 (21:13 -0700)]
Fix layout for decryption password entry.

Use the same layout for landscape and portrait, which vertically centers
the password entry field. Works fine for portrait.

Also removed some vestigial keyboard view in the layout.

Bug: 7298970
Change-Id: I499468dda5e6eb46815fd0bed786d14c892cc830

11 years agoam 60b4d615: am a1e19608: am 0b146b23: Merge "Revert "Show warning dialog in a multiu...
Amith Yamasani [Sat, 6 Oct 2012 03:58:23 +0000 (20:58 -0700)]
am 60b4d615: am a1e19608: am 0b146b23: Merge "Revert "Show warning dialog in a multiuser system when adding a new account."" into jb-mr1-dev

* commit '60b4d615c619aaf268fd3d1fd101f7524756b3fb':
  Revert "Show warning dialog in a multiuser system when adding a new account."

11 years agoam a1e19608: am 0b146b23: Merge "Revert "Show warning dialog in a multiuser system...
Amith Yamasani [Sat, 6 Oct 2012 03:56:13 +0000 (20:56 -0700)]
am a1e19608: am 0b146b23: Merge "Revert "Show warning dialog in a multiuser system when adding a new account."" into jb-mr1-dev

* commit 'a1e1960890f05e2e4afd9ad3bf2f68636100152e':
  Revert "Show warning dialog in a multiuser system when adding a new account."

11 years agoam 0b146b23: Merge "Revert "Show warning dialog in a multiuser system when adding...
Amith Yamasani [Sat, 6 Oct 2012 03:54:35 +0000 (20:54 -0700)]
am 0b146b23: Merge "Revert "Show warning dialog in a multiuser system when adding a new account."" into jb-mr1-dev

* commit '0b146b238496fdb36ad575f9a0b96dc43f812aa3':
  Revert "Show warning dialog in a multiuser system when adding a new account."

11 years agoMerge "Revert "Show warning dialog in a multiuser system when adding a new account...
Amith Yamasani [Sat, 6 Oct 2012 03:53:02 +0000 (20:53 -0700)]
Merge "Revert "Show warning dialog in a multiuser system when adding a new account."" into jb-mr1-dev

11 years agoRevert "Show warning dialog in a multiuser system when adding a new account."
Amith Yamasani [Tue, 2 Oct 2012 22:16:21 +0000 (15:16 -0700)]
Revert "Show warning dialog in a multiuser system when adding a new account."

This reverts commit eb71f2689785bd43560afb04f8b2281c3f67f695

Change-Id: Iad4a6656e922c0d2dbd3dd349d1c24d597eab7f5

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 5 Oct 2012 23:31:58 +0000 (16:31 -0700)]
Import translations. DO NOT MERGE

Change-Id: Idde76e1ee183e5d2acadc98d6e100b4d85032313
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 5 Oct 2012 23:29:40 +0000 (16:29 -0700)]
Import translations. DO NOT MERGE

Change-Id: I370e6491b374c4c828b128955eefce762335fa52
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 5 Oct 2012 23:27:44 +0000 (16:27 -0700)]
Import translations. DO NOT MERGE

Change-Id: I6c6a598c03f12d3ac9e9a3cc08d479d7b8f1f274
Auto-generated-cl: translation import

11 years agoam e7be6192: am 517f5ced: am 1f9a07b5: Merge "Fixing filter for status widget (issue...
Adam Cohen [Fri, 5 Oct 2012 21:21:18 +0000 (14:21 -0700)]
am e7be6192: am 517f5ced: am 1f9a07b5: Merge "Fixing filter for status widget (issue 7295596)" into jb-mr1-dev

* commit 'e7be6192ed7337d81a77ad1da11dba2c578929c7':
  Fixing filter for status widget (issue 7295596)

11 years agoam 2c72ba6d: am 3b1520ee: am 78995994: Updating the screen magnification strings.
Svetoslav Ganov [Fri, 5 Oct 2012 21:21:17 +0000 (14:21 -0700)]
am 2c72ba6d: am 3b1520ee: am 78995994: Updating the screen magnification strings.

* commit '2c72ba6de2e2dbce1278ef67db0e65439c9c1577':
  Updating the screen magnification strings.

11 years agoam 517f5ced: am 1f9a07b5: Merge "Fixing filter for status widget (issue 7295596)...
Adam Cohen [Fri, 5 Oct 2012 21:20:14 +0000 (14:20 -0700)]
am 517f5ced: am 1f9a07b5: Merge "Fixing filter for status widget (issue 7295596)" into jb-mr1-dev

* commit '517f5cede9c61c981e0759798664914201b5d0e2':
  Fixing filter for status widget (issue 7295596)

11 years agoam 3b1520ee: am 78995994: Updating the screen magnification strings.
Svetoslav Ganov [Fri, 5 Oct 2012 21:18:51 +0000 (14:18 -0700)]
am 3b1520ee: am 78995994: Updating the screen magnification strings.

* commit '3b1520eed7566e03244e6fc1aa307c2155bd6e69':
  Updating the screen magnification strings.

11 years agoam 1f9a07b5: Merge "Fixing filter for status widget (issue 7295596)" into jb-mr1-dev
Adam Cohen [Fri, 5 Oct 2012 21:18:24 +0000 (14:18 -0700)]
am 1f9a07b5: Merge "Fixing filter for status widget (issue 7295596)" into jb-mr1-dev

* commit '1f9a07b5e9b1868fc6741c99e74970aa0e9762fe':
  Fixing filter for status widget (issue 7295596)

11 years agoam 78995994: Updating the screen magnification strings.
Svetoslav Ganov [Fri, 5 Oct 2012 21:16:58 +0000 (14:16 -0700)]
am 78995994: Updating the screen magnification strings.

* commit '78995994b9b0afbc4c4705e41d1c4ac944e557f2':
  Updating the screen magnification strings.

11 years agoMerge "Fixing filter for status widget (issue 7295596)" into jb-mr1-dev
Adam Cohen [Fri, 5 Oct 2012 21:16:42 +0000 (14:16 -0700)]
Merge "Fixing filter for status widget (issue 7295596)" into jb-mr1-dev

11 years agoUpdating the screen magnification strings.
Svetoslav Ganov [Fri, 5 Oct 2012 21:02:36 +0000 (14:02 -0700)]
Updating the screen magnification strings.

bug:7295457

Change-Id: Idef3950b975fbb8071067c165fa52358aa6b828d