OSDN Git Service
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
Jake Hamby [Fri, 26 Apr 2013 21:38:15 +0000 (14:38 -0700)]
Show correct A2DP connection status in Bluetooth settings.
When BluetoothSettings is entered via QuickSettings while an A2DP
device is connected, we aren't showing the device connection
status in the UI, because the device list is created before we've
connected to the A2DP and Headset profile services, and we weren't
refreshing the device list UI after getting the callback for
onServiceConnected() and retrieving the list of connected devices.
Add a line to HeadsetServiceListener.onServiceConnected() to call
device.refresh() after we call device.onProfileStateChanged() to
refresh the device list UI. Also copy the logic into A2dpProfile's
onServiceConnected() callback so it will refresh the UI for any
connected A2DP devices.
The reason this bug doesn't show up when entering BT settings
from the main Settings screen is because the onServiceConnected()
callbacks happen before the device list is initialized, so the
UI items are created with the correct connection status. For the
same reason, the bug doesn't occur if the Settings app is already
running and we re-enter it via Bluetooth QuickSettings.
Bug:
8724247
Change-Id: I1a993636ecab18dd6e980e3b4d2485bbed256d74
Baligh Uddin [Tue, 30 Apr 2013 07:42:26 +0000 (00:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I81f4941adbfc66c70b241062ae75b4740a065a08
Auto-generated-cl: translation import
Irfan Sheriff [Mon, 29 Apr 2013 22:59:00 +0000 (22:59 +0000)]
Merge "Add reminder about scan settings on wifi off" into jb-mr2-dev
Amith Yamasani [Mon, 29 Apr 2013 17:43:05 +0000 (10:43 -0700)]
Prompt to set a screen lock when adding a restricted profile
Bug:
8735493
If there's no screen lock, prompt to take the user to set a lock.
On return, check if user set the screen lock. If so, add the restricted
profile, otherwise don't add it.
Fix a small layout issue: Bug:
8721209
Change-Id: I2a18fea50a1d810d6a7fa82038b460ca4e03d5a0
Irfan Sheriff [Fri, 26 Apr 2013 22:11:26 +0000 (15:11 -0700)]
Add reminder about scan settings on wifi off
Notify the user that scans will be available when
wifi is turned off
Bug:
8732391
Change-Id: If232bfb9f6c3976059bde11280318901c35161e7
Amith Yamasani [Mon, 29 Apr 2013 05:13:22 +0000 (22:13 -0700)]
Three kinds of owner info - owner, user and profile
Bug:
8736733
Put the summary "Restricted profile" under the user name in app restrictions panel.
Bug:
8736734
Change-Id: I6b724bd10a9246eb57831bffb737a48c01e0c285
Amith Yamasani [Sun, 28 Apr 2013 04:58:53 +0000 (04:58 +0000)]
Merge "Save app toggle state as soon as possible" into jb-mr2-dev
Amith Yamasani [Fri, 26 Apr 2013 21:55:01 +0000 (14:55 -0700)]
Save app toggle state as soon as possible
Delaying applying the states till onPause() sometimes results in the apps
disappearing slowly as the new user is booting up, causing failed queued up
broadcasts that result in crash dialogs. This happens mainly when the user
switch is initiated via QuickSettings->LockScreen->Switch while the App
restrictions screen is still showing. The onPause() gets called when
SetupWizard actually takes focus, which is quite late, as boot completed
and other events have already been queued.
Apply the initial toggles right away and apply any user changes when primary
is going to background, or onPause(), whichever comes first.
Bug:
8685927
Also ensure that apps with restrictions get a chance to persist their defaults
as soon as they are toggled on. The user may never actually click on the settings
icon for the app (which was the only way they were getting persisted before).
Some new strings for an upcoming change.
Change-Id: I96f453d066a91c6b15eafe9a6ce3f42d98bf5e33
Svetoslav [Fri, 26 Apr 2013 22:14:46 +0000 (22:14 +0000)]
Merge "Scroll if an accessibility setting description does not fit the screen." into jb-mr2-dev
Baligh Uddin [Fri, 26 Apr 2013 21:50:35 +0000 (21:50 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Svetoslav [Fri, 26 Apr 2013 17:45:33 +0000 (10:45 -0700)]
Scroll if an accessibility setting description does not fit the screen.
1. Certain accessibility settings are shown on a separate screen with
a toggle switch and a description. Sometimes the description does not
fit the screen. The preference framework is using a list view for
holding the description item. This list view was disabled, thus not
scrolling (done to avoid drawable state change on click). Now the
list view is enabled and the drawable state change on click problem
is solved by setting the selector and divider drawables to a
transparent one.
2. The layout for the list item that shows the feature description had
an unnecessary linear layout.
bug:
8632146
Change-Id: Ib81a8513158d5b8d90fa80f57720c8590022ae1a
Baligh Uddin [Fri, 26 Apr 2013 17:52:46 +0000 (10:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I902e886b71e60da9c34d682a8b7c4f2453c06375
Auto-generated-cl: translation import
Amith Yamasani [Fri, 26 Apr 2013 04:35:54 +0000 (21:35 -0700)]
Always include default system IMEs for restricted profiles
Add default IMEs to an exclusion set so that we don't include them in the
list of toggleable system apps that we show the user.
Bug:
8724246
Unrevert the change to include disabled apps, as the above change fixes the
reason for the revert.
Bug:
8713202
Change-Id: Ifced841ad3bfbde33d2403356216dd1749b7fa9a
Amith Yamasani [Thu, 25 Apr 2013 22:22:25 +0000 (22:22 +0000)]
Merge "Revert "Disabled apps should also be shown in restricted profiles app list"" into jb-mr2-dev
Amith Yamasani [Thu, 25 Apr 2013 21:39:23 +0000 (21:39 +0000)]
Revert "Disabled apps should also be shown in restricted profiles app list"
This is breaking restricted profiles because the Google Keyboard suddenly
shows up in the list as disabled and InputMethodManagerService crashes
if the only available keyboard is not installed for the profile.
This reverts commit
90dcd7469b7e776f508a0767b9db46005af0e8da
Change-Id: Idd7c4f0f93a973b777889865e80c53caad759a63
Daniel Sandler [Thu, 25 Apr 2013 21:04:01 +0000 (21:04 +0000)]
Merge "Follow API changes to NotificationListener." into jb-mr2-dev
Daniel Sandler [Thu, 25 Apr 2013 21:01:01 +0000 (17:01 -0400)]
Follow API changes to NotificationListener.
Requires change If3062b9f in f/b
Bug:
8656860
Change-Id: Ib3dc57489b7308f0515a2a19c5c6451607ff1796
Svetoslav [Thu, 25 Apr 2013 20:32:46 +0000 (20:32 +0000)]
Merge "CircleFramedDrawable incorrectly has implicit dependency on the hosting view size." into jb-mr2-dev
Baligh Uddin [Thu, 25 Apr 2013 19:15:31 +0000 (19:15 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Thu, 25 Apr 2013 19:05:11 +0000 (12:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iad94d22f497a67893855012a0732678f25f8e50d
Auto-generated-cl: translation import
Amith Yamasani [Thu, 25 Apr 2013 18:03:33 +0000 (11:03 -0700)]
Disabled apps should also be shown in restricted profiles app list
If we don't show disabled system apps for toggling, they'll end up
being automatically included in the restricted profile.
Make sure that we also list disabled apps.
Bug:
8713202
Change-Id: I8f2facf496f669dfe963cdabf3d29d393097a80b
Svetoslav [Thu, 25 Apr 2013 17:33:08 +0000 (10:33 -0700)]
CircleFramedDrawable incorrectly has implicit dependency on the hosting view size.
CircleFramedDrawable was trying to draw itself as big as the hosting view by
looking at the canvas size. However, due to inconsistent API behavior for the
cases with and without hardware acceleration the canvas size returns the
size of clipped canvas or the size of the entire canvas, respectively. While
we should fix the inconsistent API behavior, it is not correct for a lower
level component to know about the higher level one, i.e. a drawable trying
to infer the size of the hosting view. The hosting view should set the size
of the drawable. This change removes the dependency on the host view size and
if one wants to enlarge the drawable, he/she should just set the scale.
bug:
8671059
Change-Id: Idc572da7dff60fd10cb37d3c3eca27aac2c0a21f
Svetoslav [Thu, 25 Apr 2013 01:44:50 +0000 (01:44 +0000)]
Merge "The touch exploration capability is dynamically granted pre-JellyBeanMR2." into jb-mr2-dev
Svetoslav [Wed, 24 Apr 2013 22:03:41 +0000 (15:03 -0700)]
The touch exploration capability is dynamically granted pre-JellyBeanMR2.
Since the enable touch exploration capability is dynamically granted by
the user for apps targeting pre-JellybeanMR2 API level, we have to avoid
caching copies of the service info.
Framework change:https://googleplex-android-review.googlesource.com/#/c/301722
bug:
8633951
Change-Id: I2b409ca92931d1409e885d6f54e0f10cbece2e80
Amith Yamasani [Wed, 24 Apr 2013 21:54:15 +0000 (21:54 +0000)]
Merge "Rename limited users to restricted profiles" into jb-mr2-dev
Amith Yamasani [Wed, 24 Apr 2013 21:21:06 +0000 (14:21 -0700)]
Rename limited users to restricted profiles
Bug:
8705996
Change-Id: Ibf6a2e0e14ce095758fb9be982710b584b76f15d
Maggie Benthall [Wed, 24 Apr 2013 19:58:23 +0000 (19:58 +0000)]
Merge "UI compliance for WifiSettings" into jb-mr2-dev
Maggie Benthall [Tue, 23 Apr 2013 19:03:22 +0000 (15:03 -0400)]
UI compliance for WifiSettings
Rename and reword string that appears in WifiSettings when user is
restricted from modifying the networks.
Bug:
8696370
Change-Id: I1945550c05163ebff9602e4ba8ba890fece61265
Baligh Uddin [Wed, 24 Apr 2013 17:25:21 +0000 (10:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iddaad41f96f86f10ac141f29c97beb396c949715
Auto-generated-cl: translation import
Amith Yamasani [Wed, 24 Apr 2013 01:49:07 +0000 (01:49 +0000)]
Merge "Final refactoring of the user/profile settings screen." into jb-mr2-dev
Amith Yamasani [Tue, 23 Apr 2013 18:44:59 +0000 (11:44 -0700)]
Final refactoring of the user/profile settings screen.
Name restricted users as restricted profiles and group them all
together.
Bug:
8697415
Change-Id: I18acc6b61bfb12a8e1540eb022a73b29783789e1
Jake Hamby [Tue, 9 Apr 2013 22:48:25 +0000 (15:48 -0700)]
Add support to display regulatory info from *#07#.
Add a new action and Activity so the phone dialer can display
regulatory info via "*#07#".
Regulatory info is supplied per device by a Settings app resource
overlay. This overlay must set the boolean resource
"config_show_regulatory_info" to true, and provide either a drawable
named "regulatory_info.png" with the info in graphical form, or a
string resource named "regulatory_info_text" containing the required
information in HTML format.
Bug:
8259869
Change-Id: I73c1431a1a6d1736f9d3e4bd5be7e3771c85cbcb