Robert Greenwalt
b2dccc4184
am d5d61a0a
: Merge "Remove wifi scan-always dialog." into jb-mr2-dev
...
* commit 'd5d61a0ab18c57cf2087d17f10d4d4569d968078':
Remove wifi scan-always dialog.
2013-05-13 14:13:48 -07:00
Robert Greenwalt
d5d61a0ab1
Merge "Remove wifi scan-always dialog." into jb-mr2-dev
2013-05-13 21:11:20 +00:00
Robert Greenwalt
7e59f73e9c
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
2013-05-13 11:39:08 -07:00
Baligh Uddin
a0f474de45
am 9df440f7
: (-s ours) am 0a3cf293
: Import translations. DO NOT MERGE
...
* commit '9df440f7edf65b8d7d5be8f307d74cafd672d4b4':
Import translations. DO NOT MERGE
2013-05-13 09:52:58 -07:00
Baligh Uddin
9df440f7ed
am 0a3cf293
: Import translations. DO NOT MERGE
...
* commit '0a3cf29344bcfd7071975c9f266574454209aa95':
Import translations. DO NOT MERGE
2013-05-13 09:50:06 -07:00
Baligh Uddin
0309f336cc
Import translations. DO NOT MERGE
...
Change-Id: I55826bb6824378babffe07b0a9353a42eb456818
Auto-generated-cl: translation import
2013-05-13 09:46:14 -07:00
Baligh Uddin
0a3cf29344
Import translations. DO NOT MERGE
...
Change-Id: I7bfc101728e9083d730511df65771c9899ab6549
Auto-generated-cl: translation import
2013-05-13 09:42:52 -07:00
Satoshi Kataoka
a8c37bcae3
Tweak a label in the personal dictionary settings
...
Bug: 8897600
Change-Id: I170ee12c06f5d03af355e279d8ac738f68feaad0
2013-05-10 12:13:49 +09:00
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
17c2e0e605
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.
2013-05-08 15:05:28 -07:00
Baligh Uddin
3c573d3af5
am eb8e9c11
: (-s ours) am 2c766ba5
: Import translations. DO NOT MERGE
...
* commit 'eb8e9c11ede066a7b28c51b3492ce7253304cb5b':
Import translations. DO NOT MERGE
2013-05-08 15:04: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
b590a5d9dc
Import translations. DO NOT MERGE
...
Change-Id: I5681e12c45cbea55910772e7761dc122bc55ff71
Auto-generated-cl: translation import
2013-05-08 11:07:07 -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
Satoshi Kataoka
2cb9f8a62a
Merge "Fix the label for the personal dictionary settings"
2013-05-08 09:54:25 +00:00
Satoshi Kataoka
5e86985b3a
Fix the label for the personal dictionary settings
...
Bug: 8859441
Change-Id: I18ae1e1d92e1280e1782685b99307f1e48ce8e66
2013-05-08 16:15:45 +09: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
Dianne Hackborn
7a03d980f7
Merge "Update UI to add new audio app ops."
2013-05-06 23:33:20 +00:00
Baligh Uddin
b72ffa2479
am 7f4c7641
: (-s ours) am c6adece0
: Import translations. DO NOT MERGE
...
* commit '7f4c7641e0ce85162eb8f5c8846e35db29a068f7':
Import translations. DO NOT MERGE
2013-05-06 16:20:44 -07:00
Dianne Hackborn
6e91babeda
Update UI to add new audio app ops.
...
Change-Id: I307d25bdd6bee2e7d7a9df32849ef206abaf2318
2013-05-06 16:13:34 -07:00
Baligh Uddin
68a958619d
am c8e75eaa
: (-s ours) am 6681e954
: Import translations. DO NOT MERGE
...
* commit 'c8e75eaaab0f7aa4177f151b2d31de26c3e4c32a':
Import translations. DO NOT MERGE
2013-05-06 13:56:04 -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
3d7f617cbd
Import translations. DO NOT MERGE
...
Change-Id: Id8e754017aac82b1b423b8f3b02f4191d71a58dd
Auto-generated-cl: translation import
2013-05-06 12:02:35 -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
1d9e5d8e71
Merge "Import translations. DO NOT MERGE"
2013-05-04 23:11:09 +00:00
Romain Guy
eb90fc56b2
Add new GPU overdraw setting
...
Change-Id: I45404b37df382e51eea42de92535f49f870c98b2
2013-05-03 17:38:38 -07:00
Baligh Uddin
bd20e4766d
Import translations. DO NOT MERGE
...
Change-Id: I706e8606b77d5ec1076c4954911da5aefb6b1805
Auto-generated-cl: translation import
2013-05-03 13:16:25 -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
738ea06045
am e9160a24
: (-s ours) am 6c886cd3
: Import translations. DO NOT MERGE
...
* commit 'e9160a243154b338653e43e3e415caa84c2790ae':
Import translations. DO NOT MERGE
2013-05-01 13:50:56 -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
cbc7319992
Import translations. DO NOT MERGE
...
Change-Id: I124056964f65373288bf0ba1c530b6764b4c0abf
Auto-generated-cl: translation import
2013-05-01 10:47:18 -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
2b5d30a4cf
am 0c3cc878
: am 18c4317b
: Show correct A2DP connection status in Bluetooth settings.
...
* commit '0c3cc878586ef1caa3ac5a13a719dd9924cc0d1b':
Show correct A2DP connection status in Bluetooth settings.
2013-04-30 17:18:08 -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
ebe32c5465
am af05f177
: (-s ours) am e3eb601d
: Import translations. DO NOT MERGE
...
* commit 'af05f177f2fb866a8cef4278d383e321a8491855':
Import translations. DO NOT MERGE
2013-04-30 16:45:50 -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
Svetoslav
e8253dd8b3
Remove Auto-rotate screen setting if a required feature is missing.
...
It is possible that a device running Android does not support rotation,
for example a Google TV box. The change adds a check to the rotation
policy to take this into account.
bug:8051556
Change-Id: I60a2a35da148271a18873f6c70556dacab29dae9
2013-04-30 16:02:04 -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
Svetoslav Ganov
135d692639
Merge "Remove Accessibility shortcut if the shortcut is not available"
2013-04-30 17:17:13 +00:00
Kenny Root
3d9918c2e2
am 64914364
: resolved conflicts for merge of 3c10f535
to jb-mr2-dev-plus-aosp
...
* commit '649143648073116b2ffb6af412b41ecec5280f86':
Track change to JSSE provider
2013-04-30 09:01:44 -07:00
Irfan Sheriff
40ec92c4e0
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
2013-04-30 08:54:23 -07:00
Amith Yamasani
ed03edb69b
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
2013-04-30 08:54:00 -07:00
Baligh Uddin
272b29449c
Merge "Import translations. DO NOT MERGE"
2013-04-30 15:37:08 +00:00