The Android Open Source Project
9cadf8b10d
am b5685487: Merge commit \'f9ca318a3d2aceaf5c9e54610073a9017442be9b\' into HEAD
...
* commit 'b568548747c9b137d7da05fcdbb84f157273b3db':
2013-12-05 17:25:39 -08:00
The Android Open Source Project
b568548747
Merge commit 'f9ca318a3d2aceaf5c9e54610073a9017442be9b' into HEAD
2013-12-05 12:38:23 -08:00
Lance Jin-woong Chang
e161f8733e
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"
2013-12-04 17:40:17 -08:00
Lance Jin-woong Chang
1f5e66392e
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"
2013-12-04 17:29:27 -08:00
Lance Chang
6d0397864a
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
2013-12-04 17:28:36 -08:00
Lance Jin-woong Chang
5d65a47c39
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
2013-12-05 01:27:46 +00:00
Lance Jin-woong Chang
0637c1f909
Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"
...
This reverts commit 5796dad9a4
2013-12-05 00:59:51 +00:00
Lance Chang
0ea2229b4b
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
2013-12-04 16:49:45 -08:00
Lance Chang
071fbfd3f3
Merge "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" into klp-dev
2013-12-05 00:47:16 +00:00
Geoff Mendal
bc3c36da78
am 65c2a285: (-s ours) am 3c29831e: (-s ours) Import translations. DO NOT MERGE
...
* commit '65c2a2850526802c542ac5a1dee26eab41c33ec3':
Import translations. DO NOT MERGE
2013-12-04 13:45:17 -08:00
Geoff Mendal
65c2a28505
am 3c29831e: (-s ours) Import translations. DO NOT MERGE
...
* commit '3c29831e87bb131246e88aeb2b18d1fc11627e5d':
Import translations. DO NOT MERGE
2013-12-04 13:42:04 -08:00
Geoff Mendal
3c29831e87
Import translations. DO NOT MERGE
...
Change-Id: I4082ee8a0e0fe74e5328bd304f44cab57d4f40cb
Auto-generated-cl: translation import
2013-12-04 13:28:51 -08:00
Amith Yamasani
ff0fad2a06
am e10f8528: Merge "Fix switching running/cached apps with memory bar"
...
* commit 'e10f8528220fc4506ff6deee5c71ddab3da5e21d':
Fix switching running/cached apps with memory bar
2013-12-04 13:05:17 -08:00
Amith Yamasani
95dd34b4e4
am f67aa398: Merge "Wrong referring to the resource - id/android:id"
...
* commit 'f67aa3985d36cace1fbea2537bcdc97f8b6d81ef':
Wrong referring to the resource - id/android:id
2013-12-04 13:05:16 -08:00
Amith Yamasani
e10f852822
Merge "Fix switching running/cached apps with memory bar"
2013-12-04 19:17:33 +00:00
Amith Yamasani
f67aa3985d
Merge "Wrong referring to the resource - id/android:id"
2013-12-04 19:05:29 +00:00
Amith Yamasani
ab747c87a9
am 3d6ca113: am 72a7afb0: Merge "Put fragment in specific activity\'s whitelist" into klp-dev
...
* commit '3d6ca11349f0ff2b53f4058731da9e904db2c938':
Put fragment in specific activity's whitelist
2013-12-03 11:38:00 -08:00
Amith Yamasani
3d6ca11349
am 72a7afb0: Merge "Put fragment in specific activity\'s whitelist" into klp-dev
...
* commit '72a7afb0935264586c821062279d39d8338b1e3d':
Put fragment in specific activity's whitelist
2013-12-03 11:35:14 -08:00
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
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
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
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
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
