Svetoslav Ganov
7503149010
am 0a48c169
: Merge "Remove accessibility category from developer options." into jb-mr1-dev
...
* commit '0a48c1690bd0aa7901e8fc737ca9e4dadec22ea4':
Remove accessibility category from developer options.
2012-09-21 17:50:39 -07:00
Dianne Hackborn
07a7367d84
am f4bd1a70
: Merge "Fix issue 7198767, 7198366, 7189824." into jb-mr1-dev
...
* commit 'f4bd1a705f6b4e1e575c46f88ca91c02144e551e':
Fix issue 7198767, 7198366, 7189824.
2012-09-21 17:50:33 -07:00
Baligh Uddin
c1f19dbca3
am 936186c6
: (-s ours) Revert "Import translations. DO NOT MERGE"
...
* commit '936186c614903f79cc562c005801f95863cbe054':
Revert "Import translations. DO NOT MERGE"
2012-09-21 17:50:19 -07:00
Baligh Uddin
b03a649efa
am 8172ea49
: (-s ours) Import translations. DO NOT MERGE
...
* commit '8172ea490f5880b1e2df2856364c3d37c28ed155':
Import translations. DO NOT MERGE
2012-09-21 17:49:53 -07:00
Michael Jurka
f189d5d989
am 406b01f4
: Merge "Add support for changing status widget on security screen" into jb-mr1-dev
...
* commit '406b01f4ffe61f21a7fbaadac3e2a37a58eb2e2e':
Add support for changing status widget on security screen
2012-09-21 17:45:01 -07:00
Amith Yamasani
9a681567a0
am e4f249bb
: Merge "Exclude dying users when querying the list" into jb-mr1-dev
...
* commit 'e4f249bb7a9f999633d938d0c519631764bf969c':
Exclude dying users when querying the list
2012-09-21 17:44:47 -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
e65468dc2b
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-09-21 16:10:37 -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
Baligh Uddin
318b49c504
Import translations. DO NOT MERGE
...
Change-Id: I6e1c77d8616cc608b7a4a1c15e36226bbd856fff
Auto-generated-cl: translation import
2012-09-21 15:46:51 -07:00
Fabrice Di Meglio
bb647a2cf6
am 377ab9c2
: Merge "Fix bug #7198585 Settings > Display > Dream completely broken in RTL" into jb-mr1-dev
...
* commit '377ab9c2e42f90976f4af7eb362210fb2c409f7a':
Fix bug #7198585 Settings > Display > Dream completely broken in RTL
2012-09-21 13:34:08 -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
Jeff Brown
f877ed8289
am 9e143f5e
: First draft of wifi display settings UI.
...
* commit '9e143f5e9d836d2d3dd0b2f59f7d14327ade0193':
First draft of wifi display settings UI.
2012-09-20 06:23:17 -07:00
Jeff Sharkey
7a3706525f
am 99340f36
: Merge "Update string to reflect removed users." into jb-mr1-dev
...
* commit '99340f36cb0ed7bf84b0bae418a85132a01acb32':
Update string to reflect removed users.
2012-09-20 06:22:32 -07:00
Brian Muramatsu
97326d67d6
am 801a1588
: Merge "Fix regulatory information dialog appearance" into jb-mr1-dev
...
* commit '801a1588d91cbce758c50d6a5ddd35eba71c36b6':
Fix regulatory information dialog appearance
2012-09-20 06:21:48 -07:00
Jeff Sharkey
d604e9ed52
am ee9ecf0a
: Merge "Migrate UI to supportsMultipleUsers()." into jb-mr1-dev
...
* commit 'ee9ecf0ac6695bc80ba4bc3256989c307f85fd1d':
Migrate UI to supportsMultipleUsers().
2012-09-20 06:21:21 -07:00
Brian Muramatsu
5d1193f0c8
am 185ba407
: Fix NPE in DeviceInfoSettings
...
* commit '185ba407bab02c1442d02b82800f0220779ecb10':
Fix NPE in DeviceInfoSettings
2012-09-20 06:20:27 -07:00
Jeff Sharkey
8d14bf535b
am 8882ccdd
: Load user photos through system_server.
...
* commit '8882ccdd3eafc338213b312f1b73fb4de1776a60':
Load user photos through system_server.
2012-09-20 06:19:27 -07:00
Jeff Sharkey
4b1a8cec90
am f5de1db2
: Omit PPTP VPNs from lockdown list.
...
* commit 'f5de1db28a61d159e62ef42f64a2cdcb316d0c2c':
Omit PPTP VPNs from lockdown list.
2012-09-20 06:19:25 -07:00
Amith Yamasani
371169d62a
am b92e9afe
: Merge "Fix a crash in InstalledAppDetails" into jb-mr1-dev
...
* commit 'b92e9afe4d056ca69a43450dc5be6ffb7efa1ea1':
Fix a crash in InstalledAppDetails
2012-09-20 06:19:21 -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
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
Irfan Sheriff
ab7024a5b0
am 9fc59c99
: Merge "Fix strings" into jb-mr1-dev
...
* commit '9fc59c99efc9413546aa4a60a740f617730a08b0':
Fix strings
2012-09-19 05:50:35 -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
Andy Stadler
16f41fa6af
am 27f155a4
: Merge "Rename file to satisfy strict Java requirement" into jb-mr1-dev
...
* commit '27f155a4012aece82d58f7142960aec6414ade4d':
Rename file to satisfy strict Java requirement
2012-09-18 16:31:39 -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
9699ec0b6d
am dddef157
: Merge "Fix bug: allow users to select "none" for lockscreen widget" into jb-mr1-dev
...
* commit 'dddef157b79818cb20321e2a3b715e88457fba44':
Fix bug: allow users to select "none" for lockscreen widget
2012-09-18 16:13:31 -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
Jeff Sharkey
447e83f048
am 220b06b1
: Merge "Always show auto-sync; user-specific storage." into jb-mr1-dev
...
* commit '220b06b1bb8cb2ac947f7fe6b911b8160f1186cd':
Always show auto-sync; user-specific storage.
2012-09-18 15:20:37 -07:00
Michael Jurka
74dffa1bd5
Fix bug: allow users to select "none" for lockscreen widget
...
Change-Id: Ibd0449899ce7c340a6f838c56de58b70538400fc
2012-09-18 15:17:58 -07:00