OSDN Git Service
Lukasz Anaczkowski [Mon, 13 May 2013 15:11:12 +0000 (17:11 +0200)]
Add information about OpenGL driver version
Change-Id: Icf107642b6d84a85c90c7411d6e42e9b6c6ef739
Signed-off-by: Lukasz Anaczkowski <lukasz.anaczkowski@intel.com>
Daniel Leung [Wed, 2 May 2012 23:37:00 +0000 (16:37 -0700)]
Added Manufacturer to device info
Added an item to display manufacturer in device info page.
For: AIA-438
Change-Id: Iae28759653089cf6fc757c1f76b7ee39638144b0
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
Jackson Hsu [Thu, 29 Dec 2011 02:13:03 +0000 (10:13 +0800)]
Implement poweroff function in Settings menu
Bugzilla 8729 13343
Add "Power Off" layout under "About tablet" in Settings menu. System can
shutdown when you touch "ok", otherwise back to home screen.
Change-Id: I1c572dca93203e02dd829247d20806a43966e64f
Signed-off-by: Jackson Hsu <jacksonx.hsu@intel.com>
Wink Saville [Fri, 30 Aug 2013 02:58:09 +0000 (19:58 -0700)]
Use correct action string for provisioning.
Change to use the correct action string
com.adnroid.server.connectivityservice.CONNECTED_TO_PROVISIONING_NETWORK
Bug:
10551510
Change-Id: I917de4fcde06b72f520dec38e42c50859b2ee098
Wink Saville [Wed, 28 Aug 2013 21:26:27 +0000 (14:26 -0700)]
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Bug:
10328264
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
Dianne Hackborn [Sat, 3 Aug 2013 01:22:42 +0000 (18:22 -0700)]
Reset app preferences now resets all app ops.
Change-Id: I7966245b5f322f55e139b2da661c02cd58530f11
Jean-Baptiste Queru [Fri, 2 Aug 2013 21:48:27 +0000 (14:48 -0700)]
Reconcile with AOSP jb-mr2-dev - do not merge
Dianne Hackborn [Mon, 1 Jul 2013 19:54:54 +0000 (12:54 -0700)]
Completely remove app ops activity.
Change-Id: Ibe2f15c9ff7589fd5527a0f249d7c1eeca868c8a
Dave Burke [Fri, 2 Aug 2013 20:36:33 +0000 (20:36 +0000)]
Merge "Revert "Completely remove app ops activity."" into jb-mr2-dev
Dave Burke [Fri, 2 Aug 2013 20:25:35 +0000 (20:25 +0000)]
Revert "Completely remove app ops activity."
This reverts commit
1ad26e9c370e3db3ac801bda42b3fa52ab2e2d07.
Change-Id: I58b5ea280ed0dbff00f7f6f98fbd41575cdd5222
Sascha Prueter [Thu, 1 Aug 2013 20:55:38 +0000 (20:55 +0000)]
Merge "Completely remove app ops activity." into jb-mr2-dev
Baligh Uddin [Mon, 29 Jul 2013 17:53:05 +0000 (10:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5ab9317a61cf7adb7c911ac19770e9ae7d4f935b
Auto-generated-cl: translation import
Baligh Uddin [Wed, 24 Jul 2013 19:14:17 +0000 (12:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iddc12747b1f57abb0a10f452b551332e86d2ba3c
Auto-generated-cl: translation import
Baligh Uddin [Mon, 22 Jul 2013 18:08:10 +0000 (11:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2f0dc917cd2d67b4478f74d0e2dccec53eb9f921
Auto-generated-cl: translation import
Baligh Uddin [Thu, 18 Jul 2013 21:30:01 +0000 (14:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I09a9a2433e7be85d771059ecd1c4a514a3f61371
Auto-generated-cl: translation import
Robert Greenwalt [Wed, 17 Jul 2013 23:47:01 +0000 (23:47 +0000)]
Merge "Use ConnectivityManager for mobile provision url" into jb-mr2-dev
Robert Greenwalt [Tue, 16 Jul 2013 20:09:24 +0000 (13:09 -0700)]
Use ConnectivityManager for mobile provision url
bug:
9623159
Change-Id: I36697ed341353b7a3dbec5afe20241102e76f6f1
Baligh Uddin [Mon, 15 Jul 2013 18:36:58 +0000 (11:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0f107b738c6aa5f0aeb538ccf991f64fac47fd5c
Auto-generated-cl: translation import
Wink Saville [Fri, 12 Jul 2013 18:58:56 +0000 (18:58 +0000)]
Merge "VZW wants the phoneNumber to be 10 zero's if there isn't one." into jb-mr2-dev
Wink Saville [Thu, 11 Jul 2013 05:19:26 +0000 (22:19 -0700)]
VZW wants the phoneNumber to be 10 zero's if there isn't one.
Bug:
9784059
Change-Id: I41bba908855648d2560440655d8a75a7cb2e0859
Baligh Uddin [Thu, 11 Jul 2013 03:28:57 +0000 (20:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6b02734b2ef1396af16da6e8102cdbb6ca79a50c
Auto-generated-cl: translation import
Baligh Uddin [Mon, 8 Jul 2013 16:17:21 +0000 (09:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7d34201de76770bcb6a1998c6d898830ca290006
Auto-generated-cl: translation import
Baligh Uddin [Wed, 3 Jul 2013 20:54:27 +0000 (13:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia71c4566436300b1c190865f9dc0d490d62d8ebb
Auto-generated-cl: translation import
Baligh Uddin [Tue, 2 Jul 2013 16:34:18 +0000 (16:34 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Wink Saville [Sat, 29 Jun 2013 14:54:13 +0000 (07:54 -0700)]
Add Manage mobile plan to Settings.
Bug:
9279964
Change-Id: I42c326a21e05aa301e9d974ed9ac1d59472780ec
Dianne Hackborn [Mon, 1 Jul 2013 19:54:54 +0000 (12:54 -0700)]
Completely remove app ops activity.
Change-Id: Ibe2f15c9ff7589fd5527a0f249d7c1eeca868c8a
Baligh Uddin [Mon, 1 Jul 2013 16:19:04 +0000 (09:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I69c1ffe7da49a43516d5233f6f4c7cec6227eb04
Auto-generated-cl: translation import
Amith Yamasani [Thu, 27 Jun 2013 16:41:15 +0000 (09:41 -0700)]
Fix inconsistent string
Bug:
9602425
Change-Id: I2c5a2350668e48f12e821e0553df56ed08d373f5
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
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:40:06 +0000 (12:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia1811e28f847bc50278d40cfe989e2fa284d0f12
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
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 [Fri, 7 Jun 2013 21:53:15 +0000 (21:53 +0000)]
Merge "Don't show ApnEditor as a dialog" into jb-mr2-dev
Baligh Uddin [Fri, 7 Jun 2013 19:19:40 +0000 (19:19 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Amith Yamasani [Fri, 7 Jun 2013 17:45:26 +0000 (17:45 +0000)]
Merge "Allow hidden apps to opt-out" into 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
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
Alex Klyubin [Thu, 6 Jun 2013 22:41:41 +0000 (15:41 -0700)]
am
5aa3f878: (-s ours) am
0c32da7e: am
6f28e342: am
9f6a1933: am
0ffbbad5: am
60544e74: am
3dddd8cb: Ensure all active Device Admins are listed.
* commit '
5aa3f8782432c79d01702ca6a7214793501bd476':
Ensure all active Device Admins are listed.
Alex Klyubin [Thu, 6 Jun 2013 22:35:41 +0000 (15:35 -0700)]
am
a65fa934: am
8bfb859e: am
8d5aeffa: am
089d1615: am
01dbfbf9: am
efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev
* commit '
a65fa934f19ebfe59a8458be733e783292ad8d9c':
Permit deactivation of malformed Device Admins.
Alex Klyubin [Thu, 6 Jun 2013 22:35:34 +0000 (15:35 -0700)]
am
0c32da7e: am
6f28e342: am
9f6a1933: am
0ffbbad5: am
60544e74: am
3dddd8cb: Ensure all active Device Admins are listed.
* commit '
0c32da7ee01f7f523a889c5faf1a449e664f8bce':
Ensure all active Device Admins are listed.
Alex Klyubin [Thu, 6 Jun 2013 22:33:46 +0000 (15:33 -0700)]
am
8bfb859e: am
8d5aeffa: am
089d1615: am
01dbfbf9: am
efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev
* commit '
8bfb859e3b81a9b6448c17cfb02a0aa748580231':
Permit deactivation of malformed Device Admins.
Alex Klyubin [Thu, 6 Jun 2013 22:33:45 +0000 (15:33 -0700)]
am
6f28e342: am
9f6a1933: am
0ffbbad5: am
60544e74: am
3dddd8cb: Ensure all active Device Admins are listed.
* commit '
6f28e3420ade08f05588d35937b772ffb5cdaf83':
Ensure all active Device Admins are listed.
Alex Klyubin [Thu, 6 Jun 2013 22:32:00 +0000 (15:32 -0700)]
am
8d5aeffa: am
089d1615: am
01dbfbf9: am
efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev
* commit '
8d5aeffa7dc27eba60fe4c64be6a89e645091958':
Permit deactivation of malformed Device Admins.
Alex Klyubin [Thu, 6 Jun 2013 22:32:00 +0000 (15:32 -0700)]
am
9f6a1933: am
0ffbbad5: am
60544e74: am
3dddd8cb: Ensure all active Device Admins are listed.
* commit '
9f6a193394de16bfe398c8b7424f273231c77134':
Ensure all active Device Admins are listed.
Alex Klyubin [Thu, 6 Jun 2013 22:29:56 +0000 (15:29 -0700)]
am
089d1615: am
01dbfbf9: am
efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev
* commit '
089d161588f07862ac1e8876a39227e4110b2bec':
Permit deactivation of malformed Device Admins.
Alex Klyubin [Thu, 6 Jun 2013 22:29:56 +0000 (15:29 -0700)]
am
0ffbbad5: am
60544e74: am
3dddd8cb: Ensure all active Device Admins are listed.
* commit '
0ffbbad5b1ad34bb2add06f7ec030191ed94e866':
Ensure all active Device Admins are listed.
Alex Klyubin [Thu, 6 Jun 2013 22:28:53 +0000 (15:28 -0700)]
am
01dbfbf9: am
efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev
* commit '
01dbfbf9c3e14253b7c3a2e822c55c013d0e4b17':
Permit deactivation of malformed Device Admins.
Alex Klyubin [Thu, 6 Jun 2013 22:28:52 +0000 (15:28 -0700)]
am
60544e74: am
3dddd8cb: Ensure all active Device Admins are listed.
* commit '
60544e74b689c5c9e6e47e6b1c50582fe37d0a70':
Ensure all active Device Admins are listed.
Alex Klyubin [Thu, 6 Jun 2013 22:26:49 +0000 (15:26 -0700)]
am
efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev
* commit '
efd88e2c468db2169ff9bb17f2b89c246756dcda':
Permit deactivation of malformed Device Admins.
Alex Klyubin [Thu, 6 Jun 2013 22:26:48 +0000 (15:26 -0700)]
am
3dddd8cb: Ensure all active Device Admins are listed.
* commit '
3dddd8cbff8c8153363373ebe9911d67f0e50bcd':
Ensure all active Device Admins are listed.
Alex Klyubin [Thu, 6 Jun 2013 22:25:29 +0000 (22:25 +0000)]
Merge "Permit deactivation of malformed Device Admins." into jb-dev
Alex Klyubin [Thu, 6 Jun 2013 21:56:24 +0000 (14:56 -0700)]
Permit deactivation of malformed Device Admins.
Bug:
9074296
Change-Id: I4a3b2f972cb297b9f985a762219c8d67d8e3a425
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 [Wed, 22 May 2013 16:06:35 +0000 (09:06 -0700)]
Ensure all active Device Admins are listed.
Bug:
9074296
(cherry picked from commit
d14258e50efc3677abef3cd204b67e7f26e47b56)
Conflicts:
src/com/android/settings/DeviceAdminSettings.java
Changes made to make the cherry-pick apply:
* Dropped PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS in the
PackageManager.queryBroadcastReceivers invocation. The above
flag was introduced in API Level 18.
Change-Id: I65596c49bedad7e39ceb1785859c129db1e3e6d7
Dianne Hackborn [Thu, 6 Jun 2013 19:51:50 +0000 (12:51 -0700)]
am
9cd1d5e2: (-s ours) am
a9a28d2f: am
f96a86c9: am
6d80d477: am
0bccd7e7: am
5f28c77b: am
d6086125: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
9cd1d5e2c07248e9cc22721d9373ebf1fcf9dba2':
Fix issue #
9074296: Device Admins can activate in a way...
Dianne Hackborn [Thu, 6 Jun 2013 19:35:00 +0000 (12:35 -0700)]
am
a9a28d2f: am
f96a86c9: am
6d80d477: am
0bccd7e7: am
5f28c77b: am
d6086125: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
a9a28d2feeccdd2deacf6fcfb96abfcdeed58ddf':
Fix issue #
9074296: Device Admins can activate in a way...
Dianne Hackborn [Thu, 6 Jun 2013 19:32:46 +0000 (12:32 -0700)]
am
f96a86c9: am
6d80d477: am
0bccd7e7: am
5f28c77b: am
d6086125: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
f96a86c99d7505e15a39266967cf4d4d75295af1':
Fix issue #
9074296: Device Admins can activate in a way...
Dianne Hackborn [Thu, 6 Jun 2013 19:30:51 +0000 (12:30 -0700)]
am
6d80d477: am
0bccd7e7: am
5f28c77b: am
d6086125: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
6d80d477391c6ad14a6bcdb044c3351de4e20481':
Fix issue #
9074296: Device Admins can activate in a way...
Dianne Hackborn [Thu, 6 Jun 2013 19:29:04 +0000 (12:29 -0700)]
am
0bccd7e7: am
5f28c77b: am
d6086125: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
0bccd7e7f4d6fe4d5c7e1fef151f50ebed7addaf':
Fix issue #
9074296: Device Admins can activate in a way...
Dianne Hackborn [Thu, 6 Jun 2013 19:26:39 +0000 (12:26 -0700)]
am
5f28c77b: am
d6086125: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
5f28c77bc64deb132082eaab0ebd544ba5111bd0':
Fix issue #
9074296: Device Admins can activate in a way...
Dianne Hackborn [Thu, 6 Jun 2013 19:23:05 +0000 (12:23 -0700)]
am
d6086125: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
d60861258169083f3174734af821fc8078ec5d2f':
Fix issue #
9074296: Device Admins can activate in a way...
Amith Yamasani [Thu, 6 Jun 2013 18:16:31 +0000 (18:16 +0000)]
Merge "Fix NullPointerException at RunningState" into jb-mr2-dev
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
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.
(cherry picked from commit
8274b6770219a469ab8a5254206d0d81bd5c96d3)
Changes due to make the cherry-pick apply:
* Replaced PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS with 0
in the PackageManager.queryBroadcastReceivers invocation. The above
constant was introduced in API Level 18 only. DeviceAdminSettings
class from which this fix was extracted is not passing in the above
flag when it invokes queryBroadcastReceivers either.
Change-Id: I64d2792cd06bacbd4bfc600a10046d51a9383606
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
Baligh Uddin [Mon, 3 Jun 2013 18:48:00 +0000 (11:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I59c9aa5dbbce1520b7f0a0c6357849ef9c7dbd76
Auto-generated-cl: translation import
Baligh Uddin [Fri, 31 May 2013 22:43:38 +0000 (22:43 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Robert Greenwalt [Thu, 30 May 2013 18:33:36 +0000 (11:33 -0700)]
Don't show scan-always text if it is off.
bug:
9206410
Change-Id: If7e06f50d3d8db6ea198f437d4d268e65ec96c16
Baligh Uddin [Thu, 30 May 2013 02:29:10 +0000 (19:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I484fae1bba709cad545b168242e79291e9599346
Auto-generated-cl: translation import
Baligh Uddin [Wed, 29 May 2013 03:56:37 +0000 (03:56 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Russell Brenner [Tue, 28 May 2013 20:22:40 +0000 (20:22 +0000)]
Merge "Improved logic for Skip warning message" into jb-mr2-dev
Baligh Uddin [Mon, 27 May 2013 18:58:11 +0000 (11:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3808f0d486b1050f53c5f3d9129f758d66db68df
Auto-generated-cl: translation import
Russell Brenner [Fri, 24 May 2013 21:28:08 +0000 (14:28 -0700)]
Improved logic for Skip warning message
Use ConnectivityManager instead of TelephonyManager to determine
how device is connected.
Bug:
9118704
Change-Id: I5c1db90500591ca67e927976066a46e1f66e2e60
Baligh Uddin [Thu, 23 May 2013 07:31:54 +0000 (00:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I42d8fcaccbdec16d54e85adcd73e4c455097715d
Auto-generated-cl: translation import
Amith Yamasani [Wed, 22 May 2013 22:04:59 +0000 (22:04 +0000)]
Merge "Update strings for clarity about restricted profiles" into jb-mr2-dev
Alex Klyubin [Wed, 22 May 2013 21:06:32 +0000 (21:06 +0000)]
Merge "Ensure all active Device Admins are listed." into jb-mr2-dev
Amith Yamasani [Wed, 22 May 2013 19:51:30 +0000 (12:51 -0700)]
Update strings for clarity about restricted profiles
Bug:
9051422
Bug:
9051178
Change-Id: I1b88286fdd0db27bb6980d0ebbc846370fd0082e
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 [Tue, 21 May 2013 23:07:28 +0000 (16:07 -0700)]
Write restriction bundle right away for required apps.
User shouldn't have to go tap on the settings icon for an app that is ON by default
in a restricted profile. This way apps can write some defaults to the restricted
profile when it is created.
The app entry is also automatically removed from the list if there are no visible
restrictions.
Bug:
9074051
Also fix an incorrect dialog label. Bug:
9068877
Change-Id: I2a7ddc31fe695f58611d2ba36a8bf541b7817b10
Amith Yamasani [Mon, 20 May 2013 22:56:47 +0000 (15:56 -0700)]
Don't mutate all instances of app icons in Settings
When adding color filters to an app icon in User Settings, don't
modify the original drawable state. Get a mutable drawable.
Bug:
9054675
Change-Id: I6ea374cb801abef3f5b597fda2e84b4e67cfa9d0
Amith Yamasani [Sat, 18 May 2013 00:37:14 +0000 (00:37 +0000)]
Merge "Load the avatar icon if it's not yet in the activity view" into jb-mr2-dev
Amith Yamasani [Fri, 17 May 2013 20:32:26 +0000 (13:32 -0700)]
Load the avatar icon if it's not yet in the activity view
Save any changes that weren't committed yet, but don't restore
earlier cancelled changes.
Bug:
9008014
Change-Id: I8faacc42a3600d1338ddedb1b59f7307903743b4
Baligh Uddin [Fri, 17 May 2013 19:17:02 +0000 (12:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idaa8cda2a62a48bfaf80cd2a3c848ab99179dcda
Auto-generated-cl: translation import
John Spurlock [Thu, 16 May 2013 15:36:26 +0000 (15:36 +0000)]
Merge "Hide notification listeners setting if no listeners." into jb-mr2-dev
Amith Yamasani [Thu, 16 May 2013 00:01:42 +0000 (00:01 +0000)]
Merge "Return proper result code after creating pin/password lock" into jb-mr2-dev
Amith Yamasani [Wed, 15 May 2013 18:26:19 +0000 (11:26 -0700)]
Return proper result code after creating pin/password lock
When adding a new restricted profile, user must enter some lockscreen
security. For PIN/password, return the result code (instead of cancelled)
so that UserSettings can proceed with adding the profile.
Bug:
8909229
Change-Id: I3567d7dfac869e38762f9e2a45d8ec83c51fa657
John Spurlock [Wed, 15 May 2013 13:38:10 +0000 (09:38 -0400)]
Hide notification listeners setting if no listeners.
Hide the new notification listeners management setting when
no listeners using this API are available.
Bug:
8454150
Change-Id: Iae9f975e7b5a3cdf55ff7d0c6aea7e84166d53b3
Amith Yamasani [Tue, 14 May 2013 21:54:27 +0000 (21:54 +0000)]
Merge "Add a settings icon to restricted profile config header" into jb-mr2-dev
Amith Yamasani [Mon, 13 May 2013 21:54:48 +0000 (14:54 -0700)]
Add a settings icon to restricted profile config header
This is to make it obvious that the header invokes user info settings.
Bug:
8888002
Also fix a minor copy/paste error in contentDesription attribute.
Change-Id: I3a90b0d691df8302fee696d82c5819f43109ae8e
Robert Greenwalt [Mon, 13 May 2013 21:11:19 +0000 (21:11 +0000)]
Merge "Remove wifi scan-always dialog." into jb-mr2-dev
Robert Greenwalt [Mon, 13 May 2013 18:39:08 +0000 (11:39 -0700)]
Remove wifi scan-always dialog.
When wifi is switched off we no longer want a notification dialog
about scan-always, instead using in-panel text.
bug:
8907190
Change-Id: I707f306a056068d92f69070873f1e6330b598b1e
Baligh Uddin [Mon, 13 May 2013 16:42:52 +0000 (09:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7bfc101728e9083d730511df65771c9899ab6549
Auto-generated-cl: translation import
Svetoslav [Wed, 8 May 2013 21:33:13 +0000 (21:33 +0000)]
Merge "Settings crashing if there are no installed accessibility services." into jb-mr2-dev
Svetoslav [Wed, 8 May 2013 19:14:15 +0000 (12:14 -0700)]
Settings crashing if there are no installed accessibility services.
If there is no installed accessibility services and the user goes into
the accessibility settings section, the app crashes. This is due to a
lacking null pointer check against the list of installed services
returned by the accessibility manager. We should not have returned
null, rather an empty list - too late now, sigh...
bug:
8871034
Change-Id: Id3800d398af83868862847fa7ed861a9dee61c8f
Baligh Uddin [Wed, 8 May 2013 18:03:17 +0000 (11:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I693437e166d38e6b56a9b568c455daebfde8694d
Auto-generated-cl: translation import
Baligh Uddin [Mon, 6 May 2013 18:59:20 +0000 (11:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib1986e8c494733193e49c1504a4cc9396649a324
Auto-generated-cl: translation import
Baligh Uddin [Fri, 3 May 2013 20:12:52 +0000 (13:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6905b70a4bfdbab57f787be455fead0a995904a2
Auto-generated-cl: translation import
Baligh Uddin [Wed, 1 May 2013 17:43:33 +0000 (10:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: I09ddb61e89b8dfee57a2a4e6c3331a0737f1f290
Auto-generated-cl: translation import
OSDN Git Service
