OSDN Git Service
Jeff Sharkey [Mon, 24 Sep 2012 21:00:01 +0000 (14:00 -0700)]
am
ff571fee: Merge "Hide lockdown VPN when IMS auth is required." into jb-mr1-dev
* commit '
ff571fee86267348e852a07826ffc78cc43384ba':
Hide lockdown VPN when IMS auth is required.
Jeff Sharkey [Mon, 24 Sep 2012 20:08:56 +0000 (13:08 -0700)]
Merge "Hide lockdown VPN when IMS auth is required." into jb-mr1-dev
Jeff Sharkey [Mon, 24 Sep 2012 19:56:29 +0000 (12:56 -0700)]
Hide lockdown VPN when IMS auth is required.
Bug:
7069782
Change-Id: I978d89894da17164a1e0122adb5acbfda3586fa1
Adam Cohen [Mon, 24 Sep 2012 18:51:31 +0000 (11:51 -0700)]
am
c939735b: Merge "Addressing issue where power control widget disappears issue
7205586" into jb-mr1-dev
* commit '
c939735b176a3a401e8a3e60e9fd8a6a732a2dc0':
Addressing issue where power control widget disappears issue
7205586
Adam Cohen [Mon, 24 Sep 2012 18:49:23 +0000 (11:49 -0700)]
Merge "Addressing issue where power control widget disappears issue
7205586" into jb-mr1-dev
Amith Yamasani [Mon, 24 Sep 2012 15:32:09 +0000 (08:32 -0700)]
am
7fb91855: Merge "Show more settings and add restrictions/dialogs for secondary users" into jb-mr1-dev
* commit '
7fb91855b05b312e45bfded72d48e0cffcee4a44':
Show more settings and add restrictions/dialogs for secondary users
Jeff Sharkey [Mon, 24 Sep 2012 15:32:08 +0000 (08:32 -0700)]
am
0e9cf8a7: Storage item to represent cached data.
* commit '
0e9cf8a723c3e03207e905e8e03303ec4b5526dc':
Storage item to represent cached data.
Baligh Uddin [Mon, 24 Sep 2012 15:32:07 +0000 (08:32 -0700)]
am
b1055311: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
b105531116148d5d29e113e611ac180aa9691c6e':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 24 Sep 2012 15:32:06 +0000 (08:32 -0700)]
am
17b7a8cd: Merge "Remove no longer used dream_settings.xml." into jb-mr1-dev
* commit '
17b7a8cd1895871441c86afef5387acfa3b81b57':
Remove no longer used dream_settings.xml.
Romain Guy [Mon, 24 Sep 2012 15:32:05 +0000 (08:32 -0700)]
am
70edd393: Merge "Add new developer setting to visualize overdraw" into jb-mr1-dev
* commit '
70edd393bf6590647c12808e20efa928eba96705':
Add new developer setting to visualize overdraw
Svetoslav Ganov [Mon, 24 Sep 2012 15:32:03 +0000 (08:32 -0700)]
am
f85e7e15: Merge "Accessibility multi-user support." into jb-mr1-dev
* commit '
f85e7e15a75d5a475e10940e1b3d570210729b64':
Accessibility multi-user support.
Lei Zhang [Mon, 24 Sep 2012 07:09:04 +0000 (00:09 -0700)]
Fix build. Revert "Import translations. DO NOT MERGE"
This reverts commit
b5153f6d839d6cc422bbe31a0e7a39df6ea5269d
Change-Id: I5f6803c413c1037d5ef90ff15949d5da9cfc43cb
Amith Yamasani [Mon, 24 Sep 2012 01:47:19 +0000 (18:47 -0700)]
Merge "Show more settings and add restrictions/dialogs for secondary users" into jb-mr1-dev
Amith Yamasani [Sun, 23 Sep 2012 19:54:14 +0000 (12:54 -0700)]
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
Jeff Sharkey [Mon, 24 Sep 2012 00:40:47 +0000 (17:40 -0700)]
Storage item to represent cached data.
When touched, offers to clear all cached data.
Bug:
7216370
Change-Id: I86afe66b819fb7deeba909bef507925fc5a590f3
Baligh Uddin [Sun, 23 Sep 2012 15:14:05 +0000 (08:14 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Sun, 23 Sep 2012 15:13:38 +0000 (08:13 -0700)]
Merge "Remove no longer used dream_settings.xml." into jb-mr1-dev
Baligh Uddin [Sat, 22 Sep 2012 21:20:39 +0000 (14:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie4f6419929f793550859314eb624135452f845f4
Auto-generated-cl: translation import
Baligh Uddin [Sat, 22 Sep 2012 21:19:04 +0000 (14:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I892cd85a6f079880ab8e9431950a1e24bdfe138f
Auto-generated-cl: translation import
John Spurlock [Sat, 22 Sep 2012 14:38:43 +0000 (10:38 -0400)]
Remove no longer used dream_settings.xml.
Change-Id: I8355372f4dd2f99a92b4a708cf38276c5e7f41d4
Baligh Uddin [Sat, 22 Sep 2012 04:26:26 +0000 (21:26 -0700)]
Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev
Baligh Uddin [Sat, 22 Sep 2012 04:25:59 +0000 (21:25 -0700)]
Revert "Import translations. DO NOT MERGE"
Broken Build
This reverts commit
318b49c5049805506bdc99c4a30e2d9e7846c5dd
Change-Id: I7ec637e1b55b5ad619c574a71c924461dd730ccf
Romain Guy [Sat, 22 Sep 2012 02:28:11 +0000 (19:28 -0700)]
Merge "Add new developer setting to visualize overdraw" into jb-mr1-dev
Romain Guy [Sat, 22 Sep 2012 02:23:20 +0000 (19:23 -0700)]
Add new developer setting to visualize overdraw
Change-Id: I16d6bb5a199233efebf5c3211dbe57dc9b6729c9
Adam Cohen [Sat, 22 Sep 2012 01:52:24 +0000 (18:52 -0700)]
Addressing issue where power control widget disappears issue
7205586
Change-Id: I6eea146d3819d3b35f1420e59d4ebdbc66041a9e
Svetoslav Ganov [Sat, 22 Sep 2012 00:50:39 +0000 (17:50 -0700)]
am
0a48c169: Merge "Remove accessibility category from developer options." into jb-mr1-dev
* commit '
0a48c1690bd0aa7901e8fc737ca9e4dadec22ea4':
Remove accessibility category from developer options.
Dianne Hackborn [Sat, 22 Sep 2012 00:50:33 +0000 (17:50 -0700)]
Baligh Uddin [Sat, 22 Sep 2012 00:50:19 +0000 (17:50 -0700)]
am
936186c6: (-s ours) Revert "Import translations. DO NOT MERGE"
* commit '
936186c614903f79cc562c005801f95863cbe054':
Revert "Import translations. DO NOT MERGE"
Baligh Uddin [Sat, 22 Sep 2012 00:49:53 +0000 (17:49 -0700)]
am
8172ea49: (-s ours) Import translations. DO NOT MERGE
* commit '
8172ea490f5880b1e2df2856364c3d37c28ed155':
Import translations. DO NOT MERGE
Michael Jurka [Sat, 22 Sep 2012 00:45:01 +0000 (17:45 -0700)]
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
Amith Yamasani [Sat, 22 Sep 2012 00:44:47 +0000 (17:44 -0700)]
am
e4f249bb: Merge "Exclude dying users when querying the list" into jb-mr1-dev
* commit '
e4f249bb7a9f999633d938d0c519631764bf969c':
Exclude dying users when querying the list
Svetoslav Ganov [Sat, 22 Sep 2012 00:41:31 +0000 (17:41 -0700)]
Merge "Accessibility multi-user support." into jb-mr1-dev
Svetoslav Ganov [Thu, 20 Sep 2012 22:04:55 +0000 (15:04 -0700)]
Accessibility multi-user support.
1. Accessibility settings are now shown for every user.
bug:
6967373
Change-Id: Ie31a6a573031bde1d769e43c4d5d88b7e4c8525d
Svetoslav Ganov [Sat, 22 Sep 2012 00:12:07 +0000 (17:12 -0700)]
Merge "Remove accessibility category from developer options." into jb-mr1-dev
Dianne Hackborn [Sat, 22 Sep 2012 00:05:22 +0000 (17:05 -0700)]
Merge "Fix issue
7198767,
7198366,
7189824." into jb-mr1-dev
Dianne Hackborn [Fri, 21 Sep 2012 23:40:21 +0000 (16:40 -0700)]
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
Baligh Uddin [Fri, 21 Sep 2012 23:35:05 +0000 (16:35 -0700)]
Revert "Import translations. DO NOT MERGE"
Build Broken
This reverts commit
8172ea490f5880b1e2df2856364c3d37c28ed155
Change-Id: I091c3300ecce597bb0133f62bc621f29af85e5ba
Baligh Uddin [Fri, 21 Sep 2012 23:10:37 +0000 (16:10 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Fri, 21 Sep 2012 22:48:35 +0000 (15:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iae4b42c08cd2e16f700c844579fcb9b1664a2960
Auto-generated-cl: translation import
Baligh Uddin [Fri, 21 Sep 2012 22:46:51 +0000 (15:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6e1c77d8616cc608b7a4a1c15e36226bbd856fff
Auto-generated-cl: translation import
Fabrice Di Meglio [Fri, 21 Sep 2012 20:34:08 +0000 (13:34 -0700)]
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
Michael Jurka [Fri, 21 Sep 2012 08:10:59 +0000 (01:10 -0700)]
Merge "Add support for changing status widget on security screen" into jb-mr1-dev
Michael Jurka [Fri, 21 Sep 2012 02:03:35 +0000 (19:03 -0700)]
Add support for changing status widget on security screen
Change-Id: I68a8ce2ce03888a8decbe017d67634c6965f0a1a
Amith Yamasani [Fri, 21 Sep 2012 06:09:21 +0000 (23:09 -0700)]
Merge "Exclude dying users when querying the list" into jb-mr1-dev
Amith Yamasani [Fri, 21 Sep 2012 05:44:48 +0000 (22:44 -0700)]
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
Svetoslav Ganov [Fri, 21 Sep 2012 02:15:29 +0000 (19:15 -0700)]
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
Fabrice Di Meglio [Thu, 20 Sep 2012 23:52:59 +0000 (16:52 -0700)]
Merge "Fix bug #
7198585 Settings > Display > Dream completely broken in RTL" into jb-mr1-dev
Fabrice Di Meglio [Thu, 20 Sep 2012 22:30:49 +0000 (15:30 -0700)]
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
Jeff Brown [Thu, 20 Sep 2012 13:23:17 +0000 (06:23 -0700)]
am
9e143f5e: First draft of wifi display settings UI.
* commit '
9e143f5e9d836d2d3dd0b2f59f7d14327ade0193':
First draft of wifi display settings UI.
Jeff Sharkey [Thu, 20 Sep 2012 13:22:32 +0000 (06:22 -0700)]
am
99340f36: Merge "Update string to reflect removed users." into jb-mr1-dev
* commit '
99340f36cb0ed7bf84b0bae418a85132a01acb32':
Update string to reflect removed users.
Brian Muramatsu [Thu, 20 Sep 2012 13:21:48 +0000 (06:21 -0700)]
am
801a1588: Merge "Fix regulatory information dialog appearance" into jb-mr1-dev
* commit '
801a1588d91cbce758c50d6a5ddd35eba71c36b6':
Fix regulatory information dialog appearance
Jeff Sharkey [Thu, 20 Sep 2012 13:21:21 +0000 (06:21 -0700)]
am
ee9ecf0a: Merge "Migrate UI to supportsMultipleUsers()." into jb-mr1-dev
* commit '
ee9ecf0ac6695bc80ba4bc3256989c307f85fd1d':
Migrate UI to supportsMultipleUsers().
Brian Muramatsu [Thu, 20 Sep 2012 13:20:27 +0000 (06:20 -0700)]
am
185ba407: Fix NPE in DeviceInfoSettings
* commit '
185ba407bab02c1442d02b82800f0220779ecb10':
Fix NPE in DeviceInfoSettings
Jeff Sharkey [Thu, 20 Sep 2012 13:19:27 +0000 (06:19 -0700)]
am
8882ccdd: Load user photos through system_server.
* commit '
8882ccdd3eafc338213b312f1b73fb4de1776a60':
Load user photos through system_server.
Jeff Sharkey [Thu, 20 Sep 2012 13:19:25 +0000 (06:19 -0700)]
am
f5de1db2: Omit PPTP VPNs from lockdown list.
* commit '
f5de1db28a61d159e62ef42f64a2cdcb316d0c2c':
Omit PPTP VPNs from lockdown list.
Amith Yamasani [Thu, 20 Sep 2012 13:19:21 +0000 (06:19 -0700)]
am
b92e9afe: Merge "Fix a crash in InstalledAppDetails" into jb-mr1-dev
* commit '
b92e9afe4d056ca69a43450dc5be6ffb7efa1ea1':
Fix a crash in InstalledAppDetails
Jeff Brown [Thu, 20 Sep 2012 03:46:07 +0000 (20:46 -0700)]
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
Jeff Sharkey [Thu, 20 Sep 2012 01:58:06 +0000 (18:58 -0700)]
Merge "Update string to reflect removed users." into jb-mr1-dev
Brian Muramatsu [Wed, 19 Sep 2012 22:40:56 +0000 (15:40 -0700)]
Merge "Fix regulatory information dialog appearance" into jb-mr1-dev
Jeff Sharkey [Wed, 19 Sep 2012 21:42:38 +0000 (14:42 -0700)]
Update string to reflect removed users.
Bug:
7194784
Change-Id: Ied3b4376d0ad664c61a5d3388fe24bc96c6ee466
Jeff Sharkey [Wed, 19 Sep 2012 21:52:33 +0000 (14:52 -0700)]
Merge "Migrate UI to supportsMultipleUsers()." into jb-mr1-dev
Jeff Sharkey [Wed, 19 Sep 2012 20:13:45 +0000 (13:13 -0700)]
Migrate UI to supportsMultipleUsers().
Bug:
7194531
Change-Id: I601340362053cfd7394dea0fa69bd0523303070b
Brian Muramatsu [Wed, 19 Sep 2012 18:19:54 +0000 (11:19 -0700)]
Fix NPE in DeviceInfoSettings
Bug
7192187
Change-Id: I6d404e5228c7f66e37137a27ebd555a88dda2f74
Jeff Sharkey [Wed, 19 Sep 2012 18:15:45 +0000 (11:15 -0700)]
Load user photos through system_server.
Bug:
7194137
Change-Id: Ie36ca40c48fb06d55d120bfcf3db69aea9d83829
Jeff Sharkey [Tue, 18 Sep 2012 22:35:35 +0000 (15:35 -0700)]
Omit PPTP VPNs from lockdown list.
Bug:
7064069
Change-Id: Ie4261828ef2dc5af32db3b327ca7ec00451e65d9
Amith Yamasani [Wed, 19 Sep 2012 18:14:45 +0000 (11:14 -0700)]
Merge "Fix a crash in InstalledAppDetails" into jb-mr1-dev
Amith Yamasani [Wed, 19 Sep 2012 17:58:32 +0000 (10:58 -0700)]
Fix a crash in InstalledAppDetails
Initialize mPackageInfo in onCreate
Bug:
7194755
Change-Id: Ic82351591bd38c4c161bbb23c4033038d1d7fa85
Irfan Sheriff [Wed, 19 Sep 2012 12:50:35 +0000 (05:50 -0700)]
am
9fc59c99: Merge "Fix strings" into jb-mr1-dev
* commit '
9fc59c99efc9413546aa4a60a740f617730a08b0':
Fix strings
Irfan Sheriff [Wed, 19 Sep 2012 05:03:13 +0000 (22:03 -0700)]
Merge "Fix strings" into jb-mr1-dev
Brian Muramatsu [Wed, 19 Sep 2012 01:39:29 +0000 (18:39 -0700)]
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
Irfan Sheriff [Wed, 19 Sep 2012 04:03:42 +0000 (21:03 -0700)]
Fix strings
Bug:
7182012
Bug:
7071211
Change-Id: I34aa508d5e4151ffdc538a3ab9ae1ddf3749b345
Andy Stadler [Tue, 18 Sep 2012 23:31:39 +0000 (16:31 -0700)]
am
27f155a4: Merge "Rename file to satisfy strict Java requirement" into jb-mr1-dev
* commit '
27f155a4012aece82d58f7142960aec6414ade4d':
Rename file to satisfy strict Java requirement
Andy Stadler [Tue, 18 Sep 2012 23:26:19 +0000 (16:26 -0700)]
Merge "Rename file to satisfy strict Java requirement" into jb-mr1-dev
Michael Jurka [Tue, 18 Sep 2012 23:13:31 +0000 (16:13 -0700)]
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
Michael Jurka [Tue, 18 Sep 2012 23:11:29 +0000 (16:11 -0700)]
Merge "Fix bug: allow users to select "none" for lockscreen widget" into jb-mr1-dev
Jeff Sharkey [Tue, 18 Sep 2012 22:20:37 +0000 (15:20 -0700)]
am
220b06b1: Merge "Always show auto-sync; user-specific storage." into jb-mr1-dev
* commit '
220b06b1bb8cb2ac947f7fe6b911b8160f1186cd':
Always show auto-sync; user-specific storage.
Michael Jurka [Tue, 18 Sep 2012 22:17:58 +0000 (15:17 -0700)]
Fix bug: allow users to select "none" for lockscreen widget
Change-Id: Ibd0449899ce7c340a6f838c56de58b70538400fc
Jeff Sharkey [Tue, 18 Sep 2012 22:15:31 +0000 (15:15 -0700)]
Merge "Always show auto-sync; user-specific storage." into jb-mr1-dev
Brian Muramatsu [Tue, 18 Sep 2012 22:14:40 +0000 (15:14 -0700)]
am
a6c1b346: Merge "Add optional regulatory info page" into jb-mr1-dev
* commit '
a6c1b346ae0fc92170eb09f90c71b9c3d25d53eb':
Add optional regulatory info page
Jeff Sharkey [Tue, 18 Sep 2012 22:03:47 +0000 (15:03 -0700)]
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
Adam Cohen [Tue, 18 Sep 2012 21:59:44 +0000 (14:59 -0700)]
am
7956e726: Merge "Tweaking mechanism for adding keyguard widgets" into jb-mr1-dev
* commit '
7956e7263afd2007dc4262dc3c79dc74b14e8bf6':
Tweaking mechanism for adding keyguard widgets
Brian Muramatsu [Tue, 18 Sep 2012 21:59:35 +0000 (14:59 -0700)]
Merge "Add optional regulatory info page" into jb-mr1-dev
Dianne Hackborn [Tue, 18 Sep 2012 21:49:51 +0000 (14:49 -0700)]
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...
Adam Cohen [Tue, 18 Sep 2012 21:47:08 +0000 (14:47 -0700)]
Merge "Tweaking mechanism for adding keyguard widgets" into jb-mr1-dev
Andy Stadler [Tue, 18 Sep 2012 21:43:42 +0000 (14:43 -0700)]
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
Adam Cohen [Tue, 18 Sep 2012 20:26:29 +0000 (13:26 -0700)]
Tweaking mechanism for adding keyguard widgets
-> Fix for issue
7173877
-> Fix for issue
7173587
Change-Id: I266cafcf175c98e0c8a8401e11faa5dd2e2fa885
Dianne Hackborn [Tue, 18 Sep 2012 21:19:27 +0000 (14:19 -0700)]
Merge "Fix issue #
7050530: NPE in Settings : settings.applications.RunningServiceDetails..." into jb-mr1-dev
Dianne Hackborn [Tue, 18 Sep 2012 21:17:36 +0000 (14:17 -0700)]
Fix issue #
7050530: NPE in Settings : settings.applications.RunningServiceDetails...
...addDetailViews(RunningServiceDetails.java:439)
Change-Id: Id4a110bacf4da1bec07272b3b75e8bf0986cab92
Michael Jurka [Tue, 18 Sep 2012 21:03:44 +0000 (14:03 -0700)]
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
Michael Jurka [Tue, 18 Sep 2012 20:25:57 +0000 (13:25 -0700)]
Merge "Fix cases where app widget ids were not being cleaned up" into jb-mr1-dev
Dianne Hackborn [Tue, 18 Sep 2012 19:17:00 +0000 (12:17 -0700)]
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>...
Dianne Hackborn [Tue, 18 Sep 2012 19:07:19 +0000 (12:07 -0700)]
Merge "Fix issue #
7178865: Selecting an app from Settings > Apps>..." into jb-mr1-dev
Dianne Hackborn [Tue, 18 Sep 2012 19:04:00 +0000 (12:04 -0700)]
Fix issue #
7178865: Selecting an app from Settings > Apps>...
...all crashes on a secondary user
Change-Id: I977932bce3ea2816e4c9d1002488b658a96e3986
Brian Muramatsu [Tue, 18 Sep 2012 06:09:35 +0000 (23:09 -0700)]
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
Amith Yamasani [Tue, 18 Sep 2012 17:44:10 +0000 (10:44 -0700)]
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
Baligh Uddin [Tue, 18 Sep 2012 17:03:29 +0000 (10:03 -0700)]
am
05bf34c2: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
* commit '
05bf34c2559a8d800da18eabeb0214f559d4aeef':
Revert "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 18 Sep 2012 17:03:26 +0000 (10:03 -0700)]
am
fa69d3ed: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
fa69d3ed7518f81e6f6040fc4dbc5d5b479bcb2d':
Import translations. DO NOT MERGE
Amith Yamasani [Tue, 18 Sep 2012 16:55:20 +0000 (09:55 -0700)]
Merge "Add help menu for Users and Location access" into jb-mr1-dev
Amith Yamasani [Tue, 18 Sep 2012 16:51:07 +0000 (09:51 -0700)]
Add help menu for Users and Location access
Bug:
7093415
Bug:
7130812
Change-Id: I44c68e846dcc5d98fc8b152f79d75140e151323a
Baligh Uddin [Tue, 18 Sep 2012 14:24:52 +0000 (07:24 -0700)]
Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
OSDN Git Service
