OSDN Git Service
Svetoslav Ganov [Mon, 24 Sep 2012 07:52:10 +0000 (00:52 -0700)]
am
1bd69f9a: am
0a48c169: Merge "Remove accessibility category from developer options." into jb-mr1-dev
* commit '
1bd69f9abab775ec1aceee53153c3a7e5aa329ec':
Remove accessibility category from developer options.
Dianne Hackborn [Mon, 24 Sep 2012 07:52:04 +0000 (00:52 -0700)]
Baligh Uddin [Mon, 24 Sep 2012 07:51:49 +0000 (00:51 -0700)]
am
e6bb67f8: (-s ours) am
936186c6: Revert "Import translations. DO NOT MERGE"
* commit '
e6bb67f811eac5dcc93f417a2eade0a6d4905abf':
Revert "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 24 Sep 2012 07:51:22 +0000 (00:51 -0700)]
am
fb7cb4d3: (-s ours) am
8172ea49: Import translations. DO NOT MERGE
* commit '
fb7cb4d3ddeb6d4250cd4d02d05a705030b0dc21':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 22 Sep 2012 21:22:58 +0000 (14:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I24f5f103806bd5012567cf50060af86aa1fc53c6
Auto-generated-cl: translation import
Svetoslav Ganov [Sat, 22 Sep 2012 00:15:42 +0000 (17:15 -0700)]
am
0a48c169: Merge "Remove accessibility category from developer options." into jb-mr1-dev
* commit '
0a48c1690bd0aa7901e8fc737ca9e4dadec22ea4':
Remove accessibility category from developer options.
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:07:09 +0000 (17:07 -0700)]
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:37:25 +0000 (16:37 -0700)]
am
936186c6: Revert "Import translations. DO NOT MERGE"
* commit '
936186c614903f79cc562c005801f95863cbe054':
Revert "Import translations. DO NOT MERGE"
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:13:01 +0000 (16:13 -0700)]
am
8172ea49: Import translations. DO NOT MERGE
* commit '
8172ea490f5880b1e2df2856364c3d37c28ed155':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 21 Sep 2012 22:51:22 +0000 (15:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I080c6d857c61332eb79644ce5d3085c5d39dd78c
Auto-generated-cl: translation import
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
Michael Jurka [Fri, 21 Sep 2012 08:15:29 +0000 (01:15 -0700)]
am
cbf5be09: am
406b01f4: Merge "Add support for changing status widget on security screen" into jb-mr1-dev
* commit '
cbf5be09b072a7caa7558a30cfdf5cf1d584dc84':
Add support for changing status widget on security screen
Michael Jurka [Fri, 21 Sep 2012 08:13:11 +0000 (01:13 -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
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:13:18 +0000 (23:13 -0700)]
am
10e59b1c: am
e4f249bb: Merge "Exclude dying users when querying the list" into jb-mr1-dev
* commit '
10e59b1c6e4d381d5ea8f653ab191eb41d31c026':
Exclude dying users when querying the list
Amith Yamasani [Fri, 21 Sep 2012 06:11:00 +0000 (23:11 -0700)]
am
e4f249bb: Merge "Exclude dying users when querying the list" into jb-mr1-dev
* commit '
e4f249bb7a9f999633d938d0c519631764bf969c':
Exclude dying users when querying the list
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
Fabrice Di Meglio [Fri, 21 Sep 2012 03:31:12 +0000 (20:31 -0700)]
am
38dd190c: am
377ab9c2: Merge "Fix bug #
7198585 Settings > Display > Dream completely broken in RTL" into jb-mr1-dev
* commit '
38dd190c9811eccc8a65a7acde043dd6b37cbf80':
Fix bug #
7198585 Settings > Display > Dream completely broken in RTL
Fabrice Di Meglio [Fri, 21 Sep 2012 03:22:54 +0000 (20:22 -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
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
The Android Open Source Project [Thu, 20 Sep 2012 19:49:00 +0000 (12:49 -0700)]
am
a9ac2a46: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
a9ac2a46d1c718cfbe5e15bb1ad78217e236417f':
Fix NPE in DeviceInfoSettings
Fix a crash in InstalledAppDetails
Tweaking mechanism for adding keyguard widgets
Fix issue #
7178865: Selecting an app from Settings > Apps>...
Must initialize the new atomic..
Fix crash in Settings > Security
The Android Open Source Project [Thu, 20 Sep 2012 17:37:00 +0000 (10:37 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I2692af987f16852c90fa0826367700862c6ea23b
The Android Automerger [Thu, 20 Sep 2012 14:00:29 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jeff Brown [Thu, 20 Sep 2012 13:18:45 +0000 (06:18 -0700)]
am
cf0c0089: am
9e143f5e: First draft of wifi display settings UI.
* commit '
cf0c0089c68b45d14e897cf86aecd781b07df049':
First draft of wifi display settings UI.
Jeff Sharkey [Thu, 20 Sep 2012 13:18:44 +0000 (06:18 -0700)]
am
b4923465: am
99340f36: Merge "Update string to reflect removed users." into jb-mr1-dev
* commit '
b4923465f8397e16bf49f478853436c0641ed774':
Update string to reflect removed users.
Brian Muramatsu [Thu, 20 Sep 2012 13:18:42 +0000 (06:18 -0700)]
am
29200053: am
801a1588: Merge "Fix regulatory information dialog appearance" into jb-mr1-dev
* commit '
29200053d654d98a4f283da64b4e65e4a2364185':
Fix regulatory information dialog appearance
Jeff Sharkey [Thu, 20 Sep 2012 13:18:41 +0000 (06:18 -0700)]
am
d975473a: am
ee9ecf0a: Merge "Migrate UI to supportsMultipleUsers()." into jb-mr1-dev
* commit '
d975473a9258b9f461930b0432a8e04c665a9f1f':
Migrate UI to supportsMultipleUsers().
Jeff Brown [Thu, 20 Sep 2012 13:09:39 +0000 (06:09 -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:08:57 +0000 (06:08 -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:08:00 +0000 (06:08 -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:07:29 +0000 (06:07 -0700)]
am
ee9ecf0a: Merge "Migrate UI to supportsMultipleUsers()." into jb-mr1-dev
* commit '
ee9ecf0ac6695bc80ba4bc3256989c307f85fd1d':
Migrate UI to supportsMultipleUsers().
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
Brian Muramatsu [Wed, 19 Sep 2012 22:21:23 +0000 (15:21 -0700)]
am
0bce702c: am
185ba407: Fix NPE in DeviceInfoSettings
* commit '
0bce702c5f1ea9369f85a1375e8dbc3cad540368':
Fix NPE in DeviceInfoSettings
Jeff Sharkey [Wed, 19 Sep 2012 22:20:26 +0000 (15:20 -0700)]
am
2ae699c3: am
8882ccdd: Load user photos through system_server.
* commit '
2ae699c3740e5ca0d80bfde1dc6ec66ddd3f5138':
Load user photos through system_server.
Jeff Sharkey [Wed, 19 Sep 2012 22:20:25 +0000 (15:20 -0700)]
am
bcd519d2: am
f5de1db2: Omit PPTP VPNs from lockdown list.
* commit '
bcd519d20c0bb8b3f13aa209bbe6de443c15e262':
Omit PPTP VPNs from lockdown list.
Amith Yamasani [Wed, 19 Sep 2012 22:20:20 +0000 (15:20 -0700)]
am
6d17289e: am
b92e9afe: Merge "Fix a crash in InstalledAppDetails" into jb-mr1-dev
* commit '
6d17289e778faa5c92fb7e54972e9d13be60aef9':
Fix a crash in InstalledAppDetails
Irfan Sheriff [Wed, 19 Sep 2012 22:19:03 +0000 (15:19 -0700)]
am
92484c85: am
9fc59c99: Merge "Fix strings" into jb-mr1-dev
* commit '
92484c85228f264d8b86820a10af81e2b67929f8':
Fix strings
Jeff Sharkey [Wed, 19 Sep 2012 21:52:33 +0000 (14:52 -0700)]
Merge "Migrate UI to supportsMultipleUsers()." into jb-mr1-dev
Brian Muramatsu [Wed, 19 Sep 2012 18:19:54 +0000 (11:19 -0700)]
Fix NPE in DeviceInfoSettings
Bug
7192187
Change-Id: I6d404e5228c7f66e37137a27ebd555a88dda2f74
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
Brian Muramatsu [Wed, 19 Sep 2012 21:08:52 +0000 (14:08 -0700)]
am
185ba407: Fix NPE in DeviceInfoSettings
* commit '
185ba407bab02c1442d02b82800f0220779ecb10':
Fix NPE in DeviceInfoSettings
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:23:50 +0000 (11:23 -0700)]
am
8882ccdd: Load user photos through system_server.
* commit '
8882ccdd3eafc338213b312f1b73fb4de1776a60':
Load user photos through system_server.
Jeff Sharkey [Wed, 19 Sep 2012 18:23:49 +0000 (11:23 -0700)]
am
f5de1db2: Omit PPTP VPNs from lockdown list.
* commit '
f5de1db28a61d159e62ef42f64a2cdcb316d0c2c':
Omit PPTP VPNs from lockdown list.
Amith Yamasani [Wed, 19 Sep 2012 18:16:52 +0000 (11:16 -0700)]
am
b92e9afe: Merge "Fix a crash in InstalledAppDetails" into jb-mr1-dev
* commit '
b92e9afe4d056ca69a43450dc5be6ffb7efa1ea1':
Fix a crash in InstalledAppDetails
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
The Android Automerger [Wed, 19 Sep 2012 14:01:47 +0000 (07:01 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Irfan Sheriff [Wed, 19 Sep 2012 05:04:55 +0000 (22:04 -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 [Wed, 19 Sep 2012 00:16:34 +0000 (17:16 -0700)]
am
eaec8255: am
27f155a4: Merge "Rename file to satisfy strict Java requirement" into jb-mr1-dev
* commit '
eaec8255584a0f551c7fd463c5c37179d926f250':
Rename file to satisfy strict Java requirement
Michael Jurka [Wed, 19 Sep 2012 00:16:33 +0000 (17:16 -0700)]
am
2be38ba7: am
dddef157: Merge "Fix bug: allow users to select "none" for lockscreen widget" into jb-mr1-dev
* commit '
2be38ba7c1af98f2a4d5de7175bd62ca4a559a35':
Fix bug: allow users to select "none" for lockscreen widget
Andy Stadler [Tue, 18 Sep 2012 23:54:51 +0000 (16:54 -0700)]
am
27f155a4: Merge "Rename file to satisfy strict Java requirement" into jb-mr1-dev
* commit '
27f155a4012aece82d58f7142960aec6414ade4d':
Rename file to satisfy strict Java requirement
Michael Jurka [Tue, 18 Sep 2012 23:54:43 +0000 (16:54 -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
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
Conflicts:
src/com/android/settings/SecuritySettings.java
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: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:33:40 +0000 (15:33 -0700)]
am
c2bb090a: am
220b06b1: Merge "Always show auto-sync; user-specific storage." into jb-mr1-dev
* commit '
c2bb090a523964c76040874186706906fab29354':
Always show auto-sync; user-specific storage.
Brian Muramatsu [Tue, 18 Sep 2012 22:33:34 +0000 (15:33 -0700)]
am
61d698f5: am
a6c1b346: Merge "Add optional regulatory info page" into jb-mr1-dev
* commit '
61d698f5fbf839b7a3d4c4bb4ff68be3e962984d':
Add optional regulatory info page
Jeff Sharkey [Tue, 18 Sep 2012 22:23:33 +0000 (15:23 -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:31 +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
Brian Muramatsu [Tue, 18 Sep 2012 21:59:35 +0000 (14:59 -0700)]
Merge "Add optional regulatory info page" into jb-mr1-dev
Adam Cohen [Tue, 18 Sep 2012 21:58:46 +0000 (14:58 -0700)]
am
2a111678: am
7956e726: Merge "Tweaking mechanism for adding keyguard widgets" into jb-mr1-dev
* commit '
2a1116788636175fa4e502a4e6102cf71f8c8dba':
Tweaking mechanism for adding keyguard widgets
Dianne Hackborn [Tue, 18 Sep 2012 21:54:11 +0000 (14:54 -0700)]
am
d9c029f8: am
9ba3d227: Merge "Fix issue #
7050530: NPE in Settings : settings.applications.RunningServiceDetails..." into jb-mr1-dev
* commit '
d9c029f8372057d14d52fee5e6e842926b8c3b6f':
Fix issue #
7050530: NPE in Settings : settings.applications.RunningServiceDetails...
Adam Cohen [Tue, 18 Sep 2012 21:54:09 +0000 (14:54 -0700)]
am
7956e726: Merge "Tweaking mechanism for adding keyguard widgets" into jb-mr1-dev
* commit '
7956e7263afd2007dc4262dc3c79dc74b14e8bf6':
Tweaking mechanism for adding keyguard widgets
Dianne Hackborn [Tue, 18 Sep 2012 21:51:45 +0000 (14:51 -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 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
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 20:29:43 +0000 (13:29 -0700)]
am
71e7bd69: am
221e4356: Merge "Fix cases where app widget ids were not being cleaned up" into jb-mr1-dev
* commit '
71e7bd696f103493e7c0fb25305494eededbe936':
Fix cases where app widget ids were not being cleaned up
Michael Jurka [Tue, 18 Sep 2012 20:27:25 +0000 (13:27 -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:27:42 +0000 (12:27 -0700)]
am
09707bec: am
ba088af9: Merge "Fix issue #
7178865: Selecting an app from Settings > Apps>..." into jb-mr1-dev
* commit '
09707bec1e0a3781de92f308a0146679c19cb716':
Fix issue #
7178865: Selecting an app from Settings > Apps>...
Dianne Hackborn [Tue, 18 Sep 2012 19:15:28 +0000 (12:15 -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:14:11 +0000 (10:14 -0700)]
am
0a072906: am
3e3b75f2: Merge "Add help menu for Users and Location access" into jb-mr1-dev
* commit '
0a0729063d6a81a93377d7c086da834bcec9148d':
Add help menu for Users and Location access
OSDN Git Service
