Commit Graph

12188 Commits

Author SHA1 Message Date
Amith Yamasani
72a7afb093 Merge "Put fragment in specific activity's whitelist" into klp-dev 2013-12-03 19:33:21 +00:00
Lance Chang
5796dad9a4 Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change
Bug: 11923434
Change-Id: I34a353137338b0f8d55e2309f037c34922141181
2013-12-03 19:16:12 +09:00
Geoff Mendal
c07afc7eab am 9d229638: (-s ours) am d6ea675c: (-s ours) am f8e1829c: (-s ours) Import translations. DO NOT MERGE
* commit '9d229638eb78fc25a2699fde5ca2f50eeec57040':
  Import translations. DO NOT MERGE
2013-12-02 20:51:47 +00:00
Geoff Mendal
9d229638eb am d6ea675c: (-s ours) am f8e1829c: (-s ours) Import translations. DO NOT MERGE
* commit 'd6ea675c11285c02a625d59a8d88270649da6a5f':
  Import translations. DO NOT MERGE
2013-12-02 12:48:22 -08:00
Geoff Mendal
d6ea675c11 am f8e1829c: (-s ours) Import translations. DO NOT MERGE
* commit 'f8e1829c99f1ad74131dad12e220b95a629cd9b5':
  Import translations. DO NOT MERGE
2013-12-02 12:45:29 -08:00
Geoff Mendal
f8e1829c99 Import translations. DO NOT MERGE
Change-Id: I64dae5dfac03e30738558bddc4d44867c2e2b52b
Auto-generated-cl: translation import
2013-12-02 12:13:18 -08:00
Geoff Mendal
0cf4329dbe am 6bb8844a: (-s ours) am fa1df427: (-s ours) am b8fe3aa2: (-s ours) Import translations. DO NOT MERGE
* commit '6bb8844acd5767999a03ae3217a79a7e3be8251b':
  Import translations. DO NOT MERGE
2013-11-27 20:42:52 +00:00
Geoff Mendal
6bb8844acd am fa1df427: (-s ours) am b8fe3aa2: (-s ours) Import translations. DO NOT MERGE
* commit 'fa1df42735a7d0ef98a2c1d69d9fbe41be9d73d9':
  Import translations. DO NOT MERGE
2013-11-27 12:39:48 -08:00
Geoff Mendal
fa1df42735 am b8fe3aa2: (-s ours) Import translations. DO NOT MERGE
* commit 'b8fe3aa2abbf106bb1bb1d651cc59e425309d788':
  Import translations. DO NOT MERGE
2013-11-27 12:36:00 -08:00
Geoff Mendal
b8fe3aa2ab Import translations. DO NOT MERGE
Change-Id: Ie6abf3e15ab0bdf9c7fcf7fef498a4c23298c653
Auto-generated-cl: translation import
2013-11-27 12:18:28 -08:00
Lorenzo Colitti
5613086bdb am 540d26e8: Merge "Dynamically update connectivity and IP address."
* commit '540d26e8449159ebc2d84b8062f20ab4c6337f77':
  Dynamically update connectivity and IP address.
2013-11-26 08:38:50 -08:00
Lorenzo Colitti
d393e7cbab am 20ab234f: Merge "Cache preferences and services in status dialog."
* commit '20ab234f3d8ecdcbae2c998ded48ebf022ffa963':
  Cache preferences and services in status dialog.
2013-11-26 08:38:49 -08:00
Ivan Kovac
14c81b48f7 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
2013-11-26 12:42:24 +01:00
Lorenzo Colitti
540d26e844 Merge "Dynamically update connectivity and IP address." 2013-11-26 01:07:25 +00:00
Lorenzo Colitti
20ab234f3d Merge "Cache preferences and services in status dialog." 2013-11-26 01:06:38 +00:00
Geoff Mendal
5f87bb027c am c2d1fdac: (-s ours) am d82e8f2b: (-s ours) Import translations. DO NOT MERGE
* commit 'c2d1fdac9e7e914d4ecded6016c9056fa250d267':
  Import translations. DO NOT MERGE
2013-11-25 12:58:30 -08:00
Geoff Mendal
c2d1fdac9e am d82e8f2b: (-s ours) Import translations. DO NOT MERGE
* commit 'd82e8f2bec1421c660c786f89e75ffcc4a6fd11e':
  Import translations. DO NOT MERGE
2013-11-25 12:55:11 -08:00
Geoff Mendal
d82e8f2bec Import translations. DO NOT MERGE
Change-Id: I0a14a545804964011401d47a44bb6a3d0de94a08
Auto-generated-cl: translation import
2013-11-25 11:32:22 -08:00
Amith Yamasani
a88bdd34f7 Put fragment in specific activity's whitelist
Change-Id: I782dc8ec29e49a834832dc8357b3fdb12846e8a9
2013-11-25 11:10:00 -08:00
Lorenzo Colitti
5448b25481 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 deb8f08ace]

Bug: 10232006
Change-Id: I3a292d8bd9e36ab16c37e107eefff4b37d884a4c
2013-11-25 17:34:45 +09:00
Lorenzo Colitti
b088c8a7c7 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 6eb6a90821]

Bug: 10232006
Change-Id: Ib4072674543e517cf6935e3e03f35090e728090a
2013-11-25 17:34:08 +09:00
The Android Open Source Project
6a1d96e710 am ca99cb71: Merge commit \'bc6aa63a1afe5f50c3d03d8241f48cc4f6320c2e\' into HEAD
* commit 'ca99cb71eab502037120cdf68f854c882fcd9e57':
2013-11-22 19:18:34 -08:00
The Android Open Source Project
ca99cb71ea Merge commit 'bc6aa63a1afe5f50c3d03d8241f48cc4f6320c2e' into HEAD 2013-11-22 10:35:36 -08:00
Geoff Mendal
62d814f9b4 am 548614a4: (-s ours) am c3bd6087: (-s ours) Import translations. DO NOT MERGE
* commit '548614a4e6e0571d5cf06eb5514d0db8fc017d0b':
  Import translations. DO NOT MERGE
2013-11-21 14:10:26 -08:00
Geoff Mendal
548614a4e6 am c3bd6087: (-s ours) Import translations. DO NOT MERGE
* commit 'c3bd608799f2239dfa8d739b2732954e4fd658e5':
  Import translations. DO NOT MERGE
2013-11-21 14:07:57 -08:00
Geoff Mendal
c3bd608799 Import translations. DO NOT MERGE
Change-Id: I8863a00a23acee9b961b5bf1a0f082ffe5c7b3a1
Auto-generated-cl: translation import
2013-11-21 12:40:04 -08:00
Baligh Uddin
e178a756df am cd0726f7: (-s ours) am f06ce4eb: (-s ours) Import translations. DO NOT MERGE
* commit 'cd0726f7d824759984a7024826fbfbcaba575400':
  Import translations. DO NOT MERGE
2013-11-20 13:19:50 -08:00
Baligh Uddin
cd0726f7d8 am f06ce4eb: (-s ours) Import translations. DO NOT MERGE
* commit 'f06ce4eb9668415c23b16dbd7d8c50702466f8c4':
  Import translations. DO NOT MERGE
2013-11-20 13:15:25 -08:00
Baligh Uddin
f06ce4eb96 Import translations. DO NOT MERGE
Change-Id: I5ef68d36b77bb0374026bdf5e1d2a909156be3d7
Auto-generated-cl: translation import
2013-11-20 11:27:32 -08:00
Jeff Brown
169e8a0c2a am 017d2a18: am 130118d4: Add help url for remote display.
* commit '017d2a189ac758ad035182a886c4f4e578cee6f2':
  Add help url for remote display.
2013-11-18 19:09:55 -08:00
Jeff Brown
017d2a189a am 130118d4: Add help url for remote display.
* commit '130118d43628c058e3bf82f5d978d383f19390de':
  Add help url for remote display.
2013-11-18 19:07:06 -08:00
Jeff Brown
130118d436 Add help url for remote display.
Bug: 11736504
Change-Id: I83d278731cf853ff911ff1a8b82a942881cb4727
2013-11-18 17:58:08 -08:00
Baligh Uddin
f9ca318a3d am 6d34b698: (-s ours) am 91c54aa8: (-s ours) Import translations. DO NOT MERGE
* commit '6d34b6988b257eb35cd7162d403f6da8114e0b9b':
  Import translations. DO NOT MERGE
2013-11-18 11:18:59 -08:00
Baligh Uddin
6d34b6988b am 91c54aa8: (-s ours) Import translations. DO NOT MERGE
* commit '91c54aa81849fd60839ac62efb005df390c64438':
  Import translations. DO NOT MERGE
2013-11-18 11:15:12 -08:00
Baligh Uddin
91c54aa818 Import translations. DO NOT MERGE
Change-Id: I2c40d9f0cd08ff5d746f6ab3d608a12ed239ed3b
Auto-generated-cl: translation import
2013-11-18 11:02:58 -08:00
Baligh Uddin
5569a8f48c 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.
2013-11-15 11:59:35 -08:00
Baligh Uddin
9c8a463c30 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.
2013-11-15 11:56:55 -08:00
Baligh Uddin
beb9a03b71 Merge "Remove hardcoded msgid. We have already leveraged in TC." into klp-dev 2013-11-15 19:52:41 +00:00
Baligh Uddin
5d3dd3a15a am 72d674af: (-s ours) am ebf21489: (-s ours) Import translations. DO NOT MERGE
* commit '72d674af97df6f964f217ad7eddec7ea58612114':
  Import translations. DO NOT MERGE
2013-11-15 11:46:33 -08:00
Baligh Uddin
72d674af97 am ebf21489: (-s ours) Import translations. DO NOT MERGE
* commit 'ebf214892d020d9f310dd583e519bc3e1e8925cf':
  Import translations. DO NOT MERGE
2013-11-15 11:42:56 -08:00
Baligh Uddin
ebf214892d Import translations. DO NOT MERGE
bug:11696928
Change-Id: I500d2c96aef949f30d9fbabf2777563e9e68dbe6
Auto-generated-cl: translation import
2013-11-15 19:37:56 +00:00
Baligh Uddin
e62490c3be Remove hardcoded msgid. We have already leveraged in TC.
bug:11696928
Change-Id: I71beb961ff73902cf5a67c5de1175db30eaa0871
2013-11-15 11:21:11 -08:00
Baligh Uddin
8f9d4e3231 am 67a0472f: (-s ours) am 503b6def: (-s ours) Import translations. DO NOT MERGE
* commit '67a0472f3f53c924d180fdabe41bb26608219a83':
  Import translations. DO NOT MERGE
2013-11-15 11:15:23 -08:00
Baligh Uddin
67a0472f3f am 503b6def: (-s ours) Import translations. DO NOT MERGE
* commit '503b6deff226b12450decd5997111c77bd179a88':
  Import translations. DO NOT MERGE
2013-11-15 11:11:55 -08:00
Baligh Uddin
503b6deff2 Import translations. DO NOT MERGE
Bug: 11696928
Change-Id: I23f78d9fb53fd5da325f121bac78ac60a9c78bb6
Auto-generated-cl: translation import
2013-11-15 19:06:28 +00:00
Svetoslav
03360cd239 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.
2013-11-14 22:30:53 -08:00
Svetoslav
196bc5c63a 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.
2013-11-14 22:27:36 -08:00
Svetoslav
e7b781f574 Merge "Show correct message for a print job that is being canceled." into klp-dev 2013-11-15 06:23:54 +00:00
Svetoslav
97e962cd36 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
2013-11-14 18:15:19 -08:00
Jeff Brown
be6858e86f am 8174aad5: am 36f98428: Merge "Update cast screen strings." into klp-dev
* commit '8174aad50382280c55a33f2572eb1fcdb53078c1':
  Update cast screen strings.
2013-11-14 17:35:01 -08:00