Commit Graph

8541 Commits

Author SHA1 Message Date
The Android Automerger
ca88cda071 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-24 06:59:22 -07:00
The Android Automerger
b44bdb2f59 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-23 19:00:18 -07:00
Amith Yamasani
7fb91855b0 Merge "Show more settings and add restrictions/dialogs for secondary users" into jb-mr1-dev 2012-09-23 18:47:20 -07:00
Amith Yamasani
9627a8ea15 Show more settings and add restrictions/dialogs for secondary users
Bug: 7213029 crash in About>Status
Bug: 7212495 hide System updates for second user
Bug: 7212230 nickname editor should select the text
Bug: 7160487 TTS settings
Bug: 7129411 Settings needs visibility changes for secondary users

Change-Id: Ia2d1229c08b392edfa6b671fce4a382410405b14
2012-09-23 18:43:31 -07:00
Jeff Sharkey
0e9cf8a723 Storage item to represent cached data.
When touched, offers to clear all cached data.

Bug: 7216370
Change-Id: I86afe66b819fb7deeba909bef507925fc5a590f3
2012-09-23 17:49:31 -07:00
Baligh Uddin
b105531116 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-23 08:14:05 -07:00
Baligh Uddin
17b7a8cd18 Merge "Remove no longer used dream_settings.xml." into jb-mr1-dev 2012-09-23 08:13:38 -07:00
Baligh Uddin
9307c8e9f9 Import translations. DO NOT MERGE
Change-Id: Ie4f6419929f793550859314eb624135452f845f4
Auto-generated-cl: translation import
2012-09-22 14:20:39 -07:00
The Android Automerger
8deb86f7c9 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-22 09:42:44 -07:00
John Spurlock
1ce93065a5 Remove no longer used dream_settings.xml.
Change-Id: I8355372f4dd2f99a92b4a708cf38276c5e7f41d4
2012-09-22 10:38:43 -04:00
Romain Guy
70edd393bf Merge "Add new developer setting to visualize overdraw" into jb-mr1-dev 2012-09-21 19:28:12 -07:00
Romain Guy
098f493dba Add new developer setting to visualize overdraw
Change-Id: I16d6bb5a199233efebf5c3211dbe57dc9b6729c9
2012-09-21 19:23:20 -07:00
Adam Cohen
2078b6916d Addressing issue where power control widget disappears issue 7205586
Change-Id: I6eea146d3819d3b35f1420e59d4ebdbc66041a9e
2012-09-21 18:52:24 -07:00
Svetoslav Ganov
f85e7e15a7 Merge "Accessibility multi-user support." into jb-mr1-dev 2012-09-21 17:41:31 -07:00
Svetoslav Ganov
46045d8b12 Accessibility multi-user support.
1. Accessibility settings are now shown for every user.

bug:6967373

Change-Id: Ie31a6a573031bde1d769e43c4d5d88b7e4c8525d
2012-09-21 17:25:46 -07:00
Svetoslav Ganov
0a48c1690b Merge "Remove accessibility category from developer options." into jb-mr1-dev 2012-09-21 17:12:08 -07:00
Dianne Hackborn
f4bd1a705f Merge "Fix issue 7198767, 7198366, 7189824." into jb-mr1-dev 2012-09-21 17:05:23 -07:00
Dianne Hackborn
c715fb1207 Fix issue 7198767, 7198366, 7189824.
Bug #7198767: Crash on choosing App info from the Recent apps tab
Bug #7198366: Settings UI should not show other Users' apps
Bug #7189824: Settings crashes on trying to access Battery usage summary

Also fix running services to be able to show user bitmap when in
secondary users, crash in running services if a service is running
whose app is not installed for the current user.

Change-Id: Ief24810c9ddce1ec3f8641ce08af79e1bc18f221
2012-09-21 17:02:22 -07:00
Baligh Uddin
936186c614 Revert "Import translations. DO NOT MERGE"
Build Broken

This reverts commit 8172ea490f

Change-Id: I091c3300ecce597bb0133f62bc621f29af85e5ba
2012-09-21 16:35:05 -07:00
Baligh Uddin
8172ea490f Import translations. DO NOT MERGE
Change-Id: Iae4b42c08cd2e16f700c844579fcb9b1664a2960
Auto-generated-cl: translation import
2012-09-21 15:48:35 -07:00
The Android Automerger
7653179b99 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-21 07:00:23 -07:00
Michael Jurka
406b01f4ff Merge "Add support for changing status widget on security screen" into jb-mr1-dev 2012-09-21 01:11:00 -07:00
Michael Jurka
091477b4de Add support for changing status widget on security screen
Change-Id: I68a8ce2ce03888a8decbe017d67634c6965f0a1a
2012-09-21 01:01:39 -07:00
Amith Yamasani
e4f249bb7a Merge "Exclude dying users when querying the list" into jb-mr1-dev 2012-09-20 23:09:21 -07:00
Amith Yamasani
e278eda851 Exclude dying users when querying the list
Bug: 7194894

Use the new API in UserManager to query the list of users, excluding
the dying ones.

Change-Id: Ib09bb723209030da7e8aca53d402ef4c96c273a3
2012-09-20 22:44:48 -07:00
Svetoslav Ganov
43af40be48 Remove accessibility category from developer options.
1. There is a temporary accessibility option in developer options with
   one item for enabling automatic zoom out and panning. This is not a
   developer option in general and should not be there.

bug:7207305

Change-Id: Ib146ccb3704dd94d635cc668b71c007fbd8d29b3
2012-09-20 19:15:33 -07:00
Fabrice Di Meglio
377ab9c2e4 Merge "Fix bug #7198585 Settings > Display > Dream completely broken in RTL" into jb-mr1-dev 2012-09-20 16:52:59 -07:00
Fabrice Di Meglio
ecadb07b4c Fix bug #7198585 Settings > Display > Dream completely broken in RTL
- use start/end instead of left/right
- use android:textDirection="locale" on the TextView for forcing the
correct position of the title text

Change-Id: I968798dcd4ac9307ffc3e48369990b73d3d1b4db
2012-09-20 15:30:49 -07:00
Russell Brenner
852cfa9335 Move super call to top of onActivityCreated
The historical reasons for not calling super.onActivityCreated early
on appear to be no longer relevant.

Bug: 6935999
Change-Id: I63aad8a4c70ce938ecb07541267cad44e3e18e13
2012-09-20 14:07:41 -07:00
The Android Automerger
28cbc338b1 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-20 07:00:29 -07:00
Jeff Brown
9e143f5e9d First draft of wifi display settings UI.
All of the functionality is in place but the UI is
not fully polished yet.

Bug: 7178216
Change-Id: Id76843bff05cc71e5c02a31bc97c7070d58fff10
2012-09-19 21:37:20 -07:00
Jeff Sharkey
99340f36cb Merge "Update string to reflect removed users." into jb-mr1-dev 2012-09-19 18:58:07 -07:00
Brian Muramatsu
801a1588d9 Merge "Fix regulatory information dialog appearance" into jb-mr1-dev 2012-09-19 15:40:56 -07:00
Jeff Sharkey
6bf72119fd Update string to reflect removed users.
Bug: 7194784
Change-Id: Ied3b4376d0ad664c61a5d3388fe24bc96c6ee466
2012-09-19 15:26:12 -07:00
Jeff Sharkey
ee9ecf0ac6 Merge "Migrate UI to supportsMultipleUsers()." into jb-mr1-dev 2012-09-19 14:52:34 -07:00
Brian Muramatsu
cb0a6ccba9 Fix NPE in DeviceInfoSettings
Bug 7192187

Change-Id: I6d404e5228c7f66e37137a27ebd555a88dda2f74
2012-09-19 14:11:53 -07:00
Amith Yamasani
45410f3e85 Fix a crash in InstalledAppDetails
Initialize mPackageInfo in onCreate

Bug: 7194755
Change-Id: Ic82351591bd38c4c161bbb23c4033038d1d7fa85
2012-09-19 14:11:46 -07:00
Jeff Sharkey
4420246a20 Migrate UI to supportsMultipleUsers().
Bug: 7194531
Change-Id: I601340362053cfd7394dea0fa69bd0523303070b
2012-09-19 13:13:45 -07:00
Brian Muramatsu
185ba407ba Fix NPE in DeviceInfoSettings
Bug 7192187

Change-Id: I6d404e5228c7f66e37137a27ebd555a88dda2f74
2012-09-19 13:05:06 -07:00
Jeff Sharkey
8882ccdd3e Load user photos through system_server.
Bug: 7194137
Change-Id: Ie36ca40c48fb06d55d120bfcf3db69aea9d83829
2012-09-19 11:16:24 -07:00
Jeff Sharkey
f5de1db28a Omit PPTP VPNs from lockdown list.
Bug: 7064069
Change-Id: Ie4261828ef2dc5af32db3b327ca7ec00451e65d9
2012-09-19 11:16:24 -07:00
Amith Yamasani
b92e9afe4d Merge "Fix a crash in InstalledAppDetails" into jb-mr1-dev 2012-09-19 11:14:46 -07:00
Amith Yamasani
b1bf9cf383 Fix a crash in InstalledAppDetails
Initialize mPackageInfo in onCreate

Bug: 7194755
Change-Id: Ic82351591bd38c4c161bbb23c4033038d1d7fa85
2012-09-19 10:58:32 -07:00
The Android Automerger
9b2997b817 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-19 07:01:47 -07:00
Irfan Sheriff
9fc59c99ef Merge "Fix strings" into jb-mr1-dev 2012-09-18 22:03:13 -07:00
Brian Muramatsu
b585c62811 Fix regulatory information dialog appearance
Bug 7081675

Replace RegulatoryInfoFragment with a custom preference so that the info
shows up properly in a dialog. DialogFragments do not appear
as dialogs when instantiated from preference XML files.

Change-Id: Icbdf73bd5b1d14f28a01d7b9cb0f37d90340eb46
2012-09-18 21:58:05 -07:00
Irfan Sheriff
fb6faab59e Fix strings
Bug: 7182012
Bug: 7071211
Change-Id: I34aa508d5e4151ffdc538a3ab9ae1ddf3749b345
2012-09-18 21:03:42 -07:00
Adam Cohen
352c901765 Tweaking mechanism for adding keyguard widgets
-> Fix for issue 7173877
-> Fix for issue 7173587

Change-Id: I266cafcf175c98e0c8a8401e11faa5dd2e2fa885

Conflicts:

	src/com/android/settings/SecuritySettings.java
2012-09-18 16:37:52 -07:00
Andy Stadler
27f155a401 Merge "Rename file to satisfy strict Java requirement" into jb-mr1-dev 2012-09-18 16:26:19 -07:00
Michael Jurka
dddef157b7 Merge "Fix bug: allow users to select "none" for lockscreen widget" into jb-mr1-dev 2012-09-18 16:11:30 -07:00