Baligh Uddin
e5351aab40
am df54b396
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'df54b396941adb14107ce54a61b78f2a9378ec09':
Import translations. DO NOT MERGE
2012-10-08 07:55:08 -07:00
Baligh Uddin
36391cc61a
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-08 07:54:28 -07:00
Baligh Uddin
df54b39694
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-08 07:53:46 -07:00
Amith Yamasani
40cbecb8c3
am 29707a50
: Merge "Fix layout for decryption password entry." into jb-mr1-dev
...
* commit '29707a501c6f61108e479a6129e89791dc5a1f36':
Fix layout for decryption password entry.
2012-10-07 14:04:10 -07:00
Amith Yamasani
29707a501c
Merge "Fix layout for decryption password entry." into jb-mr1-dev
2012-10-07 14:02:26 -07:00
Svetoslav Ganov
450a7ad6a3
am 7e54c544
: Clean up \'accessibility shortcut\' screen.
...
* commit '7e54c544aa3b16245486cf3787e79cab5bbdb651':
Clean up 'accessibility shortcut' screen.
2012-10-07 12:03:45 -07:00
Svetoslav Ganov
7e54c544aa
Clean up 'accessibility shortcut' screen.
...
1. Last polishes to the accessibility shortcut screen.
bug:7298927
Change-Id: I8109f215c63eeaa6ea4bf589aa4af897d09c5e03
2012-10-07 11:48:57 -07:00
Amith Yamasani
d2e414c2b6
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
2012-10-07 06:34:47 -07:00
Amith Yamasani
a1e1960890
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."
2012-10-05 20:54:35 -07:00
Amith Yamasani
0b146b2384
Merge "Revert "Show warning dialog in a multiuser system when adding a new account."" into jb-mr1-dev
2012-10-05 20:53:03 -07:00
Amith Yamasani
21c2904ba3
Revert "Show warning dialog in a multiuser system when adding a new account."
...
This reverts commit eb71f26897
Change-Id: Iad4a6656e922c0d2dbd3dd349d1c24d597eab7f5
2012-10-05 19:56:18 -07:00
Baligh Uddin
b1597fca1f
Import translations. DO NOT MERGE
...
Change-Id: I370e6491b374c4c828b128955eefce762335fa52
Auto-generated-cl: translation import
2012-10-05 16:29:40 -07:00
Baligh Uddin
9be89088da
Import translations. DO NOT MERGE
...
Change-Id: I6c6a598c03f12d3ac9e9a3cc08d479d7b8f1f274
Auto-generated-cl: translation import
2012-10-05 16:27:44 -07:00
Adam Cohen
517f5cede9
am 1f9a07b5
: Merge "Fixing filter for status widget (issue 7295596)" into jb-mr1-dev
...
* commit '1f9a07b5e9b1868fc6741c99e74970aa0e9762fe':
Fixing filter for status widget (issue 7295596)
2012-10-05 14:18:24 -07:00
Svetoslav Ganov
3b1520eed7
am 78995994
: Updating the screen magnification strings.
...
* commit '78995994b9b0afbc4c4705e41d1c4ac944e557f2':
Updating the screen magnification strings.
2012-10-05 14:16:58 -07:00
Adam Cohen
1f9a07b5e9
Merge "Fixing filter for status widget (issue 7295596)" into jb-mr1-dev
2012-10-05 14:16:42 -07:00
Svetoslav Ganov
78995994b9
Updating the screen magnification strings.
...
bug:7295457
Change-Id: Idef3950b975fbb8071067c165fa52358aa6b828d
2012-10-05 14:13:42 -07:00
Jeff Sharkey
dd51496cf3
am 4a58b100
: Merge "Avoid NPE when missing PackageInfo." into jb-mr1-dev
...
* commit '4a58b1006cec93565a7106c117b2c87248341404':
Avoid NPE when missing PackageInfo.
2012-10-05 13:55:36 -07:00
Jeff Sharkey
4a58b1006c
Merge "Avoid NPE when missing PackageInfo." into jb-mr1-dev
2012-10-05 13:53:39 -07:00
Svetoslav Ganov
3c95a3b947
am 69621ece
: Locale selection settings do not hide warning dialog.
...
* commit '69621ece97d9f82e7408562f28110f40d872cb24':
Locale selection settings do not hide warning dialog.
2012-10-05 13:48:08 -07:00
Adam Cohen
a1c314a879
Fixing filter for status widget (issue 7295596)
...
Change-Id: I63515bc68550357b8e2738450eefa01ec3122229
2012-10-05 13:42:04 -07:00
Jeff Sharkey
54b3f501ca
Avoid NPE when missing PackageInfo.
...
Bug: 7296861
Change-Id: I87b64d5f4b1f34e47d785a18a029130fdca874a1
2012-10-05 13:34:41 -07:00
Svetoslav Ganov
69621ece97
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
2012-10-05 12:49:25 -07:00
Baligh Uddin
babf1a4348
am 9d904890
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '9d90489078b406d3a52e27ef517278e15f603f76':
Import translations. DO NOT MERGE
2012-10-04 22:21:01 -07:00
Baligh Uddin
9d90489078
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-04 22:19:15 -07:00
Baligh Uddin
3d72d16956
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-04 22:18:41 -07:00
Amith Yamasani
42171a2cc6
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
2012-10-04 21:58:07 -07:00
Amith Yamasani
6fd359d8f6
Merge "Move the position of widget choosers to below lockscreen settings in Security" into jb-mr1-dev
2012-10-04 21:56:04 -07:00
Charles Chen
fdab8bd9da
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.
2012-10-04 18:33:43 -07:00
Charles Chen
992e0b8537
Merge "Announce dynamic content changes in lock confirmation settings." into jb-mr1-dev
2012-10-04 18:32:30 -07:00
Dianne Hackborn
8416f45384
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
2012-10-04 17:22:32 -07:00
Dianne Hackborn
2c41f7be44
Merge "Fix issue #7226978 : Still in app detail screen after uninstall" into jb-mr1-dev
2012-10-04 17:20:45 -07:00
Jeff Sharkey
ef62a19855
am 113e4b6a
: Merge "Refresh authenticator info when accounts change." into jb-mr1-dev
...
* commit '113e4b6aa1dfbc49abdf6366909ceb4a6923d114':
Refresh authenticator info when accounts change.
2012-10-04 16:42:27 -07:00
Jeff Sharkey
113e4b6aa1
Merge "Refresh authenticator info when accounts change." into jb-mr1-dev
2012-10-04 16:40:25 -07:00
Amith Yamasani
8f6060f639
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
2012-10-04 16:21:36 -07:00
Dianne Hackborn
ab616d477b
Fix issue #7226978 : Still in app detail screen after uninstall
...
Change-Id: I3b03db0a68bfab5dd010474ee714d5f7a5538af0
2012-10-04 15:44:50 -07:00
Baligh Uddin
eabf97657b
Import translations. DO NOT MERGE
...
Change-Id: I1d77c147969acf45abfa5eb4924fb20639d409ee
Auto-generated-cl: translation import
2012-10-04 15:00:03 -07:00
Baligh Uddin
ad5454ff3b
Import translations. DO NOT MERGE
...
Change-Id: I9d3249b9c3962ef225c8f7566f8aa96805d89355
Auto-generated-cl: translation import
2012-10-04 14:58:30 -07:00
Baligh Uddin
f55a3a1e34
am 27636444
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '27636444a4be011a6a813cba6429e58629316ce4':
Import translations. DO NOT MERGE
2012-10-04 10:40:56 -07:00
Baligh Uddin
27636444a4
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-04 10:38:54 -07:00
Baligh Uddin
771daf38ea
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-04 10:00:58 -07:00
Baligh Uddin
8948fa5090
Import translations. DO NOT MERGE
...
Change-Id: I5e5c043d16bb59b50b4341a44827c824c564786c
Auto-generated-cl: translation import
2012-10-03 21:23:00 -07:00
Baligh Uddin
48be9aa3a8
Import translations. DO NOT MERGE
...
Change-Id: I65e354b797114c305fdce72fd57ee8039e16630a
Auto-generated-cl: translation import
2012-10-03 21:21:22 -07:00
Amith Yamasani
8a55b2d545
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
2012-10-03 17:52:59 -07:00
Amith Yamasani
875fa8affb
Merge "No decoration for WifiSetup activity used by SetupWizard" into jb-mr1-dev
2012-10-03 17:50:59 -07:00
alanv
eef72c39ae
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
2012-10-03 17:10:50 -07:00
Adam Powell
c767066d52
am c8e609c4
: Merge "Navigation fixes for Settings" into jb-mr1-dev
...
* commit 'c8e609c49d836ec8c87bc52b9f592693fd860f1d':
Navigation fixes for Settings
2012-10-03 16:59:13 -07:00
Adam Powell
c8e609c49d
Merge "Navigation fixes for Settings" into jb-mr1-dev
2012-10-03 16:57:44 -07:00
Jeff Sharkey
9ff79c19bd
Refresh authenticator info when accounts change.
...
There may be newly installed authenticators, so refresh them when
accounts change.
Bug: 7280043
Change-Id: Ic173970c815950526c77a2653e7fae4551948f13
2012-10-03 16:49:35 -07:00
Adam Powell
4684ae8eca
Navigation fixes for Settings
...
Change quick-entry points to Settings to have taskAffinity="",
excludeFromRecents="true", and no parentActivityName.
This makes the various quick shortcuts more standalone; their task
state does not persist and they have no Up navigation available. As
most shortcuts do not launch these activities with
FLAG_ACTIVITY_TASK_ON_HOME, Back will return the user to the previous
task.
This does not affect the "real" versions of these settings screens as
navigated to through the front door of the Settings app; those screens
are reached through SubSettings instances with specific fragments
added.
Bug 7276291
Change-Id: I7864437277601a3f6b6beded44a5edfd4636010c
2012-10-03 16:36:20 -07:00