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
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
edb906af36
Import translations. DO NOT MERGE
...
Change-Id: I76329240b2241ff7c949f725efa875425569bc16
Auto-generated-cl: translation import
2013-04-30 00:45:30 -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
Satoshi Kataoka
5df3307309
Fix the title of the fragments of the personal dictionary settings
...
Bug: 8600958
Change-Id: I9b8bab21b144385bc2386e7fcb67e1c197f84113
2013-04-30 16:08:00 +09: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
Amith Yamasani
5c460bbafe
am b4a0838d
: am b0171715
: Three kinds of owner info - owner, user and profile
...
* commit 'b4a0838d08198fd93be99ce2907b3f9b70f0d7bc':
Three kinds of owner info - owner, user and profile
2013-04-29 12:14:41 -07:00
Amith Yamasani
52351051e6
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
2013-04-29 12:14:37 -07:00
Kenny Root
ecee18e569
am d7d5f4d1
: am c814271f
: Merge "Fix Clear Credentials item"
...
* commit 'd7d5f4d1bfedda52c2686a08a62dec1fa02dba58':
Fix Clear Credentials item
2013-04-29 12:14:37 -07:00
Svetoslav
5334dbf090
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.
2013-04-29 11:22:03 -07:00
Baligh Uddin
a2a3ccf7a8
am 584a9026
: am 837526fc
: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '584a90263223243c2af1e7991740515e22950143':
Import translations. DO NOT MERGE
2013-04-29 11:21:57 -07:00
Kenny Root
d76bc2248e
Track change to JSSE provider
...
Change-Id: I25d6612b12ab46b1f5c88c400b95bba1c023398a
2013-04-29 10:43:00 -07:00