OSDN Git Service
The Android Open Source Project [Tue, 21 May 2013 16:02:36 +0000 (09:02 -0700)]
am
7e18ed8c: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
7e18ed8c14ca2047a5f82f2eb8bcab93d673d730':
The Android Open Source Project [Tue, 21 May 2013 15:59:23 +0000 (08:59 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I6a178af29be7f1d227b667ec84312f5d0c2fdadd
The Android Automerger [Tue, 21 May 2013 14:47:00 +0000 (07:47 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Przemyslaw Szczepaniak [Mon, 13 May 2013 16:14:01 +0000 (17:14 +0100)]
Make TTS language setting track system language.
TTS engine default locale is set independently from the system locale.
If TTS engine default locale is not set, it defaults to the system locale.
If user decides to set TTS locale, ability to default to the current system
locale is lost (until device is wiped).
This change makes settings wipe the TTS engine default locale value if user
selects language that is system language. This allows TTS to track system
language if user changes it.
If system language is not available in TTS, language field is set to
"language not selected" value.
This change require a small change in framework/base to make previously
private method public (TtsEngines.getDefaultLocale).
+ Selected language is displayed in language preference summary (matches
all other language preferences)
+ Removing and then adding "language" and 'install languages' preferences
looks glitchy, not they are disabled (grayed out) if unavailable.
Bug:
8613986
Change-Id: Ic4bde97ef7406adb64cc03efbe660275360ba3af
Amith Yamasani [Tue, 21 May 2013 01:26:12 +0000 (18:26 -0700)]
am
966c2d3f: am
b514a95c: am
4abe488a: Merge "No back icon in action bar of APN Settings"
* commit '
966c2d3fc61a1fed5c5e587c6ef29b2b68d01372':
No back icon in action bar of APN Settings
Amith Yamasani [Tue, 21 May 2013 01:24:23 +0000 (18:24 -0700)]
am
b514a95c: am
4abe488a: Merge "No back icon in action bar of APN Settings"
* commit '
b514a95ce7009a61532f00d4ac5ab73861d2b327':
No back icon in action bar of APN Settings
Dmitry Shmidt [Tue, 21 May 2013 01:18:08 +0000 (01:18 +0000)]
Merge "Disable On/OFF switch before action"
Amith Yamasani [Tue, 21 May 2013 01:16:42 +0000 (18:16 -0700)]
am
4abe488a: Merge "No back icon in action bar of APN Settings"
* commit '
4abe488a5f18d04513b294dce1f7f63d0c9cf3a0':
No back icon in action bar of APN Settings
Dianne Hackborn [Tue, 21 May 2013 00:54:19 +0000 (00:54 +0000)]
Merge "Add wake lock app ops to UI."
Amith Yamasani [Tue, 21 May 2013 00:40:52 +0000 (17:40 -0700)]
am
738c373f: am
f88e6e5a: Don\'t mutate all instances of app icons in Settings
* commit '
738c373f3a27f30d631881c1633cca343e512e8f':
Don't mutate all instances of app icons in Settings
Amith Yamasani [Tue, 21 May 2013 00:39:29 +0000 (17:39 -0700)]
am
f88e6e5a: Don\'t mutate all instances of app icons in Settings
* commit '
f88e6e5ae6a5a31d47677dcbd9be2b26c6615136':
Don't mutate all instances of app icons in Settings
Dmitry Shmidt [Thu, 16 May 2013 18:29:55 +0000 (11:29 -0700)]
Disable On/OFF switch before action
Bug:
8715336
Change-Id: I3d4b05ae9dfe109af0b9b06340d52004b73ad0f4
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dianne Hackborn [Fri, 17 May 2013 18:28:30 +0000 (11:28 -0700)]
Add wake lock app ops to UI.
Change-Id: Id2f23acee08fa2830d3edc30a70abf06226ae4eb
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
Baligh Uddin [Mon, 20 May 2013 19:59:33 +0000 (19:59 +0000)]
Merge "Import translations. DO NOT MERGE"
Eric Laurent [Mon, 20 May 2013 19:13:45 +0000 (19:13 +0000)]
Merge "Single volume control when config_useMasterVolume is true"
Baligh Uddin [Mon, 20 May 2013 18:38:20 +0000 (11:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic02fef38ac538c74b0ae6fc5262ca2729b6b675d
Auto-generated-cl: translation import
Amith Yamasani [Mon, 20 May 2013 18:07:21 +0000 (18:07 +0000)]
Merge "No back icon in action bar of APN Settings"
The Android Open Source Project [Mon, 20 May 2013 15:26:23 +0000 (08:26 -0700)]
am
d82fa081: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
d82fa081f96985ceef99f523a83e2bb365b949b1':
The Android Open Source Project [Mon, 20 May 2013 15:20:38 +0000 (08:20 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I82e5359280f8eeb68b9ef61dc4acb3804d8f9106
smitha.x.smitha [Tue, 23 Apr 2013 09:15:09 +0000 (14:45 +0530)]
No back icon in action bar of APN Settings
When entering the APN menu, the actionbar is missing a back
icon allowing the user to go back to the previous pane.
Added parentActivityName in ApnSettings, to enable action
bar back icon.
Change-Id: Iee8bb420f47c0e2c0d9a43739f534466abba30db
The Android Automerger [Sun, 19 May 2013 12:55:41 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Amith Yamasani [Sat, 18 May 2013 00:41:31 +0000 (17:41 -0700)]
am
5675f50c: am
b96ebf9e: Merge "Load the avatar icon if it\'s not yet in the activity view" into jb-mr2-dev
* commit '
5675f50cede90921c4a73cd94d191e39820a24d5':
Load the avatar icon if it's not yet in the activity view
Amith Yamasani [Sat, 18 May 2013 00:39:19 +0000 (17:39 -0700)]
am
b96ebf9e: Merge "Load the avatar icon if it\'s not yet in the activity view" into jb-mr2-dev
* commit '
b96ebf9eed3df26e523055fde98913507e6b1a8a':
Load the avatar icon if it's not yet in the activity view
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
Baligh Uddin [Fri, 17 May 2013 22:41:58 +0000 (15:41 -0700)]
am
8ea4fe7a: (-s ours) am
27d5c392: Import translations. DO NOT MERGE
* commit '
8ea4fe7ae5ecb320ac065ee8dc3b8e8e40612a42':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 17 May 2013 22:39:53 +0000 (15:39 -0700)]
am
27d5c392: Import translations. DO NOT MERGE
* commit '
27d5c392ba6ce9f9ab4bbc71b2cdfea15c0140f2':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 17 May 2013 22:37:14 +0000 (22:37 +0000)]
Merge "Import translations. DO NOT MERGE"
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
The Android Open Source Project [Fri, 17 May 2013 19:56:09 +0000 (12:56 -0700)]
am
958c30d4: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
958c30d422801c25b0b67534a5e2083941bad9a8':
The Android Open Source Project [Fri, 17 May 2013 19:54:50 +0000 (12:54 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Id11469f5fc48fc2af186000e2eb8ade5fb5264ab
Baligh Uddin [Fri, 17 May 2013 19:20:17 +0000 (12:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1c9b7f0dca3797c176d4f7ce82e1744d6795e0b8
Auto-generated-cl: translation import
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
Jaewan Kim [Thu, 11 Apr 2013 04:18:03 +0000 (13:18 +0900)]
Single volume control when config_useMasterVolume is true
If config_useMasterVolume is true, all streams are considered as the
STREAM_MASTER. Hide all volume sections except a stream because they
are actually the same in this case.
Bug:
8505295
Change-Id: I9822feaad2d43468ceb4c7fdb97da4b677995992
John Spurlock [Thu, 16 May 2013 15:40:05 +0000 (08:40 -0700)]
am
cea06adc: am
31ce86d3: Merge "Hide notification listeners setting if no listeners." into jb-mr2-dev
* commit '
cea06adce077d32c0c6dc2abb68cbae8bd1a82a7':
Hide notification listeners setting if no listeners.
John Spurlock [Thu, 16 May 2013 15:38:25 +0000 (08:38 -0700)]
am
31ce86d3: Merge "Hide notification listeners setting if no listeners." into jb-mr2-dev
* commit '
31ce86d3bd69a2c7e7bdfec3cf9317d53f7ec1df':
Hide notification listeners setting if no listeners.
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
The Android Automerger [Thu, 16 May 2013 12:55:44 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Open Source Project [Thu, 16 May 2013 12:48:19 +0000 (05:48 -0700)]
am
d668d744: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
d668d74408d7c6c71dfbc04e12da7ce1ff9e2af1':
The Android Open Source Project [Thu, 16 May 2013 12:44:09 +0000 (05:44 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Iae037f50e82720a2eb374281a91bb9638b8f7985
Amith Yamasani [Thu, 16 May 2013 00:14:07 +0000 (17:14 -0700)]
am
010ab3bd: am
e5fc4071: Merge "Return proper result code after creating pin/password lock" into jb-mr2-dev
* commit '
010ab3bd92f17b634e962f4a4ea20f1bcc3490e6':
Return proper result code after creating pin/password lock
Amith Yamasani [Thu, 16 May 2013 00:12:02 +0000 (17:12 -0700)]
am
e5fc4071: Merge "Return proper result code after creating pin/password lock" into jb-mr2-dev
* commit '
e5fc407146c3f09e3bcd55d907fdffe2d26f3c6d':
Return proper result code after creating pin/password lock
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
The Android Automerger [Wed, 15 May 2013 12:55:42 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Amith Yamasani [Tue, 14 May 2013 21:58:12 +0000 (14:58 -0700)]
am
813d2383: am
00dc15d9: Merge "Add a settings icon to restricted profile config header" into jb-mr2-dev
* commit '
813d23838b76623faa6b2ceb4ad7458cba0f726f':
Add a settings icon to restricted profile config header
Amith Yamasani [Tue, 14 May 2013 21:56:13 +0000 (14:56 -0700)]
am
00dc15d9: Merge "Add a settings icon to restricted profile config header" into jb-mr2-dev
* commit '
00dc15d9dab780e9a61d1b3a20446d6519b5b076':
Add a settings icon to restricted profile config header
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
The Android Automerger [Tue, 14 May 2013 12:55:44 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Amith Yamasani [Mon, 13 May 2013 23:07:00 +0000 (23:07 +0000)]
Merge "Use circular avatars wherever appropriate"
Amith Yamasani [Mon, 13 May 2013 22:52:54 +0000 (15:52 -0700)]
Use circular avatars wherever appropriate
Battery stats, Data usage and Running apps
Change-Id: Ib7f851e55ef7e44f18d3f8a2cd27f5f2204b0145
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:15:41 +0000 (14:15 -0700)]
am
b2dccc41: am
d5d61a0a: Merge "Remove wifi scan-always dialog." into jb-mr2-dev
* commit '
b2dccc418410cd2c35213fddb5da7dce1d91c47b':
Remove wifi scan-always dialog.
Robert Greenwalt [Mon, 13 May 2013 21:13:48 +0000 (14:13 -0700)]
am
d5d61a0a: Merge "Remove wifi scan-always dialog." into jb-mr2-dev
* commit '
d5d61a0ab18c57cf2087d17f10d4d4569d968078':
Remove wifi scan-always dialog.
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:52:58 +0000 (09:52 -0700)]
am
9df440f7: (-s ours) am
0a3cf293: Import translations. DO NOT MERGE
* commit '
9df440f7edf65b8d7d5be8f307d74cafd672d4b4':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 13 May 2013 16:50:06 +0000 (09:50 -0700)]
am
0a3cf293: Import translations. DO NOT MERGE
* commit '
0a3cf29344bcfd7071975c9f266574454209aa95':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 13 May 2013 16:46:14 +0000 (09:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I55826bb6824378babffe07b0a9353a42eb456818
Auto-generated-cl: translation import
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
Satoshi Kataoka [Fri, 10 May 2013 03:06:51 +0000 (12:06 +0900)]
Tweak a label in the personal dictionary settings
Bug:
8897600
Change-Id: I170ee12c06f5d03af355e279d8ac738f68feaad0
The Android Automerger [Thu, 9 May 2013 12:55:41 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
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
The Android Automerger [Tue, 7 May 2013 12:55:42 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
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
The Android Automerger [Mon, 6 May 2013 12:55:52 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
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
The Android Automerger [Thu, 2 May 2013 12:55:40 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
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
The Android Automerger [Wed, 1 May 2013 12:56:00 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
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
OSDN Git Service
