OSDN Git Service
Vinit Deshapnde [Mon, 10 Jun 2013 19:28:48 +0000 (12:28 -0700)]
Fix an NPE in WifiP2pSettings UI
The NPE happens becase we save a references to the group that is to be
deleted, when the confirmation dialog is being shown to the user. We lose
that reference if orientation is changed (because the UI creates a new
WifiP2pSettings to interact with).
The fix is to save the name of the group that is being deleted in
persistent store, and re-select the group based on that.
Bug:
9004915
Change-Id: I1387a5b17fa2773748f4c8b34adddfc9516cfcf3
Baligh Uddin [Sat, 1 Jun 2013 16:51:53 +0000 (09:51 -0700)]
am
971d090a: (-s ours) am
eb0fff7a: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
971d090a374f5192eed256eda47d174fd8ab9c30':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 1 Jun 2013 15:23:29 +0000 (08:23 -0700)]
am
eb0fff7a: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
eb0fff7a9a57202ce2a1f6fc43f6dab79e7e6d36':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 31 May 2013 22:44:05 +0000 (22:44 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 31 May 2013 22:43:38 +0000 (22:43 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Przemyslaw Szczepaniak [Fri, 31 May 2013 09:57:22 +0000 (10:57 +0100)]
Adding korean input for "Listen to an example" TTS
Bug:
9186138
Change-Id: If5aed34d8ce34ef9922f8dbf0f9a83e26b931bd4
Jean-Baptiste Queru [Thu, 30 May 2013 22:43:08 +0000 (15:43 -0700)]
am
8527d6d1: am
46cd7f64: Ignore
81476405 from AOSP
* commit '
8527d6d194eb92a4f61696c0a7b298538f7cf87b':
Settings: Fix Swedish translations
Jean-Baptiste Queru [Thu, 30 May 2013 22:39:39 +0000 (15:39 -0700)]
am
46cd7f64: Ignore
81476405 from AOSP
* commit '
46cd7f64f00f530de4478137281c4d47d02c9244':
Settings: Fix Swedish translations
Jean-Baptiste Queru [Thu, 30 May 2013 22:37:47 +0000 (15:37 -0700)]
Ignore
81476405 from AOSP
Robert Greenwalt [Thu, 30 May 2013 22:16:05 +0000 (15:16 -0700)]
am
f96cfad3: am
5ac90432: Don\'t show scan-always text if it is off.
* commit '
f96cfad36ef62154b52e846736ebc407f4c03de6':
Don't show scan-always text if it is off.
Jean-Baptiste Queru [Thu, 30 May 2013 22:06:37 +0000 (22:06 +0000)]
Merge "Settings: Fix Swedish translations"
Robert Greenwalt [Thu, 30 May 2013 19:06:30 +0000 (12:06 -0700)]
am
5ac90432: Don\'t show scan-always text if it is off.
* commit '
5ac904321d81a0a0b7892c5722c464dc3c693f9f':
Don't show scan-always text if it is off.
Robert Greenwalt [Thu, 30 May 2013 18:33:36 +0000 (11:33 -0700)]
Don't show scan-always text if it is off.
bug:
9206410
Change-Id: If7e06f50d3d8db6ea198f437d4d268e65ec96c16
Baligh Uddin [Thu, 30 May 2013 02:32:14 +0000 (19:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5cf93cb32c6e8ceebe3172192d30114d84305993
Auto-generated-cl: translation import
Baligh Uddin [Thu, 30 May 2013 02:29:10 +0000 (19:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I484fae1bba709cad545b168242e79291e9599346
Auto-generated-cl: translation import
Svetoslav [Wed, 29 May 2013 22:09:17 +0000 (22:09 +0000)]
Merge "Remove Auto-rotate screen setting if a required feature is missing."
Amith Yamasani [Wed, 29 May 2013 16:42:14 +0000 (16:42 +0000)]
Merge "Reduce jank in User Settings"
Amith Yamasani [Wed, 29 May 2013 16:42:00 +0000 (16:42 +0000)]
Merge "Cache default circle avatar for faster creation of UserSettings"
Amith Yamasani [Wed, 29 May 2013 16:39:07 +0000 (09:39 -0700)]
Reduce jank in User Settings
Don't recreate the list on resume.
Cache the default circled icon.
Bug:
8802380
Change-Id: I46520b591fc3ffd5e51a1c7dda86e811c03a76a2
The Android Open Source Project [Wed, 29 May 2013 15:10:37 +0000 (08:10 -0700)]
am
ed7bc2fa: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
ed7bc2fa007ced0587672428b788dc4bb9c2451f':
The Android Open Source Project [Wed, 29 May 2013 15:06:16 +0000 (08:06 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I9c8cb7d1325cc9edf656205ce7f5728cc76040ab
The Android Automerger [Wed, 29 May 2013 12:55:30 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Baligh Uddin [Wed, 29 May 2013 04:02:51 +0000 (21:02 -0700)]
am
5fd8a311: (-s ours) am
1182f675: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
5fd8a3118784942fde17f6e5958dcfbfd21dcaaf':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 29 May 2013 04:00:23 +0000 (21:00 -0700)]
am
1182f675: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
1182f6755f17753f5b551ea40c11c263801a90c1':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 29 May 2013 03:57:30 +0000 (03:57 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 29 May 2013 03:56:37 +0000 (03:56 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Russell Brenner [Tue, 28 May 2013 20:51:03 +0000 (13:51 -0700)]
am
1f9e42cd: am
c280acc3: Merge "Improved logic for Skip warning message" into jb-mr2-dev
* commit '
1f9e42cd4054aaf02b01cc3937924a08aa6b7529':
Improved logic for Skip warning message
The Android Open Source Project [Tue, 28 May 2013 20:50:23 +0000 (13:50 -0700)]
am
52f3b7c3: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
52f3b7c3919a0ca35b4679b5227468efb1b4d459':
Russell Brenner [Tue, 28 May 2013 20:23:35 +0000 (13:23 -0700)]
am
c280acc3: Merge "Improved logic for Skip warning message" into jb-mr2-dev
* commit '
c280acc327fa7e8fbd6972534fbadb4650c1ee3d':
Improved logic for Skip warning message
Russell Brenner [Tue, 28 May 2013 20:22:40 +0000 (20:22 +0000)]
Merge "Improved logic for Skip warning message" into jb-mr2-dev
Amith Yamasani [Tue, 28 May 2013 18:17:07 +0000 (11:17 -0700)]
Cache default circle avatar for faster creation of UserSettings
Change-Id: Ie2ed9d032f71fad7a89edde147f231a1dc479aae
The Android Open Source Project [Tue, 28 May 2013 14:37:45 +0000 (07:37 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: If34271bddb2819de365f53ba61b744b6598bda57
Baligh Uddin [Mon, 27 May 2013 19:01:18 +0000 (12:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I609dc6aef43a669bf59f2fc352fefa1db2d8e844
Auto-generated-cl: translation import
Baligh Uddin [Mon, 27 May 2013 18:58:11 +0000 (11:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3808f0d486b1050f53c5f3d9129f758d66db68df
Auto-generated-cl: translation import
The Android Automerger [Sun, 26 May 2013 12:55:43 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Russell Brenner [Fri, 24 May 2013 21:28:08 +0000 (14:28 -0700)]
Improved logic for Skip warning message
Use ConnectivityManager instead of TelephonyManager to determine
how device is connected.
Bug:
9118704
Change-Id: I5c1db90500591ca67e927976066a46e1f66e2e60
Baligh Uddin [Thu, 23 May 2013 16:32:47 +0000 (09:32 -0700)]
am
5c20af4c: (-s ours) am
6fa5e627: Import translations. DO NOT MERGE
* commit '
5c20af4c7c45e3da2150937d222f85c80b0965b8':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 23 May 2013 16:30:23 +0000 (09:30 -0700)]
am
6fa5e627: Import translations. DO NOT MERGE
* commit '
6fa5e627b8fd64af6e4ae286c46b3666b66f8d8a':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 23 May 2013 16:26:46 +0000 (16:26 +0000)]
Merge "Import translations. DO NOT MERGE"
The Android Open Source Project [Thu, 23 May 2013 15:06:41 +0000 (08:06 -0700)]
am
2dafd362: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
2dafd362c7052f1618b0d22d18043d99f4544ac0':
The Android Open Source Project [Thu, 23 May 2013 15:05:45 +0000 (08:05 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ide88244c344b65f9c0c84b40e4ca76bccf67584c
The Android Automerger [Thu, 23 May 2013 12:55:31 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Baligh Uddin [Thu, 23 May 2013 07:35:21 +0000 (00:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5c46faf0aa951cad097747f89fc4427e83bafa1a
Auto-generated-cl: translation import
Baligh Uddin [Thu, 23 May 2013 07:31:54 +0000 (00:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I42d8fcaccbdec16d54e85adcd73e4c455097715d
Auto-generated-cl: translation import
Amith Yamasani [Wed, 22 May 2013 22:08:53 +0000 (15:08 -0700)]
am
73662629: am
21f008e1: Merge "Update strings for clarity about restricted profiles" into jb-mr2-dev
* commit '
73662629957e03ef23cd1bc33640ce7d1e690e90':
Update strings for clarity about restricted profiles
Amith Yamasani [Wed, 22 May 2013 22:07:00 +0000 (15:07 -0700)]
am
21f008e1: Merge "Update strings for clarity about restricted profiles" into jb-mr2-dev
* commit '
21f008e1f4e2d5e84fdab041d2ef31f305bbcf09':
Update strings for clarity about restricted profiles
Amith Yamasani [Wed, 22 May 2013 22:04:59 +0000 (22:04 +0000)]
Merge "Update strings for clarity about restricted profiles" into jb-mr2-dev
Alex Klyubin [Wed, 22 May 2013 21:10:50 +0000 (14:10 -0700)]
am
1eb2064f: am
7229e29f: Merge "Ensure all active Device Admins are listed." into jb-mr2-dev
* commit '
1eb2064ff495b60bbf5db1a188adcad2e677742b':
Ensure all active Device Admins are listed.
Alex Klyubin [Wed, 22 May 2013 21:09:10 +0000 (14:09 -0700)]
am
7229e29f: Merge "Ensure all active Device Admins are listed." into jb-mr2-dev
* commit '
7229e29f1749ae10bd92b59ec3d663698a5045e7':
Ensure all active Device Admins are listed.
Alex Klyubin [Wed, 22 May 2013 21:06:32 +0000 (21:06 +0000)]
Merge "Ensure all active Device Admins are listed." into jb-mr2-dev
Dianne Hackborn [Wed, 22 May 2013 21:03:05 +0000 (14:03 -0700)]
am
eeeccdc6: am
8274b677: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
eeeccdc6a3ab5640233ff46dc8864c1235687f09':
Fix issue #
9074296: Device Admins can activate in a way...
Dianne Hackborn [Wed, 22 May 2013 21:01:26 +0000 (14:01 -0700)]
am
8274b677: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
8274b6770219a469ab8a5254206d0d81bd5c96d3':
Fix issue #
9074296: Device Admins can activate in a way...
Amith Yamasani [Wed, 22 May 2013 19:51:30 +0000 (12:51 -0700)]
Update strings for clarity about restricted profiles
Bug:
9051422
Bug:
9051178
Change-Id: I1b88286fdd0db27bb6980d0ebbc846370fd0082e
Dianne Hackborn [Wed, 22 May 2013 18:29:36 +0000 (11:29 -0700)]
Fix issue #
9074296: Device Admins can activate in a way...
...that makes it impossible to deactive/uninstall them
Don't allow device admins to directly launch the add UI if
they are malformed.
Change-Id: I0d3140222d8015f680e1f199bddae2221ee0e726
Alex Klyubin [Wed, 22 May 2013 16:06:35 +0000 (09:06 -0700)]
Ensure all active Device Admins are listed.
Bug:
9074296
Change-Id: Ifb70c12ccea6628042b98a18186816887cb4477b
The Android Open Source Project [Wed, 22 May 2013 14:27:38 +0000 (07:27 -0700)]
am
ae006e70: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
ae006e7077c9937bd90d08f7eea7fb7e580b1d57':
The Android Open Source Project [Wed, 22 May 2013 14:23:09 +0000 (07:23 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I2a202b7c38568ae9ca45a38cc01f08be05ab5d23
The Android Automerger [Wed, 22 May 2013 12:55:35 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Amith Yamasani [Wed, 22 May 2013 01:20:36 +0000 (18:20 -0700)]
am
18d44684: am
0b2781ae: Write restriction bundle right away for required apps.
* commit '
18d44684d3d384cc1eed114808c3870c7738e352':
Write restriction bundle right away for required apps.
Amith Yamasani [Wed, 22 May 2013 01:16:50 +0000 (18:16 -0700)]
am
0b2781ae: Write restriction bundle right away for required apps.
* commit '
0b2781ae537e6d3d27863080eea0a0a5fa6c83b8':
Write restriction bundle right away for required apps.
Amith Yamasani [Tue, 21 May 2013 23:07:28 +0000 (16:07 -0700)]
Write restriction bundle right away for required apps.
User shouldn't have to go tap on the settings icon for an app that is ON by default
in a restricted profile. This way apps can write some defaults to the restricted
profile when it is created.
The app entry is also automatically removed from the list if there are no visible
restrictions.
Bug:
9074051
Also fix an incorrect dialog label. Bug:
9068877
Change-Id: I2a7ddc31fe695f58611d2ba36a8bf541b7817b10
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':
OSDN Git Service
