OSDN Git Service
Elliott Hughes [Thu, 27 Jun 2013 22:02:35 +0000 (15:02 -0700)]
am
29bed78d: am
add37ef4: am
5f6e4339: Merge "Use SimpleDateFormat for time zone formatting."
* commit '
29bed78df624789d951eb6f491742bd29d7859ff':
Use SimpleDateFormat for time zone formatting.
Elliott Hughes [Thu, 27 Jun 2013 21:59:08 +0000 (14:59 -0700)]
am
add37ef4: am
5f6e4339: Merge "Use SimpleDateFormat for time zone formatting."
* commit '
add37ef4f2721bc791319e6794b310cfbd802533':
Use SimpleDateFormat for time zone formatting.
Elliott Hughes [Thu, 27 Jun 2013 21:55:54 +0000 (14:55 -0700)]
am
5f6e4339: Merge "Use SimpleDateFormat for time zone formatting."
* commit '
5f6e43394dd89432b241f32cd2c96d87c3ad5040':
Use SimpleDateFormat for time zone formatting.
Amith Yamasani [Thu, 27 Jun 2013 21:54:10 +0000 (14:54 -0700)]
am
9495b2f9: am
51d2ff75: am
bf87f7d7: Fix inconsistent string
* commit '
9495b2f9379edd3564142c1153b862e3386ca569':
Fix inconsistent string
Amith Yamasani [Thu, 27 Jun 2013 21:52:24 +0000 (14:52 -0700)]
am
51d2ff75: am
bf87f7d7: Fix inconsistent string
* commit '
51d2ff7561dafdb1371c46e5a5f1e0505bdbbb5e':
Fix inconsistent string
Elliott Hughes [Thu, 27 Jun 2013 21:52:23 +0000 (21:52 +0000)]
Merge "Use SimpleDateFormat for time zone formatting."
Amith Yamasani [Thu, 27 Jun 2013 21:46:36 +0000 (14:46 -0700)]
am
bf87f7d7: Fix inconsistent string
* commit '
bf87f7d78d7c09f6b928cc0a33e77c5130436c72':
Fix inconsistent string
Amith Yamasani [Thu, 27 Jun 2013 16:41:15 +0000 (09:41 -0700)]
Fix inconsistent string
Bug:
9602425
Change-Id: I2c5a2350668e48f12e821e0553df56ed08d373f5
Satoshi Kataoka [Thu, 27 Jun 2013 10:30:52 +0000 (19:30 +0900)]
Improve the language list in the personal dictionary
Bug:
9117704
Change-Id: I0b0fdb9418baa634eeaf4b8a65aebabe291aa005
Amith Yamasani [Wed, 26 Jun 2013 23:05:38 +0000 (23:05 +0000)]
Merge "Single-user restrictions"
Baligh Uddin [Wed, 26 Jun 2013 18:14:20 +0000 (11:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5917cd6f9fe5ce66a35315433a04841587b9b227
Auto-generated-cl: translation import
The Android Open Source Project [Wed, 26 Jun 2013 00:02:28 +0000 (17:02 -0700)]
am
42dc6df1: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
42dc6df115a0177f5459fecdf0236c73b1e2bdbe':
Amith Yamasani [Mon, 3 Jun 2013 23:41:03 +0000 (16:41 -0700)]
Single-user restrictions
New restrictions panel for restricting list of available apps for the user.
Apps that support restrictions can also be configured here.
Restrictions screen is PIN protected and will ask you to create a PIN the
first time you use it.
Change-Id: I7a5267df4272521ad80e6a8b6a18932d07179eb8
Elliott Hughes [Tue, 25 Jun 2013 23:30:45 +0000 (16:30 -0700)]
am
2295035a: am
b17fef80: am
02e23fb0: Merge "Clamp date setting for the SetupWizard as well as Settings."
* commit '
2295035a85b02d1b876bb76093cfcafa890ff0fb':
Clamp date setting for the SetupWizard as well as Settings.
The Android Open Source Project [Tue, 25 Jun 2013 23:13:54 +0000 (16:13 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ia9e51b0778c662f1da131e33627cacf6356898fc
Russell Brenner [Tue, 25 Jun 2013 22:20:33 +0000 (22:20 +0000)]
Merge "Setup fontsize change"
Baligh Uddin [Tue, 25 Jun 2013 19:47:35 +0000 (19:47 +0000)]
Merge "Import translations. DO NOT MERGE"
Elliott Hughes [Tue, 25 Jun 2013 17:16:27 +0000 (10:16 -0700)]
Use SimpleDateFormat for time zone formatting.
There's no need to do time zone formatting manually.
Change-Id: Ibef222d11d04a327e9ef64ddc48322558028555d
Elliott Hughes [Tue, 25 Jun 2013 16:57:43 +0000 (09:57 -0700)]
am
b17fef80: am
02e23fb0: Merge "Clamp date setting for the SetupWizard as well as Settings."
* commit '
b17fef801f4c26fdf116d706c3b9e30b522cb229':
Clamp date setting for the SetupWizard as well as Settings.
Elliott Hughes [Tue, 25 Jun 2013 16:56:06 +0000 (09:56 -0700)]
am
02e23fb0: Merge "Clamp date setting for the SetupWizard as well as Settings."
* commit '
02e23fb0eb96280c7874d8b5d65b56bb9fc284ba':
Clamp date setting for the SetupWizard as well as Settings.
Elliott Hughes [Tue, 25 Jun 2013 16:53:20 +0000 (16:53 +0000)]
Merge "Clamp date setting for the SetupWizard as well as Settings."
Baligh Uddin [Tue, 25 Jun 2013 02:10:28 +0000 (19:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id325314bba55c1c01716745c50337d92cfbb266f
Auto-generated-cl: translation import
Dianne Hackborn [Tue, 25 Jun 2013 01:19:25 +0000 (01:19 +0000)]
Merge "Use FastPrintWriter."
Dianne Hackborn [Mon, 24 Jun 2013 23:18:50 +0000 (16:18 -0700)]
Use FastPrintWriter.
Change-Id: If7f77185d7a76f14ac63f9c2af9911fb67ad97d9
Svetoslav [Tue, 25 Jun 2013 00:49:38 +0000 (17:49 -0700)]
Fix broken strings in Settings
Change-Id: I97b3b140b96894982d5d7753b6b3fc6dde2994a8
Elliott Hughes [Mon, 24 Jun 2013 23:11:19 +0000 (16:11 -0700)]
Clamp date setting for the SetupWizard as well as Settings.
We fixed this for Settings in
7ccfa0614caeba8eba5d3040a90541a24fa1e6c9,
but @sonymobile.com point out that it's still broken for SetupWizard.
Change-Id: I59348200105246f3ed7c0892e5f19b901d3e95ac
The Android Automerger [Mon, 24 Jun 2013 21:55:10 +0000 (14:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Mon, 24 Jun 2013 21:42:16 +0000 (14:42 -0700)]
Merge remote-tracking branch 'origin/jb-mr2-zeroday-release' into HEAD
Svetoslav Ganov [Wed, 12 Jun 2013 04:15:11 +0000 (21:15 -0700)]
Print - Settings
Change-Id: Id662a41fb189823c6d06aafc7e98996f3ef6c930
The Android Open Source Project [Fri, 21 Jun 2013 19:02:15 +0000 (12:02 -0700)]
am
11f5f984: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
11f5f98482e8cf1f237488aef6fef5cea8f9a900':
The Android Open Source Project [Fri, 21 Jun 2013 18:57:15 +0000 (11:57 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ide168995c4998dc00d65ced6e3187985566f8f49
The Android Automerger [Fri, 21 Jun 2013 18:35:55 +0000 (11:35 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Dianne Hackborn [Thu, 20 Jun 2013 21:42:18 +0000 (14:42 -0700)]
am
7f74dea7: am
67571084: am
5da4c907: Merge "Fix issue #
9486022: Disabled Apps column doesn\'t always show up in Manage Apps" into jb-mr2-dev
* commit '
7f74dea7a833b7c9c0370ce81decc21d44bda7b3':
Fix issue #
9486022: Disabled Apps column doesn't always show up in Manage Apps
Dianne Hackborn [Thu, 20 Jun 2013 21:40:57 +0000 (14:40 -0700)]
am
67571084: am
5da4c907: Merge "Fix issue #
9486022: Disabled Apps column doesn\'t always show up in Manage Apps" into jb-mr2-dev
* commit '
675710849a1209f929e387b19e3a7705f702f5bd':
Fix issue #
9486022: Disabled Apps column doesn't always show up in Manage Apps
Dianne Hackborn [Thu, 20 Jun 2013 21:39:39 +0000 (14:39 -0700)]
am
5da4c907: Merge "Fix issue #
9486022: Disabled Apps column doesn\'t always show up in Manage Apps" into jb-mr2-dev
* commit '
5da4c9079cc06c4ff4117cf6021d2e0800c99f37':
Fix issue #
9486022: Disabled Apps column doesn't always show up in Manage Apps
Dianne Hackborn [Thu, 20 Jun 2013 21:38:29 +0000 (21:38 +0000)]
Merge "Fix issue #
9486022: Disabled Apps column doesn't always show up in Manage Apps" into jb-mr2-dev
cecarrol [Thu, 20 Jun 2013 17:14:58 +0000 (10:14 -0700)]
Setup fontsize change
Changed the title font unit from sp to dp on setup screens.
Bug:
7680955
Change-Id: I2f5776d155a6ce1cec92622025f4434e2ae72aba
Baligh Uddin [Thu, 20 Jun 2013 16:33:38 +0000 (09:33 -0700)]
am
793ed6e0: (-s ours) am
178baecf: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit '
793ed6e051e96b4188ec3d7bd384fa0d47c6c85c':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Jun 2013 16:31:52 +0000 (09:31 -0700)]
am
178baecf: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit '
178baecf987e3aee0c29edfdf0b9ea5c3de1ec1d':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Jun 2013 16:27:54 +0000 (16:27 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 20 Jun 2013 16:27:38 +0000 (16:27 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
Baligh Uddin [Thu, 20 Jun 2013 15:37:36 +0000 (08:37 -0700)]
am
86d2f720: (-s ours) am
e0878e35: am
80a0d9a3: Import translations. DO NOT MERGE
* commit '
86d2f720fbd464053d6506bf7b5291fcffe1b600':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Jun 2013 15:36:12 +0000 (08:36 -0700)]
am
e0878e35: am
80a0d9a3: Import translations. DO NOT MERGE
* commit '
e0878e357023c260ed41dec8b20da7e9a265b2fa':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Jun 2013 15:33:56 +0000 (08:33 -0700)]
am
80a0d9a3: Import translations. DO NOT MERGE
* commit '
80a0d9a37c4c70c538bce0ae7bc2fd83339e15ac':
Import translations. DO NOT MERGE
The Android Open Source Project [Thu, 20 Jun 2013 14:20:14 +0000 (07:20 -0700)]
am
9b78ee91: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
9b78ee911303a9b9564f7225d02c0193f02b6aba':
Fix NullPointerException at RunningState
The Android Open Source Project [Thu, 20 Jun 2013 14:18:40 +0000 (07:18 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I4e1415d265b543bcfb24dc7b520162fee1f48806
Satoshi Kataoka [Wed, 19 Jun 2013 13:40:36 +0000 (22:40 +0900)]
Show subtype locales in the personal dictionary
...and change the destination of the intent
Bug:
9117704
Bug:
8856930
Change-Id: I39e55d2c5ca9a602f9a586625dcf25d5fb065a0a
Dianne Hackborn [Thu, 20 Jun 2013 00:01:51 +0000 (17:01 -0700)]
Fix issue #
9486022: Disabled Apps column doesn't always show up in Manage Apps
We need to resume the current tab before checking to see if
there are any disabled apps and deciding from that the number
of tabs to show.
Change-Id: I95037f15ff7a97f0234143d10ebcee79224a3114
Baligh Uddin [Wed, 19 Jun 2013 19:44:45 +0000 (12:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia1f1524bc2a0acef53267e9ec4a0531cbed48285
Auto-generated-cl: translation import
Baligh Uddin [Wed, 19 Jun 2013 19:41:33 +0000 (12:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie094379c6e1458b839192420b31291372b09dfda
Auto-generated-cl: translation import
Baligh Uddin [Wed, 19 Jun 2013 19:40:06 +0000 (12:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia1811e28f847bc50278d40cfe989e2fa284d0f12
Auto-generated-cl: translation import
Johan Redestig [Fri, 5 Oct 2012 08:33:16 +0000 (10:33 +0200)]
Fix NullPointerException at RunningState
getServiceInfo returns null if you have a service defined in the
manifest as: <service android:name=".Xxx" android:exported="false" />
or and in an <application> with no label or icon.
Dont crash the Settings application because of that.
Change-Id: I6f9f69c130e610b7e4ab66426177b7bade1e1515
Christopher Tate [Mon, 17 Jun 2013 20:02:01 +0000 (20:02 +0000)]
Merge "The Settings app needs privileged permissions"
Baligh Uddin [Mon, 17 Jun 2013 19:06:39 +0000 (12:06 -0700)]
am
94496184: (-s ours) am
7a42c809: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit '
94496184577381503d4771f13fc9d862d4b213db':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 17 Jun 2013 19:03:54 +0000 (12:03 -0700)]
am
7a42c809: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit '
7a42c80935c41b5db3151354f4a70d5a46413b74':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 17 Jun 2013 19:02:51 +0000 (19:02 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 17 Jun 2013 19:01:51 +0000 (19:01 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
Christopher Tate [Fri, 10 May 2013 21:11:05 +0000 (14:11 -0700)]
The Settings app needs privileged permissions
Bug
8765951
Change-Id: I42cfc32d961967b0a52027cbfb7c80b628715577
Baligh Uddin [Mon, 17 Jun 2013 16:32:27 +0000 (09:32 -0700)]
am
44789f92: (-s ours) am
f7c2889c: am
7f37c30b: (-s ours) Import translations. DO NOT MERGE
* commit '
44789f922bafbce8c818f2eaddbfb9c3fd77c5aa':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 17 Jun 2013 16:30:03 +0000 (09:30 -0700)]
am
f7c2889c: am
7f37c30b: (-s ours) Import translations. DO NOT MERGE
* commit '
f7c2889c451474eab1b4b86013e04b720eacc68e':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 17 Jun 2013 16:27:45 +0000 (09:27 -0700)]
am
7f37c30b: (-s ours) Import translations. DO NOT MERGE
* commit '
7f37c30b713e29494f00c85916fc4fee246f2936':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 17 Jun 2013 16:19:19 +0000 (09:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I87b579873e8290e3ccbf69ad9ecd9d2b1e2b49a5
Auto-generated-cl: translation import
Baligh Uddin [Mon, 17 Jun 2013 16:15:49 +0000 (09:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I37d7ec7d90da8ac2f9b4b48e75ddbaea44f02ae1
Auto-generated-cl: translation import
Baligh Uddin [Mon, 17 Jun 2013 16:14:19 +0000 (09:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7da4461fe8f9c64191a5e0c46ae6d5ad4d7293a1
Auto-generated-cl: translation import
Dianne Hackborn [Sat, 15 Jun 2013 00:39:48 +0000 (00:39 +0000)]
Merge "Following renaming of battery stats."
Chong Zhang [Sat, 15 Jun 2013 00:36:34 +0000 (00:36 +0000)]
Merge "wifi-display: use new getDisplays() method of WifiDisplayStatus"
Chong Zhang [Thu, 13 Jun 2013 00:56:16 +0000 (17:56 -0700)]
wifi-display: use new getDisplays() method of WifiDisplayStatus
which returns a list of all displays including currently availabe
and remembered ones, each display has properties indicating it's
availability, remembered and canConnect status
Bug
9229799
Change-Id: I1f74b9c41abdfecc10e7bc1853929e982c44be2f
Dianne Hackborn [Fri, 14 Jun 2013 02:07:28 +0000 (19:07 -0700)]
Following renaming of battery stats.
Change-Id: I889680dddf18fb2a480017199cc072a2d1469c27
Jean Chalard [Fri, 14 Jun 2013 08:59:23 +0000 (08:59 +0000)]
Merge "Fix a bug where a user dict entry is too long"
Jean Chalard [Fri, 14 Jun 2013 04:10:07 +0000 (13:10 +0900)]
Fix a bug where a user dict entry is too long
Since there is a maxLength attribute to the text field, if the
requested entry is too long for the text field it will be truncated,
then setSelection will crash with an IOOB exception.
Bug:
9410958
Change-Id: I7e916b4d77d338f49db7d3dab4e536d27ec76bc1
Baligh Uddin [Thu, 13 Jun 2013 16:01:53 +0000 (16:01 +0000)]
Merge "Import translations. DO NOT MERGE"
The Android Open Source Project [Thu, 13 Jun 2013 15:25:38 +0000 (08:25 -0700)]
am
bb3a943d: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
bb3a943d1bd9cb8f7cca76850d432cfb2a6307e1':
The Android Open Source Project [Thu, 13 Jun 2013 15:22:53 +0000 (08:22 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Id19d096814424b1c1253d633f9bc0e18d53dc360
The Android Automerger [Thu, 13 Jun 2013 12:55:31 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Open Source Project [Thu, 13 Jun 2013 01:10:13 +0000 (18:10 -0700)]
am
a5520e76: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
a5520e76911421956c7c4fe4e28ac60c64a276b9':
Import translations. DO NOT MERGE
The Android Open Source Project [Thu, 13 Jun 2013 01:04:45 +0000 (18:04 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I5a23b290d9a03dbae2ac2cbb7bcdebe84a773c55
Baligh Uddin [Wed, 12 Jun 2013 19:51:36 +0000 (12:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5b53d1be101da33a7aaa664eccf887e0b17c0b97
Auto-generated-cl: translation import
Baligh Uddin [Wed, 12 Jun 2013 21:30:13 +0000 (14:30 -0700)]
am
b45bac74: (-s ours) am
0117cc7c: Import translations. DO NOT MERGE
* commit '
b45bac74e9b6e25d131e894c7b98f899f0adf122':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Jun 2013 20:22:08 +0000 (13:22 -0700)]
am
0117cc7c: Import translations. DO NOT MERGE
* commit '
0117cc7ce562569d32fc18341111100068d11eff':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Jun 2013 19:55:00 +0000 (12:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib20c522937dfe8b4534c108832f2c04f3115c546
Auto-generated-cl: translation import
Baligh Uddin [Wed, 12 Jun 2013 19:51:36 +0000 (12:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5b53d1be101da33a7aaa664eccf887e0b17c0b97
Auto-generated-cl: translation import
Amith Yamasani [Tue, 11 Jun 2013 18:28:04 +0000 (18:28 +0000)]
Merge "Don't show tether settings in shortcut picker"
Amith Yamasani [Tue, 11 Jun 2013 18:04:44 +0000 (11:04 -0700)]
Don't show tether settings in shortcut picker
On devices that don't have tethering options, don't allow user
to create a shortcut to the tether settings.
Bug:
6865610
Change-Id: I2ebbd6ef98391ef3fe74130570bd9b70108a2aa9
Vinit Deshapnde [Tue, 11 Jun 2013 17:45:54 +0000 (17:45 +0000)]
Merge "Fix an NPE in WifiP2pSettings UI"
Amith Yamasani [Tue, 11 Jun 2013 17:10:50 +0000 (17:10 +0000)]
Merge "Remove Battery settings if battery is not present"
Baligh Uddin [Tue, 11 Jun 2013 15:42:54 +0000 (15:42 +0000)]
Merge "Import translations. DO NOT MERGE"
Vinit Deshapnde [Mon, 10 Jun 2013 19:28:48 +0000 (12:28 -0700)]
Fix an NPE in WifiP2pSettings UI
The NPE happens becase we save a references to the group that is to be
deleted, when the confirmation dialog is being shown to the user. We lose
that reference if orientation is changed (because the UI creates a new
WifiP2pSettings to interact with).
The fix is to save the name of the group that is being deleted in
persistent store, and re-select the group based on that.
Bug:
9004915
Change-Id: I1387a5b17fa2773748f4c8b34adddfc9516cfcf3
The Android Open Source Project [Mon, 10 Jun 2013 18:11:50 +0000 (11:11 -0700)]
am
302bd5c7: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
302bd5c78a860081ce63d7faba9b20c7d9af4092':
Don't show ApnEditor as a dialog
Import translations. DO NOT MERGE
Allow hidden apps to opt-out
resolved conflicts for merge of
5d21820a to jb-mr2-dev
Fix issue #
9074296: Device Admins can activate in a way...
Ensure all active Device Admins are listed.
Baligh Uddin [Mon, 10 Jun 2013 17:06:42 +0000 (10:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: I29a30e6c327e84cb2f41a123a168baf6906e577b
Auto-generated-cl: translation import
The Android Open Source Project [Mon, 10 Jun 2013 15:14:09 +0000 (08:14 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I7d22fa6b33c4e77725ae40de89fa6d83be4e8551
The Android Automerger [Sun, 9 Jun 2013 12:55:49 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Amith Yamasani [Fri, 7 Jun 2013 17:19:55 +0000 (10:19 -0700)]
Don't show ApnEditor as a dialog
Else it would be missing the menu buttons.
Bug:
7328535
Change-Id: I8e30eec0b3d23dadd9ab6f1efbaa185fe1b6b431
Baligh Uddin [Wed, 5 Jun 2013 18:51:21 +0000 (11:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4278f061c26bccc1713791f43a3cd81d69268d36
Auto-generated-cl: translation import
Amith Yamasani [Thu, 6 Jun 2013 21:48:07 +0000 (14:48 -0700)]
Allow hidden apps to opt-out
When a system app doesn't have any UI, it wasn't being considered for
opt-out. Check for all system apps that want to opt-out and mark them
for uninstallation.
Bug:
8908632
Change-Id: Iad7ccbe544cc7c7ebf73f430fbab8d295eb40219
Alex Klyubin [Thu, 6 Jun 2013 22:45:23 +0000 (15:45 -0700)]
resolved conflicts for merge of
5d21820a to jb-mr2-dev
Change-Id: If371a4571c5440ce2a0b4339f97893bf78832b31
Dianne Hackborn [Wed, 22 May 2013 18:29:36 +0000 (11:29 -0700)]
Fix issue #
9074296: Device Admins can activate in a way...
...that makes it impossible to deactive/uninstall them
Don't allow device admins to directly launch the add UI if
they are malformed.
Change-Id: I0d3140222d8015f680e1f199bddae2221ee0e726
Alex Klyubin [Wed, 22 May 2013 16:06:35 +0000 (09:06 -0700)]
Ensure all active Device Admins are listed.
Bug:
9074296
Change-Id: Ifb70c12ccea6628042b98a18186816887cb4477b
Amith Yamasani [Fri, 7 Jun 2013 21:57:38 +0000 (14:57 -0700)]
am
29294d84: am
f3e827e8: Merge "Don\'t show ApnEditor as a dialog" into jb-mr2-dev
* commit '
29294d8408c3a754ea118160d29931e5646a5e1a':
Don't show ApnEditor as a dialog
Amith Yamasani [Fri, 7 Jun 2013 21:55:09 +0000 (14:55 -0700)]
am
f3e827e8: Merge "Don\'t show ApnEditor as a dialog" into jb-mr2-dev
* commit '
f3e827e83da8d6aa70850c85bbe87d2f9feb82b1':
Don't show ApnEditor as a dialog
Amith Yamasani [Fri, 7 Jun 2013 21:53:15 +0000 (21:53 +0000)]
Merge "Don't show ApnEditor as a dialog" into jb-mr2-dev
OSDN Git Service
