OSDN Git Service

android-x86/packages-apps-Settings.git
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 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 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 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

11 years agoam f49a4702: am dd51496c: am 4a58b100: Merge "Avoid NPE when missing PackageInfo...
Jeff Sharkey [Fri, 5 Oct 2012 20:59:08 +0000 (13:59 -0700)]
am f49a4702: am dd51496c: am 4a58b100: Merge "Avoid NPE when missing PackageInfo." into jb-mr1-dev

* commit 'f49a470253c8310b024b6121b782e70b2f5f935a':
  Avoid NPE when missing PackageInfo.

11 years agoam dd51496c: am 4a58b100: Merge "Avoid NPE when missing PackageInfo." into jb-mr1-dev
Jeff Sharkey [Fri, 5 Oct 2012 20:57:22 +0000 (13:57 -0700)]
am dd51496c: am 4a58b100: Merge "Avoid NPE when missing PackageInfo." into jb-mr1-dev

* commit 'dd51496cf3c1b1e5e24652a669c3889e1c31720d':
  Avoid NPE when missing PackageInfo.

11 years agoam 4a58b100: Merge "Avoid NPE when missing PackageInfo." into jb-mr1-dev
Jeff Sharkey [Fri, 5 Oct 2012 20:55:36 +0000 (13:55 -0700)]
am 4a58b100: Merge "Avoid NPE when missing PackageInfo." into jb-mr1-dev

* commit '4a58b1006cec93565a7106c117b2c87248341404':
  Avoid NPE when missing PackageInfo.

11 years agoMerge "Avoid NPE when missing PackageInfo." into jb-mr1-dev
Jeff Sharkey [Fri, 5 Oct 2012 20:53:39 +0000 (13:53 -0700)]
Merge "Avoid NPE when missing PackageInfo." into jb-mr1-dev

11 years agoam eb8c57d9: am 3c95a3b9: am 69621ece: Locale selection settings do not hide warning...
Svetoslav Ganov [Fri, 5 Oct 2012 20:52:37 +0000 (13:52 -0700)]
am eb8c57d9: am 3c95a3b9: am 69621ece: Locale selection settings do not hide warning dialog.

* commit 'eb8c57d909d1498639d32e82bdda52393ed761ee':
  Locale selection settings do not hide warning dialog.

11 years agoam 3c95a3b9: am 69621ece: Locale selection settings do not hide warning dialog.
Svetoslav Ganov [Fri, 5 Oct 2012 20:49:53 +0000 (13:49 -0700)]
am 3c95a3b9: am 69621ece: Locale selection settings do not hide warning dialog.

* commit '3c95a3b947cc251bb5379b026e465d9541df6345':
  Locale selection settings do not hide warning dialog.

11 years agoam 69621ece: Locale selection settings do not hide warning dialog.
Svetoslav Ganov [Fri, 5 Oct 2012 20:48:08 +0000 (13:48 -0700)]
am 69621ece: Locale selection settings do not hide warning dialog.

* commit '69621ece97d9f82e7408562f28110f40d872cb24':
  Locale selection settings do not hide warning dialog.

11 years agoFixing filter for status widget (issue 7295596)
Adam Cohen [Fri, 5 Oct 2012 20:42:04 +0000 (13:42 -0700)]
Fixing filter for status widget (issue 7295596)

Change-Id: I63515bc68550357b8e2738450eefa01ec3122229

11 years agoAvoid NPE when missing PackageInfo.
Jeff Sharkey [Fri, 5 Oct 2012 20:34:41 +0000 (13:34 -0700)]
Avoid NPE when missing PackageInfo.

Bug: 7296861
Change-Id: I87b64d5f4b1f34e47d785a18a029130fdca874a1

11 years agoLocale selection settings do not hide warning dialog.
Svetoslav Ganov [Fri, 5 Oct 2012 19:39:29 +0000 (12:39 -0700)]
Locale selection settings do not hide warning dialog.

1. If there is more than one user on the device and a user tries
   to modify the locale which is shared across all users we are
   showing a warning dialog. When the user selects OK we are
   changing the locale and going to the previous screen. This is
   achieved by removing the locale selection fragment from the
   backstack. The problem was that the dialog was not dismissed
   upon OK in the dialog which resulted in saving the dialog's
   state and an attempt to restore it on the wrong fragment which
   has no idea about this dialog, this returning a null dialog
   resulting in a crash. This change removes the dialog on
   OK selection.

bug:7265186

Change-Id: I336ab54f5281c7a9ae24f1c25769daac46477ebd

11 years agoam 3ddc5049: (-s ours) Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Fri, 5 Oct 2012 15:20:53 +0000 (08:20 -0700)]
am 3ddc5049: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '3ddc5049fccffa0fee9670d2833318ff35121c8d':

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Fri, 5 Oct 2012 15:18:21 +0000 (08:18 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: Id2efe6503779bfb18d403b49dfaac9ad9f392bc3

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Fri, 5 Oct 2012 14:00:19 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 62a725f9: (-s ours) am babf1a43: am 9d904890: Merge "Import translations. DO NOT...
Baligh Uddin [Fri, 5 Oct 2012 05:26:07 +0000 (22:26 -0700)]
am 62a725f9: (-s ours) am babf1a43: am 9d904890: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '62a725f9c3f01e846b5f27d851349d92f6af2d5f':
  Import translations. DO NOT MERGE

11 years agoam babf1a43: am 9d904890: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Fri, 5 Oct 2012 05:23:48 +0000 (22:23 -0700)]
am babf1a43: am 9d904890: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

11 years agoam e8d64472: (-s ours) am 3d72d169: Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Fri, 5 Oct 2012 05:22:59 +0000 (22:22 -0700)]
am e8d64472: (-s ours) am 3d72d169: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

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

11 years agoam 9d904890: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Fri, 5 Oct 2012 05:21:01 +0000 (22:21 -0700)]
am 9d904890: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '9d90489078b406d3a52e27ef517278e15f603f76':
  Import translations. DO NOT MERGE

11 years agoam 3d72d169: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Fri, 5 Oct 2012 05:20:53 +0000 (22:20 -0700)]
am 3d72d169: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '3d72d169568665b7aa08342c9392fe7f2326cfa8':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 5 Oct 2012 05:19:35 +0000 (22:19 -0700)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Fri, 5 Oct 2012 05:19:15 +0000 (22:19 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Fri, 5 Oct 2012 05:18:41 +0000 (22:18 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

11 years agoam 16fd6059: am 42171a2c: am 6fd359d8: Merge "Move the position of widget choosers...
Amith Yamasani [Fri, 5 Oct 2012 05:02:36 +0000 (22:02 -0700)]
am 16fd6059: am 42171a2c: am 6fd359d8: Merge "Move the position of widget choosers to below lockscreen settings in Security" into jb-mr1-dev

* commit '16fd6059eeed4f9d1b7e4fac3b5a0fe9686d2229':
  Move the position of widget choosers to below lockscreen settings in Security

11 years agoam 42171a2c: am 6fd359d8: Merge "Move the position of widget choosers to below locksc...
Amith Yamasani [Fri, 5 Oct 2012 05:00:25 +0000 (22:00 -0700)]
am 42171a2c: am 6fd359d8: Merge "Move the position of widget choosers to below lockscreen settings in Security" into jb-mr1-dev

* commit '42171a2cc68da0f45b7828eb766a9c73e173e6b2':
  Move the position of widget choosers to below lockscreen settings in Security

11 years agoam 6fd359d8: Merge "Move the position of widget choosers to below lockscreen settings...
Amith Yamasani [Fri, 5 Oct 2012 04:58:07 +0000 (21:58 -0700)]
am 6fd359d8: Merge "Move the position of widget choosers to below lockscreen settings in Security" into jb-mr1-dev

* commit '6fd359d8f66e9a2fea45251e52b7a6b07561705b':
  Move the position of widget choosers to below lockscreen settings in Security

11 years agoMerge "Move the position of widget choosers to below lockscreen settings in Security...
Amith Yamasani [Fri, 5 Oct 2012 04:56:04 +0000 (21:56 -0700)]
Merge "Move the position of widget choosers to below lockscreen settings in Security" into jb-mr1-dev

11 years agoam 464a0078: am fdab8bd9: am 992e0b85: Merge "Announce dynamic content changes in...
Charles Chen [Fri, 5 Oct 2012 03:34:16 +0000 (20:34 -0700)]
am 464a0078: am fdab8bd9: am 992e0b85: Merge "Announce dynamic content changes in lock confirmation settings." into jb-mr1-dev

* commit '464a0078b1f72a3a069f80b4aeca4644eef02eaa':
  Announce dynamic content changes in lock confirmation settings.

11 years agoam fdab8bd9: am 992e0b85: Merge "Announce dynamic content changes in lock confirmatio...
Charles Chen [Fri, 5 Oct 2012 01:35:47 +0000 (18:35 -0700)]
am fdab8bd9: am 992e0b85: Merge "Announce dynamic content changes in lock confirmation settings." into jb-mr1-dev

* commit 'fdab8bd9dabe3cb70453a58af68d5f2ce23b44c4':
  Announce dynamic content changes in lock confirmation settings.

11 years agoam 992e0b85: Merge "Announce dynamic content changes in lock confirmation settings...
Charles Chen [Fri, 5 Oct 2012 01:33:43 +0000 (18:33 -0700)]
am 992e0b85: Merge "Announce dynamic content changes in lock confirmation settings." into jb-mr1-dev

* commit '992e0b8537e4fa2f6f6941f7e21d142c40499e7a':
  Announce dynamic content changes in lock confirmation settings.

11 years agoMerge "Announce dynamic content changes in lock confirmation settings." into jb-mr1-dev
Charles Chen [Fri, 5 Oct 2012 01:32:29 +0000 (18:32 -0700)]
Merge "Announce dynamic content changes in lock confirmation settings." into jb-mr1-dev

11 years agoam 7b1d707f: am 8416f453: am 2c41f7be: Merge "Fix issue #7226978: Still in app detail...
Dianne Hackborn [Fri, 5 Oct 2012 00:26:02 +0000 (17:26 -0700)]
am 7b1d707f: am 8416f453: am 2c41f7be: Merge "Fix issue #7226978: Still in app detail screen after uninstall" into jb-mr1-dev

* commit '7b1d707f9706acc2500b13df7961c8db6338e24a':
  Fix issue #7226978: Still in app detail screen after uninstall

11 years agoam 8416f453: am 2c41f7be: Merge "Fix issue #7226978: Still in app detail screen after...
Dianne Hackborn [Fri, 5 Oct 2012 00:24:34 +0000 (17:24 -0700)]
am 8416f453: am 2c41f7be: Merge "Fix issue #7226978: Still in app detail screen after uninstall" into jb-mr1-dev

* commit '8416f45384b5c0ebd24aca0913793820dcc3def4':
  Fix issue #7226978: Still in app detail screen after uninstall

11 years agoam 2c41f7be: Merge "Fix issue #7226978: Still in app detail screen after uninstall...
Dianne Hackborn [Fri, 5 Oct 2012 00:22:32 +0000 (17:22 -0700)]
am 2c41f7be: Merge "Fix issue #7226978: Still in app detail screen after uninstall" into jb-mr1-dev

* commit '2c41f7be44715483de4d3e9c8a91488c4f723e90':
  Fix issue #7226978: Still in app detail screen after uninstall

11 years agoMerge "Fix issue #7226978: Still in app detail screen after uninstall" into jb-mr1-dev
Dianne Hackborn [Fri, 5 Oct 2012 00:20:44 +0000 (17:20 -0700)]
Merge "Fix issue #7226978: Still in app detail screen after uninstall" into jb-mr1-dev

11 years agoam a5b6ba8a: am ef62a198: am 113e4b6a: Merge "Refresh authenticator info when account...
Jeff Sharkey [Thu, 4 Oct 2012 23:47:14 +0000 (16:47 -0700)]
am a5b6ba8a: am ef62a198: am 113e4b6a: Merge "Refresh authenticator info when accounts change." into jb-mr1-dev

* commit 'a5b6ba8afb7a81ca975d58c61fc152e11a34871f':
  Refresh authenticator info when accounts change.

11 years agoam ef62a198: am 113e4b6a: Merge "Refresh authenticator info when accounts change...
Jeff Sharkey [Thu, 4 Oct 2012 23:44:42 +0000 (16:44 -0700)]
am ef62a198: am 113e4b6a: Merge "Refresh authenticator info when accounts change." into jb-mr1-dev

* commit 'ef62a19855cbfac35ba1c4b1a14caa75e271b512':
  Refresh authenticator info when accounts change.

11 years agoam 113e4b6a: Merge "Refresh authenticator info when accounts change." into jb-mr1-dev
Jeff Sharkey [Thu, 4 Oct 2012 23:42:27 +0000 (16:42 -0700)]
am 113e4b6a: Merge "Refresh authenticator info when accounts change." into jb-mr1-dev

* commit '113e4b6aa1dfbc49abdf6366909ceb4a6923d114':
  Refresh authenticator info when accounts change.

11 years agoMerge "Refresh authenticator info when accounts change." into jb-mr1-dev
Jeff Sharkey [Thu, 4 Oct 2012 23:40:25 +0000 (16:40 -0700)]
Merge "Refresh authenticator info when accounts change." into jb-mr1-dev

11 years agoMove the position of widget choosers to below lockscreen settings in Security
Amith Yamasani [Thu, 4 Oct 2012 23:21:36 +0000 (16:21 -0700)]
Move the position of widget choosers to below lockscreen settings in Security

Bug: 7261302

Move the 2 widget options on lockscreen to below the lock related items, just
above the Owner Info item.

Change-Id: I373b915e15bc93ce7e56f5982999afa1e5aed281

11 years agoFix issue #7226978: Still in app detail screen after uninstall
Dianne Hackborn [Thu, 4 Oct 2012 22:44:50 +0000 (15:44 -0700)]
Fix issue #7226978: Still in app detail screen after uninstall

Change-Id: I3b03db0a68bfab5dd010474ee714d5f7a5538af0

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Oct 2012 22:02:57 +0000 (15:02 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Oct 2012 22:00:03 +0000 (15:00 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Oct 2012 21:58:30 +0000 (14:58 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam 484cbeba: (-s ours) am f55a3a1e: am 27636444: Merge "Import translations. DO NOT...
Baligh Uddin [Thu, 4 Oct 2012 17:44:35 +0000 (10:44 -0700)]
am 484cbeba: (-s ours) am f55a3a1e: am 27636444: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '484cbebafd3d4e2456f4fa0b82fffbb7987ba0ae':
  Import translations. DO NOT MERGE

11 years agoam f55a3a1e: am 27636444: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 4 Oct 2012 17:43:34 +0000 (10:43 -0700)]
am f55a3a1e: am 27636444: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

11 years agoam 27636444: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 4 Oct 2012 17:40:56 +0000 (10:40 -0700)]
am 27636444: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '27636444a4be011a6a813cba6429e58629316ce4':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 4 Oct 2012 17:39:12 +0000 (10:39 -0700)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 4 Oct 2012 17:38:53 +0000 (10:38 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoam a35de94f: (-s ours) am 771daf38: Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Thu, 4 Oct 2012 17:05:35 +0000 (10:05 -0700)]
am a35de94f: (-s ours) am 771daf38: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

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

11 years agoam 771daf38: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Thu, 4 Oct 2012 17:02:15 +0000 (10:02 -0700)]
am 771daf38: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '771daf38ea35c670f2eac8512d8058daaec1434f':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Thu, 4 Oct 2012 17:00:57 +0000 (10:00 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

11 years agoam 90870780: (-s ours) Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Thu, 4 Oct 2012 14:52:38 +0000 (07:52 -0700)]
am 90870780: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '90870780c8019d67c2abd502dba3a92dce91bebe':

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Thu, 4 Oct 2012 14:50:00 +0000 (07:50 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: Ic92ccbe7031853f464542711f57fcf1e1d7112fb

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 4 Oct 2012 14:00:18 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Oct 2012 04:25:27 +0000 (21:25 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Oct 2012 04:23:00 +0000 (21:23 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Oct 2012 04:21:22 +0000 (21:21 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam dc592eeb: am 8a55b2d5: am 875fa8af: Merge "No decoration for WifiSetup activity...
Amith Yamasani [Thu, 4 Oct 2012 00:56:43 +0000 (17:56 -0700)]
am dc592eeb: am 8a55b2d5: am 875fa8af: Merge "No decoration for WifiSetup activity used by SetupWizard" into jb-mr1-dev

* commit 'dc592eebf125ac71c1b45ad1b6e797a1787d0528':
  No decoration for WifiSetup activity used by SetupWizard

11 years agoam 8a55b2d5: am 875fa8af: Merge "No decoration for WifiSetup activity used by SetupWi...
Amith Yamasani [Thu, 4 Oct 2012 00:54:56 +0000 (17:54 -0700)]
am 8a55b2d5: am 875fa8af: Merge "No decoration for WifiSetup activity used by SetupWizard" into jb-mr1-dev

* commit '8a55b2d545d9e2d10afc2f5bf98e0ea6f43182de':
  No decoration for WifiSetup activity used by SetupWizard

11 years agoam 875fa8af: Merge "No decoration for WifiSetup activity used by SetupWizard" into...
Amith Yamasani [Thu, 4 Oct 2012 00:52:59 +0000 (17:52 -0700)]
am 875fa8af: Merge "No decoration for WifiSetup activity used by SetupWizard" into jb-mr1-dev

* commit '875fa8affb0f3b0ac39120833a7778f92c97b965':
  No decoration for WifiSetup activity used by SetupWizard

11 years agoMerge "No decoration for WifiSetup activity used by SetupWizard" into jb-mr1-dev
Amith Yamasani [Thu, 4 Oct 2012 00:50:58 +0000 (17:50 -0700)]
Merge "No decoration for WifiSetup activity used by SetupWizard" into jb-mr1-dev

11 years agoAnnounce dynamic content changes in lock confirmation settings.
alanv [Thu, 4 Oct 2012 00:10:50 +0000 (17:10 -0700)]
Announce dynamic content changes in lock confirmation settings.

Also re-orders updateStage() and setText/Selection calls so that text
events don't flush announcements. This does not change functionality.

Bug: 7256500
Change-Id: I8b10d66e9f73c7a630a8c3c5128372e18f26234c

11 years agoam 8bb4fc52: am c767066d: am c8e609c4: Merge "Navigation fixes for Settings" into...
Adam Powell [Thu, 4 Oct 2012 00:03:25 +0000 (17:03 -0700)]
am 8bb4fc52: am c767066d: am c8e609c4: Merge "Navigation fixes for Settings" into jb-mr1-dev

* commit '8bb4fc525131624066b43de776ab0e636e6578a3':
  Navigation fixes for Settings