OSDN Git Service
The Android Open Source Project [Fri, 6 Dec 2013 01:25:39 +0000 (17:25 -0800)]
The Android Open Source Project [Thu, 5 Dec 2013 20:38:23 +0000 (12:38 -0800)]
Lance Jin-woong Chang [Thu, 5 Dec 2013 01:40:17 +0000 (17:40 -0800)]
am
1f5e6639: (-s ours) am
5d65a47c: Merge "Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug:
11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"" into klp-dev
* commit '
1f5e66392e4fa01d2686a06044a8f0edfda6310f':
Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug:
11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"
Lance Jin-woong Chang [Thu, 5 Dec 2013 01:29:27 +0000 (17:29 -0800)]
am
5d65a47c: Merge "Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug:
11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"" into klp-dev
* commit '
5d65a47c395918d3f777d99747eb4f2e901566ee':
Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug:
11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"
Lance Chang [Thu, 5 Dec 2013 01:28:36 +0000 (17:28 -0800)]
am
0ea2229b: (-s ours) am
071fbfd3: Merge "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug:
11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" into klp-dev
* commit '
0ea2229b4b39146ed41b99ca0542c73e5305d059':
Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug:
11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181
Lance Jin-woong Chang [Thu, 5 Dec 2013 01:27:43 +0000 (01:27 +0000)]
Merge "Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug:
11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"" into klp-dev
Lance Jin-woong Chang [Thu, 5 Dec 2013 00:59:51 +0000 (00:59 +0000)]
Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug:
11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"
This reverts commit
5796dad9a41e9801878f2cf0feb76977da4b025b.
Change-Id: Ib9de134bef6328dac6aa5a4b6033c584fb672ab5
Lance Chang [Thu, 5 Dec 2013 00:49:45 +0000 (16:49 -0800)]
am
071fbfd3: Merge "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug:
11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" into klp-dev
* commit '
071fbfd3f35c01fb1c4052614902dabe16af691f':
Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug:
11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181
Lance Chang [Thu, 5 Dec 2013 00:47:14 +0000 (00:47 +0000)]
Merge "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug:
11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" into klp-dev
Geoff Mendal [Wed, 4 Dec 2013 21:45:17 +0000 (13:45 -0800)]
am
65c2a285: (-s ours) am
3c29831e: (-s ours) Import translations. DO NOT MERGE
* commit '
65c2a2850526802c542ac5a1dee26eab41c33ec3':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Dec 2013 21:42:04 +0000 (13:42 -0800)]
am
3c29831e: (-s ours) Import translations. DO NOT MERGE
* commit '
3c29831e87bb131246e88aeb2b18d1fc11627e5d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Dec 2013 21:28:51 +0000 (13:28 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4082ee8a0e0fe74e5328bd304f44cab57d4f40cb
Auto-generated-cl: translation import
Amith Yamasani [Wed, 4 Dec 2013 21:05:17 +0000 (13:05 -0800)]
am
e10f8528: Merge "Fix switching running/cached apps with memory bar"
* commit '
e10f8528220fc4506ff6deee5c71ddab3da5e21d':
Fix switching running/cached apps with memory bar
Amith Yamasani [Wed, 4 Dec 2013 21:05:16 +0000 (13:05 -0800)]
am
f67aa398: Merge "Wrong referring to the resource - id/android:id"
* commit '
f67aa3985d36cace1fbea2537bcdc97f8b6d81ef':
Wrong referring to the resource - id/android:id
Amith Yamasani [Wed, 4 Dec 2013 19:17:33 +0000 (19:17 +0000)]
Merge "Fix switching running/cached apps with memory bar"
Amith Yamasani [Wed, 4 Dec 2013 19:05:29 +0000 (19:05 +0000)]
Merge "Wrong referring to the resource - id/android:id"
Amith Yamasani [Tue, 3 Dec 2013 19:38:00 +0000 (11:38 -0800)]
am
3d6ca113: am
72a7afb0: Merge "Put fragment in specific activity\'s whitelist" into klp-dev
* commit '
3d6ca11349f0ff2b53f4058731da9e904db2c938':
Put fragment in specific activity's whitelist
Amith Yamasani [Tue, 3 Dec 2013 19:35:14 +0000 (11:35 -0800)]
am
72a7afb0: Merge "Put fragment in specific activity\'s whitelist" into klp-dev
* commit '
72a7afb0935264586c821062279d39d8338b1e3d':
Put fragment in specific activity's whitelist
Amith Yamasani [Tue, 3 Dec 2013 19:33:21 +0000 (19:33 +0000)]
Merge "Put fragment in specific activity's whitelist" into klp-dev
Lance Chang [Tue, 3 Dec 2013 10:10:43 +0000 (19:10 +0900)]
Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change
Bug:
11923434
Change-Id: I34a353137338b0f8d55e2309f037c34922141181
Geoff Mendal [Mon, 2 Dec 2013 20:48:22 +0000 (12:48 -0800)]
am
d6ea675c: (-s ours) am
f8e1829c: (-s ours) Import translations. DO NOT MERGE
* commit '
d6ea675c11285c02a625d59a8d88270649da6a5f':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Dec 2013 20:45:29 +0000 (12:45 -0800)]
am
f8e1829c: (-s ours) Import translations. DO NOT MERGE
* commit '
f8e1829c99f1ad74131dad12e220b95a629cd9b5':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Dec 2013 20:13:18 +0000 (12:13 -0800)]
Import translations. DO NOT MERGE
Change-Id: I64dae5dfac03e30738558bddc4d44867c2e2b52b
Auto-generated-cl: translation import
Geoff Mendal [Wed, 27 Nov 2013 20:39:48 +0000 (12:39 -0800)]
am
fa1df427: (-s ours) am
b8fe3aa2: (-s ours) Import translations. DO NOT MERGE
* commit '
fa1df42735a7d0ef98a2c1d69d9fbe41be9d73d9':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 27 Nov 2013 20:36:00 +0000 (12:36 -0800)]
am
b8fe3aa2: (-s ours) Import translations. DO NOT MERGE
* commit '
b8fe3aa2abbf106bb1bb1d651cc59e425309d788':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 27 Nov 2013 20:18:28 +0000 (12:18 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie6abf3e15ab0bdf9c7fcf7fef498a4c23298c653
Auto-generated-cl: translation import
Lorenzo Colitti [Tue, 26 Nov 2013 16:38:50 +0000 (08:38 -0800)]
am
540d26e8: Merge "Dynamically update connectivity and IP address."
* commit '
540d26e8449159ebc2d84b8062f20ab4c6337f77':
Dynamically update connectivity and IP address.
Lorenzo Colitti [Tue, 26 Nov 2013 16:38:49 +0000 (08:38 -0800)]
am
20ab234f: Merge "Cache preferences and services in status dialog."
* commit '
20ab234f3d8ecdcbae2c998ded48ebf022ffa963':
Cache preferences and services in status dialog.
Ivan Kovac [Mon, 25 Nov 2013 13:55:21 +0000 (14:55 +0100)]
Wrong referring to the resource - id/android:id
We were referring to the resource defined as
@+android:id with R.id. which is wrong. This
fix changes the @+android:id/ to @+id/
Change-Id: Ifdca7347bff31311c9c07aecdb110946e4a239ed
Lorenzo Colitti [Tue, 26 Nov 2013 01:07:24 +0000 (01:07 +0000)]
Merge "Dynamically update connectivity and IP address."
Lorenzo Colitti [Tue, 26 Nov 2013 01:06:38 +0000 (01:06 +0000)]
Merge "Cache preferences and services in status dialog."
Geoff Mendal [Mon, 25 Nov 2013 20:58:30 +0000 (12:58 -0800)]
am
c2d1fdac: (-s ours) am
d82e8f2b: (-s ours) Import translations. DO NOT MERGE
* commit '
c2d1fdac9e7e914d4ecded6016c9056fa250d267':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Nov 2013 20:55:11 +0000 (12:55 -0800)]
am
d82e8f2b: (-s ours) Import translations. DO NOT MERGE
* commit '
d82e8f2bec1421c660c786f89e75ffcc4a6fd11e':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Nov 2013 19:32:22 +0000 (11:32 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0a14a545804964011401d47a44bb6a3d0de94a08
Auto-generated-cl: translation import
Amith Yamasani [Mon, 25 Nov 2013 19:10:00 +0000 (11:10 -0800)]
Put fragment in specific activity's whitelist
Change-Id: I782dc8ec29e49a834832dc8357b3fdb12846e8a9
Lorenzo Colitti [Fri, 6 Sep 2013 09:04:26 +0000 (18:04 +0900)]
Dynamically update connectivity and IP address.
The settings status page dynamically updates mobile network
status (in/out of service, signal strength, network type, etc.)
but not IP address and connectivity information. Dynamically
update that information as well, for consistency.
For consistency, also update the advanced wifi settings page.
[Cherry-pick of
deb8f08ace7e255939d793c8a5a0006d424734bc]
Bug:
10232006
Change-Id: I3a292d8bd9e36ab16c37e107eefff4b37d884a4c
Lorenzo Colitti [Thu, 7 Nov 2013 18:53:29 +0000 (03:53 +0900)]
Cache preferences and services in status dialog.
Currently, the status dialog fetches the preferences and system
services that it uses to display connectivity information (e.g.,
IP and MAC addresses) only when the dialog is first opened. This
is fine because the connectivity information is only filled in
once and never updated.
In order to have this information update dynamically (like the
rest of the dialog), fetch and cache these objects in onCreate.
The next change will actually make this information update on
network changes.
[Cherry-pick of
6eb6a908217e080aea43406028be491d269bdbb0]
Bug:
10232006
Change-Id: Ib4072674543e517cf6935e3e03f35090e728090a
The Android Open Source Project [Sat, 23 Nov 2013 03:18:34 +0000 (19:18 -0800)]
The Android Open Source Project [Fri, 22 Nov 2013 18:35:36 +0000 (10:35 -0800)]
Geoff Mendal [Thu, 21 Nov 2013 22:10:26 +0000 (14:10 -0800)]
am
548614a4: (-s ours) am
c3bd6087: (-s ours) Import translations. DO NOT MERGE
* commit '
548614a4e6e0571d5cf06eb5514d0db8fc017d0b':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 21 Nov 2013 22:07:57 +0000 (14:07 -0800)]
am
c3bd6087: (-s ours) Import translations. DO NOT MERGE
* commit '
c3bd608799f2239dfa8d739b2732954e4fd658e5':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 21 Nov 2013 20:40:04 +0000 (12:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8863a00a23acee9b961b5bf1a0f082ffe5c7b3a1
Auto-generated-cl: translation import
Baligh Uddin [Wed, 20 Nov 2013 21:19:50 +0000 (13:19 -0800)]
am
cd0726f7: (-s ours) am
f06ce4eb: (-s ours) Import translations. DO NOT MERGE
* commit '
cd0726f7d824759984a7024826fbfbcaba575400':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 20 Nov 2013 21:15:25 +0000 (13:15 -0800)]
am
f06ce4eb: (-s ours) Import translations. DO NOT MERGE
* commit '
f06ce4eb9668415c23b16dbd7d8c50702466f8c4':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 20 Nov 2013 19:27:32 +0000 (11:27 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5ef68d36b77bb0374026bdf5e1d2a909156be3d7
Auto-generated-cl: translation import
Jeff Brown [Tue, 19 Nov 2013 03:09:55 +0000 (19:09 -0800)]
am
017d2a18: am
130118d4: Add help url for remote display.
* commit '
017d2a189ac758ad035182a886c4f4e578cee6f2':
Add help url for remote display.
Jeff Brown [Tue, 19 Nov 2013 03:07:06 +0000 (19:07 -0800)]
am
130118d4: Add help url for remote display.
* commit '
130118d43628c058e3bf82f5d978d383f19390de':
Add help url for remote display.
Jeff Brown [Mon, 18 Nov 2013 20:26:16 +0000 (12:26 -0800)]
Add help url for remote display.
Bug:
11736504
Change-Id: I83d278731cf853ff911ff1a8b82a942881cb4727
Baligh Uddin [Mon, 18 Nov 2013 19:18:59 +0000 (11:18 -0800)]
am
6d34b698: (-s ours) am
91c54aa8: (-s ours) Import translations. DO NOT MERGE
* commit '
6d34b6988b257eb35cd7162d403f6da8114e0b9b':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 18 Nov 2013 19:15:12 +0000 (11:15 -0800)]
am
91c54aa8: (-s ours) Import translations. DO NOT MERGE
* commit '
91c54aa81849fd60839ac62efb005df390c64438':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 18 Nov 2013 19:02:58 +0000 (11:02 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2c40d9f0cd08ff5d746f6ab3d608a12ed239ed3b
Auto-generated-cl: translation import
Baligh Uddin [Fri, 15 Nov 2013 19:59:35 +0000 (11:59 -0800)]
am
9c8a463c: am
beb9a03b: Merge "Remove hardcoded msgid. We have already leveraged in TC." into klp-dev
* commit '
9c8a463c3005d8b3d96bde28ecc00a5b2788d9e3':
Remove hardcoded msgid. We have already leveraged in TC.
Baligh Uddin [Fri, 15 Nov 2013 19:56:55 +0000 (11:56 -0800)]
am
beb9a03b: Merge "Remove hardcoded msgid. We have already leveraged in TC." into klp-dev
* commit '
beb9a03b716d152ea25813fca3a93a1ec781a685':
Remove hardcoded msgid. We have already leveraged in TC.
Baligh Uddin [Fri, 15 Nov 2013 19:52:40 +0000 (19:52 +0000)]
Merge "Remove hardcoded msgid. We have already leveraged in TC." into klp-dev
Baligh Uddin [Fri, 15 Nov 2013 19:46:33 +0000 (11:46 -0800)]
am
72d674af: (-s ours) am
ebf21489: (-s ours) Import translations. DO NOT MERGE
* commit '
72d674af97df6f964f217ad7eddec7ea58612114':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Nov 2013 19:42:56 +0000 (11:42 -0800)]
am
ebf21489: (-s ours) Import translations. DO NOT MERGE
* commit '
ebf214892d020d9f310dd583e519bc3e1e8925cf':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Nov 2013 19:31:33 +0000 (11:31 -0800)]
Import translations. DO NOT MERGE
bug:
11696928
Change-Id: I500d2c96aef949f30d9fbabf2777563e9e68dbe6
Auto-generated-cl: translation import
Baligh Uddin [Fri, 15 Nov 2013 19:21:11 +0000 (11:21 -0800)]
Remove hardcoded msgid. We have already leveraged in TC.
bug:
11696928
Change-Id: I71beb961ff73902cf5a67c5de1175db30eaa0871
Baligh Uddin [Fri, 15 Nov 2013 19:15:23 +0000 (11:15 -0800)]
am
67a0472f: (-s ours) am
503b6def: (-s ours) Import translations. DO NOT MERGE
* commit '
67a0472f3f53c924d180fdabe41bb26608219a83':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Nov 2013 19:11:55 +0000 (11:11 -0800)]
am
503b6def: (-s ours) Import translations. DO NOT MERGE
* commit '
503b6deff226b12450decd5997111c77bd179a88':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Nov 2013 19:04:19 +0000 (11:04 -0800)]
Import translations. DO NOT MERGE
Bug:
11696928
Change-Id: I23f78d9fb53fd5da325f121bac78ac60a9c78bb6
Auto-generated-cl: translation import
Svetoslav [Fri, 15 Nov 2013 06:30:53 +0000 (22:30 -0800)]
am
196bc5c6: am
e7b781f5: Merge "Show correct message for a print job that is being canceled." into klp-dev
* commit '
196bc5c63a3f08bc8dc972ee82f7fe98a453b8f5':
Show correct message for a print job that is being canceled.
Svetoslav [Fri, 15 Nov 2013 06:27:36 +0000 (22:27 -0800)]
am
e7b781f5: Merge "Show correct message for a print job that is being canceled." into klp-dev
* commit '
e7b781f574b8ec957d6254ed9edaef469c7085a5':
Show correct message for a print job that is being canceled.
Svetoslav [Fri, 15 Nov 2013 06:23:54 +0000 (06:23 +0000)]
Merge "Show correct message for a print job that is being canceled." into klp-dev
Svetoslav [Fri, 15 Nov 2013 02:15:15 +0000 (18:15 -0800)]
Show correct message for a print job that is being canceled.
1. If a print job is being canceled we now show appropriate
message that matches what the notification shows.
2. If a print job is being canceled we do not show the cancel
button.
bug:
11696928
Change-Id: I0fc4f8226c4aa9acd6a4b65811f4228e56018315
Jeff Brown [Fri, 15 Nov 2013 01:35:01 +0000 (17:35 -0800)]
am
8174aad5: am
36f98428: Merge "Update cast screen strings." into klp-dev
* commit '
8174aad50382280c55a33f2572eb1fcdb53078c1':
Update cast screen strings.
Jeff Brown [Fri, 15 Nov 2013 01:31:33 +0000 (17:31 -0800)]
am
36f98428: Merge "Update cast screen strings." into klp-dev
* commit '
36f98428d450226670d67123ce02cc0c0ca75621':
Update cast screen strings.
Jeff Brown [Fri, 15 Nov 2013 01:29:05 +0000 (01:29 +0000)]
Merge "Update cast screen strings." into klp-dev
Jim Miller [Fri, 15 Nov 2013 00:29:39 +0000 (16:29 -0800)]
am
31ee7e19: am
fb3d5cad: Don\'t show keyguard on top of CryptKeeper
* commit '
31ee7e19a040ab7660d39a6693f6ed38f7c961ad':
Don't show keyguard on top of CryptKeeper
Jim Miller [Fri, 15 Nov 2013 00:27:24 +0000 (16:27 -0800)]
am
fb3d5cad: Don\'t show keyguard on top of CryptKeeper
* commit '
fb3d5cad48876dbd366fd8b562529d355d2428db':
Don't show keyguard on top of CryptKeeper
Jeff Brown [Fri, 15 Nov 2013 00:04:13 +0000 (16:04 -0800)]
Update cast screen strings.
Bug:
11257292
Change-Id: I280f99bb91ebd0badd06b7fdca25aa3f2e96d201
Jim Miller [Thu, 14 Nov 2013 22:40:22 +0000 (14:40 -0800)]
Don't show keyguard on top of CryptKeeper
The fix in Change Ifbe4cdf40e3b76d2069ecace940f85fa58f31187 causes
keyguard to be more aggressive about showing itself.
CryptKeeper itself should explicitly dismiss keyguard.
Fixes bug
11680832
Change-Id: I87287762b73bdffc6f1800379f02f70f4bd873a8
David Christie [Thu, 14 Nov 2013 22:20:31 +0000 (14:20 -0800)]
am
7ff9f2b4: am
b1ded62f: Merge "Update power widget icons and fix location behavior Bug:
11242129" into klp-dev
* commit '
7ff9f2b488e4017c7b3385fb067a14cfc07764fb':
Update power widget icons and fix location behavior Bug:
11242129
David Christie [Thu, 14 Nov 2013 20:16:06 +0000 (12:16 -0800)]
am
b1ded62f: Merge "Update power widget icons and fix location behavior Bug:
11242129" into klp-dev
* commit '
b1ded62f3fd8afa2507fc8d284522019dc1e31e2':
Update power widget icons and fix location behavior Bug:
11242129
David Christie [Thu, 14 Nov 2013 20:12:41 +0000 (20:12 +0000)]
Merge "Update power widget icons and fix location behavior Bug:
11242129" into klp-dev
Baligh Uddin [Thu, 14 Nov 2013 02:37:13 +0000 (18:37 -0800)]
am
2f888a47: (-s ours) am
9b28d5a0: (-s ours) Import translations. DO NOT MERGE
* commit '
2f888a47522f8dcaad3f7ec32274675dd74c1501':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 14 Nov 2013 02:33:06 +0000 (18:33 -0800)]
am
9b28d5a0: (-s ours) Import translations. DO NOT MERGE
* commit '
9b28d5a0c3a6ac46a55a5c8c3b10791494fd61c5':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 14 Nov 2013 02:06:51 +0000 (18:06 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib1ee67aee616ec7f9c66191102dc2fbee9ef39de
Auto-generated-cl: translation import
Jeff Brown [Wed, 13 Nov 2013 17:02:20 +0000 (09:02 -0800)]
am
3aedfdfd: am
81ed0438: Finalize assets for screen cast.
* commit '
3aedfdfdbfcff15f6b761fca3b6bda8449f11053':
Finalize assets for screen cast.
Jeff Brown [Wed, 13 Nov 2013 16:57:58 +0000 (08:57 -0800)]
am
81ed0438: Finalize assets for screen cast.
* commit '
81ed043857dadcb69885c1e2ac37d63925c56c65':
Finalize assets for screen cast.
Jeff Brown [Wed, 13 Nov 2013 06:04:49 +0000 (22:04 -0800)]
Finalize assets for screen cast.
Bug:
11257292
Change-Id: I483496b4fc92bcf8e2c4f080a5a5d5bf97318b5d
Baligh Uddin [Mon, 11 Nov 2013 22:48:31 +0000 (14:48 -0800)]
am
74a503fd: (-s ours) am
622b5d2a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
74a503fddf2626f6aedec486e9b30c4beb6377e2':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 11 Nov 2013 22:44:42 +0000 (14:44 -0800)]
am
622b5d2a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
622b5d2a6af0cda319e4fbe066d62e36b06f7aa3':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 11 Nov 2013 22:41:12 +0000 (22:41 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 11 Nov 2013 18:35:06 +0000 (10:35 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icd51d4bde4dadc325ff26b08dece13e761a99430
Auto-generated-cl: translation import
Jeff Brown [Mon, 11 Nov 2013 18:27:24 +0000 (10:27 -0800)]
am
2fba8be9: am
4e54c2a1: Integrate remote display routes into screen cast settings UI.
* commit '
2fba8be9c0c9da814e40af00847f3f2d28cf7f01':
Integrate remote display routes into screen cast settings UI.
Jeff Brown [Mon, 11 Nov 2013 18:21:59 +0000 (10:21 -0800)]
am
4e54c2a1: Integrate remote display routes into screen cast settings UI.
* commit '
4e54c2a17765aed01ba23c9b0ec4d41e66c698b7':
Integrate remote display routes into screen cast settings UI.
Jeff Brown [Mon, 11 Nov 2013 05:02:20 +0000 (21:02 -0800)]
Integrate remote display routes into screen cast settings UI.
Merged remote display route selection into the existing wifi
display preference UI. Moved the on/off toggle over to a menu item.
The preference page is now mainly implemented in terms of the
media router. It only interacts with the display manager for the purpose
of pairing with new devices or making wifi display certification
controls available.
This means that the observed state is now completely consistent across
the system ui, settings, and applications that use the media router.
Bug:
11257292
Change-Id: I3705570812384fef4bfffeccaaccf7895d370d12
Ed Heyl [Fri, 8 Nov 2013 21:59:55 +0000 (13:59 -0800)]
am
7ebe4c6c: am
a27816dc: merge in release branch changes (no-op).
* commit '
7ebe4c6c209e983e648e2529d68ebe2c36bf7733':
Revert "Accessibility: filter touches to Enable button"
Ed Heyl [Fri, 8 Nov 2013 21:31:32 +0000 (13:31 -0800)]
am
a27816dc: merge in release branch changes (no-op).
* commit '
a27816dc2d72f5757ee5377ccd03798736c96fd8':
Revert "Accessibility: filter touches to Enable button"
Ed Heyl [Fri, 8 Nov 2013 21:23:52 +0000 (13:23 -0800)]
merge in release branch changes (no-op).
David Christie [Thu, 31 Oct 2013 18:03:36 +0000 (11:03 -0700)]
Update power widget icons and fix location behavior
Bug:
11242129
Change-Id: I29f5b4cf914ece4b0991229f384012eb66ba3820
Robert Greenwalt [Thu, 7 Nov 2013 18:43:11 +0000 (10:43 -0800)]
am
384bf727: am
29b7a844: Merge "Add batch scan data to power stats." into klp-dev
* commit '
384bf72708b623bf48a0395a51db94bda055f496':
Add batch scan data to power stats.
Robert Greenwalt [Thu, 7 Nov 2013 18:32:55 +0000 (10:32 -0800)]
am
29b7a844: Merge "Add batch scan data to power stats." into klp-dev
* commit '
29b7a8446a36286bd4311ec2f52281fd1628a86e':
Add batch scan data to power stats.
Robert Greenwalt [Thu, 7 Nov 2013 18:31:03 +0000 (18:31 +0000)]
Merge "Add batch scan data to power stats." into klp-dev
The Android Automerger [Thu, 7 Nov 2013 14:01:28 +0000 (06:01 -0800)]
merge in klp-mr1-release history after reset to klp-dev
Baligh Uddin [Thu, 7 Nov 2013 04:06:01 +0000 (20:06 -0800)]
am
f9be657a: (-s ours) am
7d716436: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
f9be657ac28f2530938c24b09458defdbca07c4c':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 7 Nov 2013 04:03:44 +0000 (20:03 -0800)]
am
7d716436: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
7d7164361e3e9cf9198fca4050fca81547053b04':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 7 Nov 2013 04:00:04 +0000 (04:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Kenny Root [Wed, 6 Nov 2013 23:14:35 +0000 (15:14 -0800)]
am
279c1e15: am
d0de39e7: Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev
* commit '
279c1e15d23254728783ad99faff7349d9543ac4':
Revert "Accessibility: filter touches to Enable button"
OSDN Git Service
