Commit Graph

10285 Commits

Author SHA1 Message Date
The Android Automerger
527900a63a merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-09 05:55:41 -07:00
Svetoslav
6b8c7e7c33 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.
2013-05-08 14:37:00 -07:00
Svetoslav
7e554395cb Merge "Settings crashing if there are no installed accessibility services." into jb-mr2-dev 2013-05-08 21:33:14 +00:00
Svetoslav
084fbc8107 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
2013-05-08 12:14:18 -07:00
Baligh Uddin
eb8e9c11ed am 2c766ba5: Import translations. DO NOT MERGE
* commit '2c766ba56c740ec09f071144014272f4d922d518':
  Import translations. DO NOT MERGE
2013-05-08 11:28:49 -07:00
Baligh Uddin
2c766ba56c Import translations. DO NOT MERGE
Change-Id: I693437e166d38e6b56a9b568c455daebfde8694d
Auto-generated-cl: translation import
2013-05-08 11:03:17 -07:00
The Android Automerger
1ea87b0313 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-07 05:55:42 -07:00
Baligh Uddin
7f4c7641e0 am c6adece0: Import translations. DO NOT MERGE
* commit 'c6adece066c2bc282db92547913a8aa43831c5f0':
  Import translations. DO NOT MERGE
2013-05-06 12:31:30 -07:00
Baligh Uddin
c6adece066 Import translations. DO NOT MERGE
Change-Id: Ib1986e8c494733193e49c1504a4cc9396649a324
Auto-generated-cl: translation import
2013-05-06 11:59:20 -07:00
Baligh Uddin
c8e75eaaab am 6681e954: Import translations. DO NOT MERGE
* commit '6681e954a8d05d818b9bd89a1302ac2d8875ab77':
  Import translations. DO NOT MERGE
2013-05-06 11:11:29 -07:00
The Android Automerger
d6377770ba merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-06 05:55:52 -07:00
Baligh Uddin
6681e954a8 Import translations. DO NOT MERGE
Change-Id: I6905b70a4bfdbab57f787be455fead0a995904a2
Auto-generated-cl: translation import
2013-05-03 13:12:52 -07:00
The Android Automerger
e624f14e9d merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-02 05:55:40 -07:00
Baligh Uddin
e9160a2431 am 6c886cd3: Import translations. DO NOT MERGE
* commit '6c886cd394e0960a1ed41a785e05b38a57ee8209':
  Import translations. DO NOT MERGE
2013-05-01 13:48:35 -07:00
Baligh Uddin
6c886cd394 Import translations. DO NOT MERGE
Change-Id: I09ddb61e89b8dfee57a2a4e6c3331a0737f1f290
Auto-generated-cl: translation import
2013-05-01 10:43:33 -07:00
The Android Automerger
0c07cf3dc8 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-01 05:56:00 -07:00
Jake Hamby
0c3cc87858 am 18c4317b: Show correct A2DP connection status in Bluetooth settings.
* commit '18c4317b93fce47109017efdab089dec4b01f790':
  Show correct A2DP connection status in Bluetooth settings.
2013-04-30 17:04:59 -07:00
Baligh Uddin
af05f177f2 am e3eb601d: Import translations. DO NOT MERGE
* commit 'e3eb601dc232ba9a14396ec26368e0a0f14084c7':
  Import translations. DO NOT MERGE
2013-04-30 16:42:39 -07:00
Jake Hamby
18c4317b93 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
2013-04-30 13:51:38 -07:00
The Android Automerger
62fcd8d4d8 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-30 05:56:17 -07:00
Baligh Uddin
e3eb601dc2 Import translations. DO NOT MERGE
Change-Id: I81f4941adbfc66c70b241062ae75b4740a065a08
Auto-generated-cl: translation import
2013-04-30 00:42:26 -07:00
Kenny Root
6491436480 resolved conflicts for merge of 3c10f535 to jb-mr2-dev-plus-aosp
Change-Id: Id4ab035f92f2a8bf1b1fefdfd22ba370e33e7829
2013-04-29 23:30:40 -07:00
Kenny Root
3c10f53578 Merge "Track change to JSSE provider" 2013-04-30 04:01:45 +00:00
Irfan Sheriff
3b22f4d2da 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
2013-04-29 16:01:56 -07:00
Irfan Sheriff
3caffdb343 Merge "Add reminder about scan settings on wifi off" into jb-mr2-dev 2013-04-29 22:59:00 +00:00
Amith Yamasani
6016726687 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
2013-04-29 14:15:57 -07:00
Amith Yamasani
f162efee89 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
2013-04-29 14:10:06 -07:00
Kenny Root
d76bc2248e Track change to JSSE provider
Change-Id: I25d6612b12ab46b1f5c88c400b95bba1c023398a
2013-04-29 10:43:00 -07:00
Irfan Sheriff
c591a8b95d 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
2013-04-29 09:42:22 -07:00
The Android Automerger
9fe2969624 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-29 05:56:10 -07:00
Amith Yamasani
b4a0838d08 am b0171715: Three kinds of owner info - owner, user and profile
* commit 'b0171715876b672c94c8a5aaafde95ff47b234b4':
  Three kinds of owner info - owner, user and profile
2013-04-28 22:23:20 -07:00
Amith Yamasani
b017171587 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
2013-04-28 22:13:22 -07:00
Amith Yamasani
9649c3ebbe 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
2013-04-27 22:01:09 -07:00
Amith Yamasani
c5b036571e Merge "Save app toggle state as soon as possible" into jb-mr2-dev 2013-04-28 04:58:54 +00:00
Kenny Root
d7d5f4d1bf am c814271f: Merge "Fix Clear Credentials item"
* commit 'c814271fe4117a6c94a314a349edd8d7222cf2c0':
  Fix Clear Credentials item
2013-04-27 15:01:04 -07:00
Kenny Root
c814271fe4 Merge "Fix Clear Credentials item" 2013-04-27 21:39:31 +00:00
Kenny Root
8eb42bd2e0 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 c4372c3e3f)

Bug: 8651830
Change-Id: Ie06f20cf90f5a359975cb30d67052f8867b429b9
2013-04-27 09:05:43 -07:00
Amith Yamasani
7b56d115ba 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
2013-04-26 15:18:33 -07:00
Svetoslav
7c2a89c9f5 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.
2013-04-26 15:16:50 -07:00
Svetoslav
4b43e21c64 Merge "Scroll if an accessibility setting description does not fit the screen." into jb-mr2-dev 2013-04-26 22:14:47 +00:00
Baligh Uddin
584a902632 am 837526fc: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '837526fceaa39f88ac468406108faacd557f2d28':
  Import translations. DO NOT MERGE
2013-04-26 14:53:26 -07:00
Baligh Uddin
837526fcea Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-04-26 21:50:35 +00:00
Svetoslav
3b2d307b89 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
2013-04-26 12:36:00 -07:00
Baligh Uddin
a69b41bb18 Import translations. DO NOT MERGE
Change-Id: I902e886b71e60da9c34d682a8b7c4f2453c06375
Auto-generated-cl: translation import
2013-04-26 10:52:46 -07:00
Amith Yamasani
4424d15949 am a7a93784: Always include default system IMEs for restricted profiles
* commit 'a7a93784d1f9798d37cb618def1a558f8d626f0f':
  Always include default system IMEs for restricted profiles
2013-04-26 10:47:18 -07:00
Amith Yamasani
a7a93784d1 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
2013-04-25 23:02:50 -07:00
Amith Yamasani
c3e973c5da 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"
2013-04-25 16:58:03 -07:00
Daniel Sandler
1344ec1918 am 77f71cb2: Merge "Follow API changes to NotificationListener." into jb-mr2-dev
* commit '77f71cb226203bf3f87eec749296feb3ecd18f43':
  Follow API changes to NotificationListener.
2013-04-25 16:58:02 -07:00
Svetoslav
259668d82f 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.
2013-04-25 16:58:01 -07:00
Amith Yamasani
0cb93523b2 Merge "Revert "Disabled apps should also be shown in restricted profiles app list"" into jb-mr2-dev 2013-04-25 22:22:25 +00:00