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
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
Jeff Sharkey
220b06b1bb
Merge "Always show auto-sync; user-specific storage." into jb-mr1-dev
2012-09-18 15:15:31 -07:00
Brian Muramatsu
3bbd460883
am a6c1b346
: Merge "Add optional regulatory info page" into jb-mr1-dev
...
* commit 'a6c1b346ae0fc92170eb09f90c71b9c3d25d53eb':
Add optional regulatory info page
2012-09-18 15:14:40 -07:00
Jeff Sharkey
fda48e39d3
Always show auto-sync; user-specific storage.
...
Auto-sync is per-user, so show it to all users. Also create user-
specific path when showing misc storage items.
Bug: 7179485, 7177335
Change-Id: I9f6029e22d519a5516a0f1a76e6aa55db3c2832c
2012-09-18 15:09:35 -07:00
Adam Cohen
976931c1b9
am 7956e726
: Merge "Tweaking mechanism for adding keyguard widgets" into jb-mr1-dev
...
* commit '7956e7263afd2007dc4262dc3c79dc74b14e8bf6':
Tweaking mechanism for adding keyguard widgets
2012-09-18 14:59:44 -07:00
Brian Muramatsu
a6c1b346ae
Merge "Add optional regulatory info page" into jb-mr1-dev
2012-09-18 14:59:36 -07:00
Dianne Hackborn
1bbc2eff36
am 9ba3d227
: Merge "Fix issue #7050530 : NPE in Settings : settings.applications.RunningServiceDetails..." into jb-mr1-dev
...
* commit '9ba3d227e37b49412fe146b43f15aabb1da0d008':
Fix issue #7050530 : NPE in Settings : settings.applications.RunningServiceDetails...
2012-09-18 14:49:51 -07:00
Adam Cohen
7956e7263a
Merge "Tweaking mechanism for adding keyguard widgets" into jb-mr1-dev
2012-09-18 14:47:09 -07:00
Andy Stadler
1490075dff
Rename file to satisfy strict Java requirement
...
There is no code change, the classname is OK, it was just the
filename that needed a tweak.
Original code was Change-Id: I381ed96f6b57f414bbaccd694f55d2b992e330a4
Change-Id: I14f2009cff186647a736b1183acf815713234dd5
2012-09-18 14:43:42 -07:00
Adam Cohen
1dd0024327
Tweaking mechanism for adding keyguard widgets
...
-> Fix for issue 7173877
-> Fix for issue 7173587
Change-Id: I266cafcf175c98e0c8a8401e11faa5dd2e2fa885
2012-09-18 14:41:47 -07:00
Dianne Hackborn
9ba3d227e3
Merge "Fix issue #7050530 : NPE in Settings : settings.applications.RunningServiceDetails..." into jb-mr1-dev
2012-09-18 14:19:28 -07:00
Dianne Hackborn
9fae74f6c3
Fix issue #7050530 : NPE in Settings : settings.applications.RunningServiceDetails...
...
...addDetailViews(RunningServiceDetails.java:439)
Change-Id: Id4a110bacf4da1bec07272b3b75e8bf0986cab92
2012-09-18 14:17:36 -07:00
Michael Jurka
b439af8e78
am 221e4356
: Merge "Fix cases where app widget ids were not being cleaned up" into jb-mr1-dev
...
* commit '221e4356e1cbf24dd32037800601df91c3b85c6d':
Fix cases where app widget ids were not being cleaned up
2012-09-18 14:03:44 -07:00
Michael Jurka
221e4356e1
Merge "Fix cases where app widget ids were not being cleaned up" into jb-mr1-dev
2012-09-18 13:25:57 -07:00
Dianne Hackborn
06d2e94973
am ba088af9
: Merge "Fix issue #7178865 : Selecting an app from Settings > Apps>..." into jb-mr1-dev
...
* commit 'ba088af9af1d874adebf78273432d0f079960249':
Fix issue #7178865 : Selecting an app from Settings > Apps>...
2012-09-18 12:17:00 -07:00
Dianne Hackborn
ba088af9af
Merge "Fix issue #7178865 : Selecting an app from Settings > Apps>..." into jb-mr1-dev
2012-09-18 12:07:20 -07:00
Dianne Hackborn
0fca4296ac
Fix issue #7178865 : Selecting an app from Settings > Apps>...
...
...all crashes on a secondary user
Change-Id: I977932bce3ea2816e4c9d1002488b658a96e3986
2012-09-18 12:04:00 -07:00
Brian Muramatsu
a6dbaea2da
Add optional regulatory info page
...
Bug 7081675
If R.bools.config_show_regulatory_info is true, then show a "Regulatory
information" item on the "About phone" page. Show a DialogFragment
displaying the regulatory_info drawable if the item is clicked. Add a
1x1 blank regulatory_info drawable for devices that won't show this.
Change-Id: I5823d8969de038becf4911dce893dab5dbb23537
2012-09-18 11:46:35 -07:00
Amith Yamasani
45c18afa5c
am 3e3b75f2
: Merge "Add help menu for Users and Location access" into jb-mr1-dev
...
* commit '3e3b75f26f2ad91c40ba28d13af2838331113bca':
Add help menu for Users and Location access
2012-09-18 10:44:10 -07:00