OSDN Git Service
Svetoslav [Wed, 8 May 2013 22:05:28 +0000 (15:05 -0700)]
am
6b8c7e7c: am
7e554395: Merge "Settings crashing if there are no installed accessibility services." into jb-mr2-dev
* commit '
6b8c7e7c33fbf7d6425baf7003222b7603ac8ef5':
Settings crashing if there are no installed accessibility services.
Baligh Uddin [Wed, 8 May 2013 22:04:41 +0000 (15:04 -0700)]
am
eb8e9c11: (-s ours) am
2c766ba5: Import translations. DO NOT MERGE
* commit '
eb8e9c11ede066a7b28c51b3492ce7253304cb5b':
Import translations. DO NOT MERGE
Svetoslav [Wed, 8 May 2013 21:37:00 +0000 (14:37 -0700)]
am
7e554395: Merge "Settings crashing if there are no installed accessibility services." into jb-mr2-dev
* commit '
7e554395cbf3d3c1043e99fb080bd9148832c225':
Settings crashing if there are no installed accessibility services.
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:28:49 +0000 (11:28 -0700)]
am
2c766ba5: Import translations. DO NOT MERGE
* commit '
2c766ba56c740ec09f071144014272f4d922d518':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 8 May 2013 18:07:07 +0000 (11:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5681e12c45cbea55910772e7761dc122bc55ff71
Auto-generated-cl: translation import
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
Satoshi Kataoka [Wed, 8 May 2013 09:54:25 +0000 (09:54 +0000)]
Merge "Fix the label for the personal dictionary settings"
Satoshi Kataoka [Wed, 8 May 2013 07:15:45 +0000 (16:15 +0900)]
Fix the label for the personal dictionary settings
Bug:
8859441
Change-Id: I18ae1e1d92e1280e1782685b99307f1e48ce8e66
Dianne Hackborn [Mon, 6 May 2013 23:33:20 +0000 (23:33 +0000)]
Merge "Update UI to add new audio app ops."
Baligh Uddin [Mon, 6 May 2013 23:20:44 +0000 (16:20 -0700)]
am
7f4c7641: (-s ours) am
c6adece0: Import translations. DO NOT MERGE
* commit '
7f4c7641e0ce85162eb8f5c8846e35db29a068f7':
Import translations. DO NOT MERGE
Dianne Hackborn [Tue, 30 Apr 2013 22:06:22 +0000 (15:06 -0700)]
Update UI to add new audio app ops.
Change-Id: I307d25bdd6bee2e7d7a9df32849ef206abaf2318
Baligh Uddin [Mon, 6 May 2013 20:56:04 +0000 (13:56 -0700)]
am
c8e75eaa: (-s ours) am
6681e954: Import translations. DO NOT MERGE
* commit '
c8e75eaaab0f7aa4177f151b2d31de26c3e4c32a':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 6 May 2013 19:31:30 +0000 (12:31 -0700)]
am
c6adece0: Import translations. DO NOT MERGE
* commit '
c6adece066c2bc282db92547913a8aa43831c5f0':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 6 May 2013 19:02:35 +0000 (12:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id8e754017aac82b1b423b8f3b02f4191d71a58dd
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 [Mon, 6 May 2013 18:11:29 +0000 (11:11 -0700)]
am
6681e954: Import translations. DO NOT MERGE
* commit '
6681e954a8d05d818b9bd89a1302ac2d8875ab77':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 4 May 2013 23:11:09 +0000 (23:11 +0000)]
Merge "Import translations. DO NOT MERGE"
Romain Guy [Sat, 4 May 2013 00:38:38 +0000 (17:38 -0700)]
Add new GPU overdraw setting
Change-Id: I45404b37df382e51eea42de92535f49f870c98b2
Baligh Uddin [Fri, 3 May 2013 20:16:25 +0000 (13:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: I706e8606b77d5ec1076c4954911da5aefb6b1805
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 20:50:56 +0000 (13:50 -0700)]
am
e9160a24: (-s ours) am
6c886cd3: Import translations. DO NOT MERGE
* commit '
e9160a243154b338653e43e3e415caa84c2790ae':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 1 May 2013 20:48:35 +0000 (13:48 -0700)]
am
6c886cd3: Import translations. DO NOT MERGE
* commit '
6c886cd394e0960a1ed41a785e05b38a57ee8209':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 1 May 2013 17:47:18 +0000 (10:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I124056964f65373288bf0ba1c530b6764b4c0abf
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 [Wed, 1 May 2013 00:18:08 +0000 (17:18 -0700)]
am
0c3cc878: am
18c4317b: Show correct A2DP connection status in Bluetooth settings.
* commit '
0c3cc878586ef1caa3ac5a13a719dd9924cc0d1b':
Show correct A2DP connection status in Bluetooth settings.
Jake Hamby [Wed, 1 May 2013 00:04:59 +0000 (17:04 -0700)]
am
18c4317b: Show correct A2DP connection status in Bluetooth settings.
* commit '
18c4317b93fce47109017efdab089dec4b01f790':
Show correct A2DP connection status in Bluetooth settings.
Baligh Uddin [Tue, 30 Apr 2013 23:45:50 +0000 (16:45 -0700)]
am
af05f177: (-s ours) am
e3eb601d: Import translations. DO NOT MERGE
* commit '
af05f177f2fb866a8cef4278d383e321a8491855':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Apr 2013 23:42:39 +0000 (16:42 -0700)]
am
e3eb601d: Import translations. DO NOT MERGE
* commit '
e3eb601dc232ba9a14396ec26368e0a0f14084c7':
Import translations. DO NOT MERGE
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
Svetoslav Ganov [Tue, 30 Apr 2013 17:17:13 +0000 (17:17 +0000)]
Merge "Remove Accessibility shortcut if the shortcut is not available"
Kenny Root [Tue, 30 Apr 2013 16:01:44 +0000 (09:01 -0700)]
am
64914364: resolved conflicts for merge of
3c10f535 to jb-mr2-dev-plus-aosp
* commit '
649143648073116b2ffb6af412b41ecec5280f86':
Track change to JSSE provider
Irfan Sheriff [Tue, 30 Apr 2013 15:54:23 +0000 (08:54 -0700)]
am
3b22f4d2: am
3caffdb3: Merge "Add reminder about scan settings on wifi off" into jb-mr2-dev
* commit '
3b22f4d2da535cd865e8dfd9f06f3ce273e20c0f':
Add reminder about scan settings on wifi off
Amith Yamasani [Tue, 30 Apr 2013 15:54:00 +0000 (08:54 -0700)]
am
60167266: am
f162efee: Prompt to set a screen lock when adding a restricted profile
* commit '
60167266877d59407939a83c475e794e050c1e8a':
Prompt to set a screen lock when adding a restricted profile
Baligh Uddin [Tue, 30 Apr 2013 15:37:08 +0000 (15:37 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 30 Apr 2013 07:45:30 +0000 (00:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I76329240b2241ff7c949f725efa875425569bc16
Auto-generated-cl: translation import
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
Satoshi Kataoka [Tue, 30 Apr 2013 05:30:12 +0000 (14:30 +0900)]
Fix the title of the fragments of the personal dictionary settings
Bug:
8600958
Change-Id: I9b8bab21b144385bc2386e7fcb67e1c197f84113
Kenny Root [Tue, 30 Apr 2013 06:30:40 +0000 (23:30 -0700)]
resolved conflicts for merge of
3c10f535 to jb-mr2-dev-plus-aosp
Change-Id: Id4ab035f92f2a8bf1b1fefdfd22ba370e33e7829
Kenny Root [Tue, 30 Apr 2013 04:01:45 +0000 (04:01 +0000)]
Merge "Track change to JSSE provider"
Irfan Sheriff [Mon, 29 Apr 2013 23:01:56 +0000 (16:01 -0700)]
am
3caffdb3: Merge "Add reminder about scan settings on wifi off" into jb-mr2-dev
* commit '
3caffdb343ba0bcb71396c6077355b0606d2f9eb':
Add reminder about scan settings on wifi off
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 21:15:57 +0000 (14:15 -0700)]
am
f162efee: Prompt to set a screen lock when adding a restricted profile
* commit '
f162efee8995c8d7a26992e72fe771c41b790e39':
Prompt to set a screen lock when adding a restricted profile
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
Amith Yamasani [Mon, 29 Apr 2013 19:14:41 +0000 (12:14 -0700)]
am
b4a0838d: am
b0171715: Three kinds of owner info - owner, user and profile
* commit '
b4a0838d08198fd93be99ce2907b3f9b70f0d7bc':
Three kinds of owner info - owner, user and profile
Amith Yamasani [Mon, 29 Apr 2013 19:14:37 +0000 (12:14 -0700)]
am
9649c3eb: am
c5b03657: Merge "Save app toggle state as soon as possible" into jb-mr2-dev
* commit '
9649c3ebbe08e310bdc42dbfce48b64d7246a202':
Save app toggle state as soon as possible
Kenny Root [Mon, 29 Apr 2013 19:14:37 +0000 (12:14 -0700)]
am
d7d5f4d1: am
c814271f: Merge "Fix Clear Credentials item"
* commit '
d7d5f4d1bfedda52c2686a08a62dec1fa02dba58':
Fix Clear Credentials item
Svetoslav [Mon, 29 Apr 2013 18:22:03 +0000 (11:22 -0700)]
am
7c2a89c9: am
4b43e21c: Merge "Scroll if an accessibility setting description does not fit the screen." into jb-mr2-dev
* commit '
7c2a89c9f5f4c728b552a6ea64b312c2538854e4':
Scroll if an accessibility setting description does not fit the screen.
Baligh Uddin [Mon, 29 Apr 2013 18:21:57 +0000 (11:21 -0700)]
am
584a9026: am
837526fc: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
584a90263223243c2af1e7991740515e22950143':
Import translations. DO NOT MERGE
Kenny Root [Wed, 24 Apr 2013 05:38:23 +0000 (22:38 -0700)]
Track change to JSSE provider
Change-Id: I25d6612b12ab46b1f5c88c400b95bba1c023398a
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:23:20 +0000 (22:23 -0700)]
am
b0171715: Three kinds of owner info - owner, user and profile
* commit '
b0171715876b672c94c8a5aaafde95ff47b234b4':
Three kinds of owner info - owner, user and profile
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
Jaewan Kim [Tue, 23 Apr 2013 14:32:27 +0000 (23:32 +0900)]
Remove Accessibility shortcut if the shortcut is not available
Bug:
8051556
Change-Id: Ic6b552e818a1bd2fea6fdae2e755f31420abfbe6
Jaewan Kim [Fri, 19 Apr 2013 04:40:23 +0000 (13:40 +0900)]
Remove Airplane Mode setting if it's a stationary device
Bug:
8051556
Change-Id: I3a1d5d58573b8967ce40ccf8b76e24152fff6fb6
Amith Yamasani [Sun, 28 Apr 2013 05:01:09 +0000 (22:01 -0700)]
am
c5b03657: Merge "Save app toggle state as soon as possible" into jb-mr2-dev
* commit '
c5b036571ed2eeae73b0551848e7f7efdc016a52':
Save app toggle state as soon as possible
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
Kenny Root [Sat, 27 Apr 2013 22:01:04 +0000 (15:01 -0700)]
am
c814271f: Merge "Fix Clear Credentials item"
* commit '
c814271fe4117a6c94a314a349edd8d7222cf2c0':
Fix Clear Credentials item
Kenny Root [Sat, 27 Apr 2013 21:39:30 +0000 (21:39 +0000)]
Merge "Fix Clear Credentials item"
Kenny Root [Mon, 22 Apr 2013 20:41:18 +0000 (13:41 -0700)]
Fix Clear Credentials item
This should be enabled whenever there is a credential in the keystore
since there can be unencrypted credentials in there now.
(cherry picked from commit
c4372c3e3fd2d0be54341973bd72ec618931057c)
Bug:
8651830
Change-Id: Ie06f20cf90f5a359975cb30d67052f8867b429b9
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:16:50 +0000 (15:16 -0700)]
am
4b43e21c: Merge "Scroll if an accessibility setting description does not fit the screen." into jb-mr2-dev
* commit '
4b43e21c647864c8105394f353d4533777e7f9c7':
Scroll if an accessibility setting description does not fit the screen.
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:53:26 +0000 (14:53 -0700)]
am
837526fc: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
837526fceaa39f88ac468406108faacd557f2d28':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 26 Apr 2013 21:50:56 +0000 (21:50 +0000)]
Merge "Import translations. DO NOT MERGE"
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:55:51 +0000 (10:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4e1ef0256b87fef9461cd8750f9a5446eba9e91b
Auto-generated-cl: translation import
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 17:50:10 +0000 (10:50 -0700)]
am
4424d159: am
a7a93784: Always include default system IMEs for restricted profiles
* commit '
4424d1594968909c1c261bbd06094677906bbfb2':
Always include default system IMEs for restricted profiles
Amith Yamasani [Fri, 26 Apr 2013 17:47:18 +0000 (10:47 -0700)]
am
a7a93784: Always include default system IMEs for restricted profiles
* commit '
a7a93784d1f9798d37cb618def1a558f8d626f0f':
Always include default system IMEs for restricted profiles
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 [Fri, 26 Apr 2013 00:14:40 +0000 (17:14 -0700)]
am
c3e973c5: am
0cb93523: Merge "Revert "Disabled apps should also be shown in restricted profiles app list"" into jb-mr2-dev
* commit '
c3e973c5da358489f6b7042d5be982e4e7ea6d00':
Revert "Disabled apps should also be shown in restricted profiles app list"
Daniel Sandler [Fri, 26 Apr 2013 00:14:40 +0000 (17:14 -0700)]
am
1344ec19: am
77f71cb2: Merge "Follow API changes to NotificationListener." into jb-mr2-dev
* commit '
1344ec191894e88c998ff091c2afc16e870c46bc':
Follow API changes to NotificationListener.
Svetoslav [Fri, 26 Apr 2013 00:14:39 +0000 (17:14 -0700)]
am
259668d8: am
410e2df4: Merge "CircleFramedDrawable incorrectly has implicit dependency on the hosting view size." into jb-mr2-dev
* commit '
259668d82ffb66c35a97ea5fff8acf39d948019d':
CircleFramedDrawable incorrectly has implicit dependency on the hosting view size.
Amith Yamasani [Thu, 25 Apr 2013 23:58:03 +0000 (16:58 -0700)]
am
0cb93523: Merge "Revert "Disabled apps should also be shown in restricted profiles app list"" into jb-mr2-dev
* commit '
0cb93523b261c8779119ffa1cd7a45cf2d6b3814':
Revert "Disabled apps should also be shown in restricted profiles app list"
Daniel Sandler [Thu, 25 Apr 2013 23:58:02 +0000 (16:58 -0700)]
am
77f71cb2: Merge "Follow API changes to NotificationListener." into jb-mr2-dev
* commit '
77f71cb226203bf3f87eec749296feb3ecd18f43':
Follow API changes to NotificationListener.
Svetoslav [Thu, 25 Apr 2013 23:58:01 +0000 (16:58 -0700)]
am
410e2df4: Merge "CircleFramedDrawable incorrectly has implicit dependency on the hosting view size." into jb-mr2-dev
* commit '
410e2df458328d5375b35ef9a610da240293d06b':
CircleFramedDrawable incorrectly has implicit dependency on the hosting view size.
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
Baligh Uddin [Thu, 25 Apr 2013 20:50:33 +0000 (13:50 -0700)]
am
740afcb6: am
f6d483e6: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
740afcb64bb967bb4eada7f7bb071706378d818a':
Import translations. DO NOT MERGE
Amith Yamasani [Thu, 25 Apr 2013 20:50:30 +0000 (13:50 -0700)]
am
19576444: am
90dcd746: Disabled apps should also be shown in restricted profiles app list
* commit '
1957644448f5874fa82f8313674baa1c49d9ca94':
Disabled apps should also be shown in restricted profiles app list
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:17:41 +0000 (12:17 -0700)]
am
f6d483e6: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
f6d483e6c9c8ee7999d1380b18bf9f30539af228':
Import translations. DO NOT MERGE
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:43:44 +0000 (11:43 -0700)]
am
90dcd746: Disabled apps should also be shown in restricted profiles app list
* commit '
90dcd7469b7e776f508a0767b9db46005af0e8da':
Disabled apps should also be shown in restricted profiles app list
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:51:41 +0000 (18:51 -0700)]
am
d8e88735: am
d346a1ca: Merge "The touch exploration capability is dynamically granted pre-JellyBeanMR2." into jb-mr2-dev
* commit '
d8e88735c1c801c3ca54bb5caec2a0291bfd9559':
The touch exploration capability is dynamically granted pre-JellyBeanMR2.
Svetoslav [Thu, 25 Apr 2013 01:49:23 +0000 (18:49 -0700)]
am
d346a1ca: Merge "The touch exploration capability is dynamically granted pre-JellyBeanMR2." into jb-mr2-dev
* commit '
d346a1ca2d78df4532bf103e150610a5dbc948ce':
The touch exploration capability is dynamically granted pre-JellyBeanMR2.
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 22:01:02 +0000 (15:01 -0700)]
am
7200ae73: am
868acab2: Merge "Rename limited users to restricted profiles" into jb-mr2-dev
* commit '
7200ae73c784b6c180f44dc4a5da033ae4c3ca2d':
Rename limited users to restricted profiles
Amith Yamasani [Wed, 24 Apr 2013 21:58:39 +0000 (14:58 -0700)]
am
868acab2: Merge "Rename limited users to restricted profiles" into jb-mr2-dev
* commit '
868acab2a0e82330f6b278f4f93284ca1b6e6225':
Rename limited users to restricted profiles
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