OSDN Git Service
Eric Laurent [Wed, 28 Nov 2012 20:12:23 +0000 (12:12 -0800)]
Allow mute when playing over fixed volume device
Modified AudioService to add the possibility to mute/unmute music
with volume keys while playing over fixed volume devices (HDMI, digital dock).
VOL- forces volume to 0 and VOL+ forces volume to maximum.
Bug
7377764.
Change-Id: Ibaf805d76c30e3c0e395547cd3ce0087dbfb9f30
Robert Ly [Fri, 30 Nov 2012 22:42:13 +0000 (14:42 -0800)]
am
f701090d: am
deab6fd2: am
b67ab7cc: am
648de548: Merge "docs: gms fixes" into jb-mr1-dev
* commit '
f701090df6671dca1fa85666248e54a92ce85c34':
docs: gms fixes
Robert Ly [Fri, 30 Nov 2012 22:40:40 +0000 (14:40 -0800)]
am
deab6fd2: am
b67ab7cc: am
648de548: Merge "docs: gms fixes" into jb-mr1-dev
* commit '
deab6fd2e8bd94c8449fdc2c926f7973c5661b30':
docs: gms fixes
Robert Ly [Fri, 30 Nov 2012 22:38:18 +0000 (14:38 -0800)]
am
b67ab7cc: am
648de548: Merge "docs: gms fixes" into jb-mr1-dev
* commit '
b67ab7ccd6d09d30caf8a85a9ea20fc991652258':
docs: gms fixes
Robert Ly [Fri, 30 Nov 2012 22:35:48 +0000 (14:35 -0800)]
am
648de548: Merge "docs: gms fixes" into jb-mr1-dev
* commit '
648de5483b20bd80bda267a4430daca2ae0b089a':
docs: gms fixes
Robert Ly [Fri, 30 Nov 2012 22:31:42 +0000 (14:31 -0800)]
Merge "docs: gms fixes" into jb-mr1-dev
Andreas Huber [Fri, 30 Nov 2012 22:28:14 +0000 (14:28 -0800)]
am
800c8ab6: am
2644494a: Merge changes I8462f040,Ie471f40f
* commit '
800c8ab68d695f1b6c5332c80a32316cdca69954':
MediaCodec: Allow getting the codec info directly
MediaCodec: Allow getting the chosen component name
Andreas Huber [Fri, 30 Nov 2012 22:26:16 +0000 (14:26 -0800)]
am
2644494a: Merge changes I8462f040,Ie471f40f
* commit '
2644494a9841c1f842d790b60911699f09eb63d1':
MediaCodec: Allow getting the codec info directly
MediaCodec: Allow getting the chosen component name
John Spurlock [Fri, 30 Nov 2012 21:29:14 +0000 (13:29 -0800)]
am
368016f7: am
bd0e1808: am
4015c3f8: Merge "Only show camera widget to setup users." into jb-mr1.1-dev
* commit '
368016f769903df05ad5af51e8402dc372d5cd49':
Only show camera widget to setup users.
Andreas Huber [Fri, 30 Nov 2012 21:26:51 +0000 (13:26 -0800)]
Merge changes I8462f040,Ie471f40f
* changes:
MediaCodec: Allow getting the codec info directly
MediaCodec: Allow getting the chosen component name
John Spurlock [Fri, 30 Nov 2012 21:26:47 +0000 (13:26 -0800)]
am
bd0e1808: am
4015c3f8: Merge "Only show camera widget to setup users." into jb-mr1.1-dev
* commit '
bd0e180893c33f6958d4940709687ef2a52e8336':
Only show camera widget to setup users.
Daniel Sandler [Fri, 30 Nov 2012 21:26:18 +0000 (13:26 -0800)]
am
57b47ae9: am
9e129f37: am
924fc3e6: Merge "Add constant for Daydream settings." into jb-mr1.1-dev
* commit '
57b47ae95d87c783b39a8d188c059166c04df72b':
Add constant for Daydream settings.
Robert Ly [Fri, 30 Nov 2012 21:26:14 +0000 (13:26 -0800)]
am
c9c948ba: am
50246b5b: am
861c55ff: am
2dd93e22: Merge "docs: add correct toc for google reference" into jb-mr1-dev
* commit '
c9c948ba492182b9a6341da7ce53df320923887b':
docs: add correct toc for google reference
Robert Ly [Fri, 30 Nov 2012 21:26:10 +0000 (13:26 -0800)]
am
6decbd92: am
849cef07: am
1c92ce10: am
24963e1f: Merge "Revert "docs: gms javadocs"" into jb-mr1-dev
* commit '
6decbd92b48b8e105fcc87203df7e265f7cffe68':
Revert "docs: gms javadocs"
Svetoslav Ganov [Fri, 30 Nov 2012 21:26:06 +0000 (13:26 -0800)]
am
d902dbb2: am
ed734d98: am
0e7adaff: am
438a3b35: Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev
* commit '
d902dbb2ea7fa3cf50e89d84d1758bac4738e0e1':
Cannot move edit text cursor to first position using character granularity.
Jason Sams [Fri, 30 Nov 2012 21:26:03 +0000 (13:26 -0800)]
am
98a09c64: am
43174b7d: am
718fb9f1: Fix sample code issues
* commit '
98a09c64d52aa1166a09ab071049bc3536def1cd':
Fix sample code issues
John Spurlock [Fri, 30 Nov 2012 21:24:39 +0000 (13:24 -0800)]
am
4015c3f8: Merge "Only show camera widget to setup users." into jb-mr1.1-dev
* commit '
4015c3f815fa83e67aa72d2c474e7e6f4c2dd5d0':
Only show camera widget to setup users.
Daniel Sandler [Fri, 30 Nov 2012 21:22:03 +0000 (13:22 -0800)]
am
9e129f37: am
924fc3e6: Merge "Add constant for Daydream settings." into jb-mr1.1-dev
* commit '
9e129f37b6dd6f8c3d1a3869ae60285a414c8558':
Add constant for Daydream settings.
Robert Ly [Fri, 30 Nov 2012 21:22:00 +0000 (13:22 -0800)]
am
50246b5b: am
861c55ff: am
2dd93e22: Merge "docs: add correct toc for google reference" into jb-mr1-dev
* commit '
50246b5bc637b166aca1ca188c465800506fc2e3':
docs: add correct toc for google reference
Robert Ly [Fri, 30 Nov 2012 21:21:56 +0000 (13:21 -0800)]
am
849cef07: am
1c92ce10: am
24963e1f: Merge "Revert "docs: gms javadocs"" into jb-mr1-dev
* commit '
849cef07389517f3d08c1217c7c4e004ac5f2636':
Revert "docs: gms javadocs"
Svetoslav Ganov [Fri, 30 Nov 2012 21:21:53 +0000 (13:21 -0800)]
am
ed734d98: am
0e7adaff: am
438a3b35: Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev
* commit '
ed734d98d014945cf28aa5e49ba1fd2ff5c82c01':
Cannot move edit text cursor to first position using character granularity.
Jason Sams [Fri, 30 Nov 2012 21:21:50 +0000 (13:21 -0800)]
am
43174b7d: am
718fb9f1: Fix sample code issues
* commit '
43174b7d2250d5afecabd5a97d2f7fbddc753fd7':
Fix sample code issues
John Spurlock [Fri, 30 Nov 2012 21:20:09 +0000 (13:20 -0800)]
Merge "Only show camera widget to setup users." into jb-mr1.1-dev
Daniel Sandler [Fri, 30 Nov 2012 21:17:22 +0000 (13:17 -0800)]
am
924fc3e6: Merge "Add constant for Daydream settings." into jb-mr1.1-dev
* commit '
924fc3e6ce68f7943f3fd2ced3281c3fd05f2e7f':
Add constant for Daydream settings.
Robert Ly [Fri, 30 Nov 2012 21:17:15 +0000 (13:17 -0800)]
am
861c55ff: am
2dd93e22: Merge "docs: add correct toc for google reference" into jb-mr1-dev
* commit '
861c55ffcc854563f4adec0b094c1b6948c72036':
docs: add correct toc for google reference
Robert Ly [Fri, 30 Nov 2012 21:17:11 +0000 (13:17 -0800)]
am
1c92ce10: am
24963e1f: Merge "Revert "docs: gms javadocs"" into jb-mr1-dev
* commit '
1c92ce10b5123bc374f8cba2c61c4c56f9d4f319':
Revert "docs: gms javadocs"
Svetoslav Ganov [Fri, 30 Nov 2012 21:17:08 +0000 (13:17 -0800)]
am
0e7adaff: am
438a3b35: Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev
* commit '
0e7adaff99778c596bfd3f4c1e42710592c472a2':
Cannot move edit text cursor to first position using character granularity.
Jason Sams [Fri, 30 Nov 2012 21:16:57 +0000 (13:16 -0800)]
am
718fb9f1: Fix sample code issues
* commit '
718fb9f12e31d92e8a81b08f0f2d818dd3654b9c':
Fix sample code issues
Daniel Sandler [Fri, 30 Nov 2012 21:03:07 +0000 (13:03 -0800)]
Merge "Add constant for Daydream settings." into jb-mr1.1-dev
Elliott Hughes [Fri, 30 Nov 2012 20:56:01 +0000 (12:56 -0800)]
am
9813e365: am
940ad4aa: Merge "Make AudioGroup.add locale safe"
* commit '
9813e365e55a59348d12e36e08902899c3f05eb0':
Make AudioGroup.add locale safe
Elliott Hughes [Fri, 30 Nov 2012 20:45:30 +0000 (12:45 -0800)]
am
940ad4aa: Merge "Make AudioGroup.add locale safe"
* commit '
940ad4aaef6ad27a2a214559100a18100b2b3b24':
Make AudioGroup.add locale safe
Robert Ly [Fri, 30 Nov 2012 20:40:43 +0000 (12:40 -0800)]
am
2dd93e22: Merge "docs: add correct toc for google reference" into jb-mr1-dev
* commit '
2dd93e22b6504eda5fb35f8f9e58ddb3f4a22fea':
docs: add correct toc for google reference
Robert Ly [Fri, 30 Nov 2012 20:40:40 +0000 (12:40 -0800)]
am
24963e1f: Merge "Revert "docs: gms javadocs"" into jb-mr1-dev
* commit '
24963e1f7b7ba2712618b8c0ff1750c47ad1c789':
Revert "docs: gms javadocs"
Svetoslav Ganov [Fri, 30 Nov 2012 20:40:37 +0000 (12:40 -0800)]
am
438a3b35: Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev
* commit '
438a3b35f7a6184a19919de90f733be82e21a84c':
Cannot move edit text cursor to first position using character granularity.
Jason Sams [Fri, 30 Nov 2012 03:02:18 +0000 (19:02 -0800)]
Fix sample code issues
Correct min SDK.
Correct file extension on mandelbrot
Change-Id: I508c22c382f1a930b27d8c5f4414cac3a990a332
Robert Ly [Fri, 30 Nov 2012 20:12:32 +0000 (12:12 -0800)]
Merge "docs: add correct toc for google reference" into jb-mr1-dev
Robert Ly [Fri, 30 Nov 2012 19:58:19 +0000 (11:58 -0800)]
docs: add correct toc for google reference
Change-Id: I594794b8d7ed5c52acdc37d5a4eddd2fdd229bcd
Robert Ly [Fri, 30 Nov 2012 19:52:43 +0000 (11:52 -0800)]
Merge "Revert "docs: gms javadocs"" into jb-mr1-dev
Svetoslav Ganov [Fri, 30 Nov 2012 19:43:54 +0000 (11:43 -0800)]
Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev
Elliott Hughes [Fri, 30 Nov 2012 19:20:23 +0000 (11:20 -0800)]
Merge "Make AudioGroup.add locale safe"
Martijn Coenen [Fri, 30 Nov 2012 19:14:05 +0000 (11:14 -0800)]
am
1b3a4362: am
f77445cd: am
b1a01ab0: Merge "Allow the NFC process to call Bluetooth APIs." into jb-mr1.1-dev
* commit '
1b3a4362a08d816d78fdbb04ef115b31c8674420':
Allow the NFC process to call Bluetooth APIs.
Martijn Coenen [Fri, 30 Nov 2012 19:11:44 +0000 (11:11 -0800)]
am
f77445cd: am
b1a01ab0: Merge "Allow the NFC process to call Bluetooth APIs." into jb-mr1.1-dev
* commit '
f77445cd48f9174647c4c7ff539036b5aa08ce6e':
Allow the NFC process to call Bluetooth APIs.
Martijn Coenen [Fri, 30 Nov 2012 19:09:43 +0000 (11:09 -0800)]
am
b1a01ab0: Merge "Allow the NFC process to call Bluetooth APIs." into jb-mr1.1-dev
* commit '
b1a01ab01c2aa5136f7781c3a6ec682590e38ac4':
Allow the NFC process to call Bluetooth APIs.
Martijn Coenen [Fri, 30 Nov 2012 19:07:53 +0000 (11:07 -0800)]
Merge "Allow the NFC process to call Bluetooth APIs." into jb-mr1.1-dev
Dianne Hackborn [Fri, 30 Nov 2012 18:49:08 +0000 (10:49 -0800)]
am
7b1af760: am
1bd7d5e4: am
675814d4: Merge "Maybe fix issue #
7596986: Frequent runtime restarts; IAE at..." into jb-mr1.1-dev
* commit '
7b1af76074423837d26ccb4e3b4c1b5d25baa25e':
Maybe fix issue #
7596986: Frequent runtime restarts; IAE at...
Dianne Hackborn [Fri, 30 Nov 2012 18:47:01 +0000 (10:47 -0800)]
am
1bd7d5e4: am
675814d4: Merge "Maybe fix issue #
7596986: Frequent runtime restarts; IAE at..." into jb-mr1.1-dev
* commit '
1bd7d5e47ed7e73c244b79c5a92d6af1e3e89266':
Maybe fix issue #
7596986: Frequent runtime restarts; IAE at...
Dianne Hackborn [Fri, 30 Nov 2012 18:45:02 +0000 (10:45 -0800)]
am
675814d4: Merge "Maybe fix issue #
7596986: Frequent runtime restarts; IAE at..." into jb-mr1.1-dev
* commit '
675814d488579582e0214cc720d9ccc310173f25':
Maybe fix issue #
7596986: Frequent runtime restarts; IAE at...
Nick Kralevich [Fri, 30 Nov 2012 18:43:24 +0000 (10:43 -0800)]
am
4816f4b4: am
0def7b94: am
849f5188: am
6643ea82: resolved conflicts for merge of
011132a7 to jb-mr1-dev
* commit '
4816f4b4088ce35b2cddf1034ae483e30b7ed22c':
Secure a handful of framework broadcasts
Dianne Hackborn [Fri, 30 Nov 2012 18:41:47 +0000 (10:41 -0800)]
Merge "Maybe fix issue #
7596986: Frequent runtime restarts; IAE at..." into jb-mr1.1-dev
Nick Kralevich [Fri, 30 Nov 2012 18:40:18 +0000 (10:40 -0800)]
am
0def7b94: am
849f5188: am
6643ea82: resolved conflicts for merge of
011132a7 to jb-mr1-dev
* commit '
0def7b94960ae551c498212d97c7919da7529429':
Secure a handful of framework broadcasts
Nick Kralevich [Fri, 30 Nov 2012 18:38:21 +0000 (10:38 -0800)]
am
849f5188: am
6643ea82: resolved conflicts for merge of
011132a7 to jb-mr1-dev
* commit '
849f5188e34ea667b689e795d88411a2412db2e8':
Secure a handful of framework broadcasts
Nick Kralevich [Fri, 30 Nov 2012 18:35:44 +0000 (10:35 -0800)]
am
6643ea82: resolved conflicts for merge of
011132a7 to jb-mr1-dev
* commit '
6643ea823bf8b0726da0518ffecfcc7a9f60f87d':
Secure a handful of framework broadcasts
Nick Kralevich [Fri, 30 Nov 2012 18:23:56 +0000 (10:23 -0800)]
resolved conflicts for merge of
011132a7 to jb-mr1-dev
Change-Id: I304ef91eef99526dec348a59b12c0934173bcfcb
Daniel Sandler [Fri, 30 Nov 2012 18:14:29 +0000 (10:14 -0800)]
am
590e0e5b: am
5dde83c4: am
0a6620e8: Merge "Suppress quick settings if setup has not been completed." into jb-mr1.1-dev
* commit '
590e0e5b8dbc1f9d9bef69d675b158d6a36ac073':
Suppress quick settings if setup has not been completed.
Scott Main [Fri, 30 Nov 2012 18:12:51 +0000 (10:12 -0800)]
am
63c84b75: am
0988f445: am
73117424: am
580aa579: Merge "docs: gms and gcm javadocs" into jb-mr1-dev
* commit '
63c84b75e41b62cab9c87991810bd49e49bd50cd':
docs: gms and gcm javadocs
Marco Nelissen [Fri, 30 Nov 2012 18:12:47 +0000 (10:12 -0800)]
am
7f05beb1: am
334a36b3: Merge "Change the text color of timer in MediaController"
* commit '
7f05beb125a0270fee58a96b533baf97536d8b7e':
Change the text color of timer in MediaController
Scott Main [Fri, 30 Nov 2012 18:12:44 +0000 (10:12 -0800)]
am
aa9cc316: am
f239a76c: am
3cddba24: am
b74844cd: docs: revise doc titles
* commit '
aa9cc3163e9264033d7e848b73067c09021e23b0':
docs: revise doc titles
Daniel Sandler [Fri, 30 Nov 2012 18:09:16 +0000 (10:09 -0800)]
am
5dde83c4: am
0a6620e8: Merge "Suppress quick settings if setup has not been completed." into jb-mr1.1-dev
* commit '
5dde83c4d1e9b3c39f0dbba07421a7dcf678a4cf':
Suppress quick settings if setup has not been completed.
Daniel Sandler [Fri, 30 Nov 2012 18:07:01 +0000 (10:07 -0800)]
am
0a6620e8: Merge "Suppress quick settings if setup has not been completed." into jb-mr1.1-dev
* commit '
0a6620e8615ade341336730a5aa9f0e62a295c9f':
Suppress quick settings if setup has not been completed.
Robert Greenwalt [Fri, 30 Nov 2012 18:05:33 +0000 (10:05 -0800)]
am
b8da0376: Secure a handful of framework broadcasts
* commit '
b8da0376f2d50fdb2ee58deacc6d2041689e36d1':
Secure a handful of framework broadcasts
Makoto Onuki [Fri, 30 Nov 2012 18:05:20 +0000 (10:05 -0800)]
resolved conflicts for merge of
9cd8c711 to master
Change-Id: I5e2d13c44f6a0589648e5934c8c36790da85e828
Daniel Sandler [Fri, 30 Nov 2012 18:05:01 +0000 (10:05 -0800)]
Merge "Suppress quick settings if setup has not been completed." into jb-mr1.1-dev
Scott Main [Fri, 30 Nov 2012 18:03:29 +0000 (10:03 -0800)]
am
0988f445: am
73117424: am
580aa579: Merge "docs: gms and gcm javadocs" into jb-mr1-dev
* commit '
0988f445a1b802f56ff7576d34e06cce7538701a':
docs: gms and gcm javadocs
Scott Main [Fri, 30 Nov 2012 18:01:19 +0000 (10:01 -0800)]
am
73117424: am
580aa579: Merge "docs: gms and gcm javadocs" into jb-mr1-dev
* commit '
73117424029ce1983f2f0a2f706d08e1f5870955':
docs: gms and gcm javadocs
Scott Main [Fri, 30 Nov 2012 17:59:42 +0000 (09:59 -0800)]
am
580aa579: Merge "docs: gms and gcm javadocs" into jb-mr1-dev
* commit '
580aa579080b5f4ccddb31964bc0caa76ee73a7a':
docs: gms and gcm javadocs
Scott Main [Fri, 30 Nov 2012 17:56:48 +0000 (09:56 -0800)]
Merge "docs: gms and gcm javadocs" into jb-mr1-dev
Marco Nelissen [Fri, 30 Nov 2012 17:55:34 +0000 (09:55 -0800)]
am
334a36b3: Merge "Change the text color of timer in MediaController"
* commit '
334a36b32c96d26f3aedcca81ab475391414dc80':
Change the text color of timer in MediaController
Scott Main [Fri, 30 Nov 2012 17:54:28 +0000 (09:54 -0800)]
am
f239a76c: am
3cddba24: am
b74844cd: docs: revise doc titles
* commit '
f239a76c156e386d5464dac49a1718a91c9c24d4':
docs: revise doc titles
Scott Main [Fri, 30 Nov 2012 17:52:22 +0000 (09:52 -0800)]
am
3cddba24: am
b74844cd: docs: revise doc titles
* commit '
3cddba247e4f9c188cc654a0c3df9db693874199':
docs: revise doc titles
Scott Main [Fri, 30 Nov 2012 17:49:51 +0000 (09:49 -0800)]
am
b74844cd: docs: revise doc titles
* commit '
b74844cd87160a21a77cdc1c35b3d19ce9f47249':
docs: revise doc titles
Scott Main [Fri, 30 Nov 2012 05:13:30 +0000 (21:13 -0800)]
docs: revise doc titles
Change-Id: I7a11aabd90df758a5118730fe2d1b6c4f4e6ecfd
Irfan Sheriff [Fri, 30 Nov 2012 17:41:51 +0000 (09:41 -0800)]
Merge "Support for dumping transition only messages"
Makoto Onuki [Fri, 30 Nov 2012 17:38:21 +0000 (09:38 -0800)]
am
95229721: am
c50ed032: Merge "Remove unused IExtendedNetworkService" into jb-mr1.1-dev
* commit '
9522972108ac5ff009eef2a124cfc72e692d54b9':
Remove unused IExtendedNetworkService
Makoto Onuki [Fri, 30 Nov 2012 17:36:11 +0000 (09:36 -0800)]
am
c50ed032: Merge "Remove unused IExtendedNetworkService" into jb-mr1.1-dev
* commit '
c50ed032c71069893d9ad0bb81ee8013fdd44d66':
Remove unused IExtendedNetworkService
Makoto Onuki [Fri, 30 Nov 2012 17:33:09 +0000 (09:33 -0800)]
Merge "Remove unused IExtendedNetworkService" into jb-mr1.1-dev
Eric Laurent [Fri, 30 Nov 2012 17:33:01 +0000 (09:33 -0800)]
am
b46857d2: am
b1f45c4a: am
c3eb57b2: Merge "AudioService: improve initial safe volume delay" into jb-mr1.1-dev
* commit '
b46857d228edc53878e738ffd484dea1acf44baf':
AudioService: improve initial safe volume delay
Eric Laurent [Fri, 30 Nov 2012 17:31:03 +0000 (09:31 -0800)]
am
b1f45c4a: am
c3eb57b2: Merge "AudioService: improve initial safe volume delay" into jb-mr1.1-dev
* commit '
b1f45c4a587e5adda39774a867c78b56682c5f0d':
AudioService: improve initial safe volume delay
Eric Laurent [Fri, 30 Nov 2012 17:28:56 +0000 (09:28 -0800)]
am
c3eb57b2: Merge "AudioService: improve initial safe volume delay" into jb-mr1.1-dev
* commit '
c3eb57b22f930f07448e877f0814eb5659bfc3c5':
AudioService: improve initial safe volume delay
Eric Laurent [Fri, 30 Nov 2012 17:26:30 +0000 (09:26 -0800)]
Merge "AudioService: improve initial safe volume delay" into jb-mr1.1-dev
Marco Nelissen [Fri, 30 Nov 2012 17:03:09 +0000 (09:03 -0800)]
Merge "Change the text color of timer in MediaController"
Roger Chen [Fri, 16 Nov 2012 04:37:39 +0000 (12:37 +0800)]
Change the text color of timer in MediaController
The color of timer and backgroud in MediaController
are too closer to distinguish.
Change-Id: Id60ecbc26233857c7ef291ef891c9d4720309dfa
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
Irfan Sheriff [Thu, 29 Nov 2012 17:42:13 +0000 (09:42 -0800)]
Support for dumping transition only messages
Change-Id: I4968e28334f9dd49bd8fb81d04b25d62ca6da300
Daniel Sandler [Fri, 30 Nov 2012 15:34:53 +0000 (07:34 -0800)]
am
d1b73fc1: am
71988c81: am
386165a3: Merge "Only show "charging" if the battery is really charging." into jb-mr1.1-dev
* commit '
d1b73fc17ca222cc627c932625efe9c3c1ad3b0c':
Only show "charging" if the battery is really charging.
Daniel Sandler [Fri, 30 Nov 2012 15:32:24 +0000 (07:32 -0800)]
am
71988c81: am
386165a3: Merge "Only show "charging" if the battery is really charging." into jb-mr1.1-dev
* commit '
71988c81a3ae9d372c1eb2991f509a8c5c83f08c':
Only show "charging" if the battery is really charging.
Daniel Sandler [Fri, 30 Nov 2012 15:29:46 +0000 (07:29 -0800)]
am
386165a3: Merge "Only show "charging" if the battery is really charging." into jb-mr1.1-dev
* commit '
386165a3ae09b150165e8e7c310e194231071271':
Only show "charging" if the battery is really charging.
Daniel Sandler [Fri, 30 Nov 2012 15:27:36 +0000 (07:27 -0800)]
Merge "Only show "charging" if the battery is really charging." into jb-mr1.1-dev
John Spurlock [Fri, 30 Nov 2012 14:20:43 +0000 (09:20 -0500)]
Only show camera widget to setup users.
And remove misspelled and unused field in KeyguardHostView.
Bug:
7645811
Change-Id: I3d6ceae8d25d0af7b504b4c22782611d25462a62
Robert Ly [Fri, 30 Nov 2012 12:02:04 +0000 (04:02 -0800)]
docs: gms and gcm javadocs
Change-Id: I93fe06983e42cb21d05d020e84cafe31792a9c8e
Robert Ly [Fri, 30 Nov 2012 11:07:11 +0000 (03:07 -0800)]
docs: gms fixes
Change-Id: I197678e85ea2d11f35ccecdd7abc9564035acad4
Robert Ly [Fri, 30 Nov 2012 08:18:20 +0000 (00:18 -0800)]
Revert "docs: gms javadocs"
This reverts commit
830b23b76676542cbcb5ef3c60c869460d4c5466
Change-Id: I75a9d4f6aa424ed4439b4415d575716a40b75343
Dirk Dougherty [Fri, 30 Nov 2012 05:21:34 +0000 (21:21 -0800)]
am
fa459613: am
6875b438: am
a4f67a88: am
49be1ef3: Merge "Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved." into jb-mr1-dev
* commit '
fa4596131d818667e26ffbdba6f351f6c1073ee9':
Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved.
Dirk Dougherty [Fri, 30 Nov 2012 05:20:00 +0000 (21:20 -0800)]
am
6875b438: am
a4f67a88: am
49be1ef3: Merge "Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved." into jb-mr1-dev
* commit '
6875b4385c1d1e4c1160ba6cd9128a461565338b':
Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved.
Dirk Dougherty [Fri, 30 Nov 2012 05:17:03 +0000 (21:17 -0800)]
am
a4f67a88: am
49be1ef3: Merge "Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved." into jb-mr1-dev
* commit '
a4f67a88f421c454cb07a59e9ce5b0b720df55fc':
Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved.
Dirk Dougherty [Fri, 30 Nov 2012 05:15:04 +0000 (21:15 -0800)]
am
49be1ef3: Merge "Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved." into jb-mr1-dev
* commit '
49be1ef39cfa2c718cb56dee088338ea97019c11':
Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved.
Baligh Uddin [Fri, 30 Nov 2012 05:14:10 +0000 (21:14 -0800)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 30 Nov 2012 05:13:47 +0000 (21:13 -0800)]
am
b62b41d3: (-s ours) am
02d29ff5: am
a1b3b99c: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
* commit '
b62b41d3bad26820aebaca1e1c233f0f367386da':
Import translations. DO NOT MERGE
Dirk Dougherty [Fri, 30 Nov 2012 05:11:24 +0000 (21:11 -0800)]
Merge "Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved." into jb-mr1-dev
Baligh Uddin [Fri, 30 Nov 2012 05:11:12 +0000 (21:11 -0800)]
am
02d29ff5: am
a1b3b99c: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
* commit '
02d29ff5fe1fcd89baf6af96d48c56e1b880178d':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 30 Nov 2012 05:11:08 +0000 (21:11 -0800)]
am
2cdc5c37: (-s ours) am
cb21c8cc: am
2c2b232b: am
2138e5c0: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
2cdc5c37372996ba7553cd6fc988af58f9785884':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 30 Nov 2012 05:09:34 +0000 (21:09 -0800)]
am
cb21c8cc: am
2c2b232b: am
2138e5c0: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
cb21c8cc2be6e2e6ea842680d476748e126f3adf':
Import translations. DO NOT MERGE
OSDN Git Service
