Vikram Aggarwal
96d7eaf5f9
Merge "Center clock on phones" into jb-dev
2012-05-04 15:46:10 -07:00
Vikram Aggarwal
bef77ca177
am 8f04a6fb
: Merge "Write the airplane setting in addition to sending the Intent." into jb-dev
...
* commit '8f04a6fb139b9330710b0bb4c714049452d63a48':
Write the airplane setting in addition to sending the Intent.
2012-05-04 14:57:36 -07:00
Vikram Aggarwal
8f04a6fb13
Merge "Write the airplane setting in addition to sending the Intent." into jb-dev
2012-05-04 14:54:37 -07:00
Eric Fischer
f5735b223a
am dec1dd9f
: (-s ours) am b9d0f3cb
: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit 'dec1dd9f9eec5c6799227a123ff37245f2d78f1e':
Import translations. DO NOT MERGE
2012-05-04 14:33:49 -07:00
Eric Fischer
dec1dd9f9e
am b9d0f3cb
: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit 'b9d0f3cbb5e8aaf868760db6274592619316debc':
Import translations. DO NOT MERGE
2012-05-04 14:31:07 -07:00
Eric Fischer
f3249fd103
Merge "Import translations. DO NOT MERGE"
2012-05-04 14:27:44 -07:00
Eric Fischer
b9d0f3cbb5
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-05-04 14:27:35 -07:00
Vikram Aggarwal
6ebbd30e18
Write the airplane setting in addition to sending the Intent.
...
dab was right. :)
Fix b/6006192 in association with https://android-git.corp.google.com/g/187160
Change-Id: I3edfb3191ab35a4e5de1b18f3e2e1dae5f882354
2012-05-04 14:15:55 -07:00
Vikram Aggarwal
eae00d071f
am 85035ffb
: am 8b399cc7
: Merge "Go into airplane mode in minimal boot mode." into jb-dev
...
* commit '85035ffb0d9e538f54358782410b74a5b53f1798':
Go into airplane mode in minimal boot mode.
2012-05-04 14:12:57 -07:00
Vikram Aggarwal
85035ffb0d
am 8b399cc7
: Merge "Go into airplane mode in minimal boot mode." into jb-dev
...
* commit '8b399cc71c960db05aa804c7e982709a1af5502d':
Go into airplane mode in minimal boot mode.
2012-05-04 14:09:38 -07:00
Vikram Aggarwal
8b399cc71c
Merge "Go into airplane mode in minimal boot mode." into jb-dev
2012-05-04 14:05:49 -07:00
Eric Fischer
4612836a39
Import translations. DO NOT MERGE
...
Change-Id: I33ff0fa09d094dffedf055306dbf96dcee283e24
2012-05-04 13:59:28 -07:00
Eric Fischer
eeb3a777a2
Import translations. DO NOT MERGE
...
Change-Id: Ia8f1965490d5e34f0354724471feb2da0ee3b310
2012-05-04 13:57:33 -07:00
Jeff Sharkey
1fdd72078a
am 24845eb0
: am 37dfc0c1
: Merge "Avoid animation flashing and fix padding." into jb-dev
...
* commit '24845eb0528df2d27d4557e79caa9f65e080acb5':
Avoid animation flashing and fix padding.
2012-05-04 12:08:50 -07:00
Jeff Sharkey
24845eb052
am 37dfc0c1
: Merge "Avoid animation flashing and fix padding." into jb-dev
...
* commit '37dfc0c1acc675723e2fb48488e75a72003d63c9':
Avoid animation flashing and fix padding.
2012-05-04 12:07:03 -07:00
Jeff Sharkey
37dfc0c1ac
Merge "Avoid animation flashing and fix padding." into jb-dev
2012-05-04 12:04:18 -07:00
Jeff Sharkey
92811829b3
Avoid animation flashing and fix padding.
...
Bug: 6446203
Change-Id: Icea64d5d30d894a6438af9278bc2d10b8b921d29
2012-05-04 11:54:31 -07:00
Jeff Sharkey
599886ed16
am 021452ce
: am d8a18ad8
: Merge "Better messaging when Wi-Fi disabled." into jb-dev
...
* commit '021452ce21e2ea5ff339c27a3e863d29ecef79e4':
Better messaging when Wi-Fi disabled.
2012-05-04 11:21:19 -07:00
Jeff Sharkey
021452ce21
am d8a18ad8
: Merge "Better messaging when Wi-Fi disabled." into jb-dev
...
* commit 'd8a18ad87e930bbcd203ef65563546f13b9bbb8b':
Better messaging when Wi-Fi disabled.
2012-05-04 11:18:31 -07:00
Jeff Sharkey
d8a18ad87e
Merge "Better messaging when Wi-Fi disabled." into jb-dev
2012-05-04 11:15:29 -07:00
Jeff Sharkey
37c222fdf0
Better messaging when Wi-Fi disabled.
...
Bug: 6443166
Change-Id: I262e559e5c209d3f1959d5d2ab9a2aebb8180c59
2012-05-04 10:26:58 -07:00
Vikram Aggarwal
69721802ee
Center clock on phones
...
Fix b/5579000
Change-Id: I80431999939fbecdf693649d58ad2031c03208b0
2012-05-04 10:20:47 -07:00
Wink Saville
f696492bb8
am edcc701d
: am 69801b36
: Merge "RadioInfo: Update the network type listing"
...
* commit 'edcc701d28217b62aa35fd0d89ff1def38c0de2c':
RadioInfo: Update the network type listing
2012-05-04 09:21:58 -07:00
Wink Saville
edcc701d28
am 69801b36
: Merge "RadioInfo: Update the network type listing"
...
* commit '69801b36a1e2b8d5bede15683dceda076e271e67':
RadioInfo: Update the network type listing
2012-05-04 09:18:57 -07:00
Vikram Aggarwal
ea1186db19
Go into airplane mode in minimal boot mode.
...
Fix b/6006192
Change-Id: Ied4d9b51aac4e8ac1d2114aa1e95d4ebbe93413b
2012-05-04 09:18:17 -07:00
satok
622dd278fe
am 259a842b
: am 8517794f
: Merge "Always on the valid system default ime" into jb-dev
...
* commit '259a842b70ade814239415529b34432d3fe96ce9':
Always on the valid system default ime
2012-05-03 22:18:54 -07:00
satok
259a842b70
am 8517794f
: Merge "Always on the valid system default ime" into jb-dev
...
* commit '8517794f1b097cf5c073d81bc6f73fe0b90d01bd':
Always on the valid system default ime
2012-05-03 22:17:22 -07:00
satok
8517794f1b
Merge "Always on the valid system default ime" into jb-dev
2012-05-03 22:15:03 -07:00
Eric Fischer
51b34d0b1b
am abbd68c7
: (-s ours) am 0cdc3a1e
: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit 'abbd68c7e0843c2de9bf300c9c2d11b0956634ca':
Import translations. DO NOT MERGE
2012-05-03 16:06:09 -07:00
Eric Fischer
abbd68c7e0
am 0cdc3a1e
: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '0cdc3a1e166b8547a2fe1a97fbe9064a3ae6c879':
Import translations. DO NOT MERGE
2012-05-03 16:02:50 -07:00
Eric Fischer
622f1632c5
Merge "Import translations. DO NOT MERGE"
2012-05-03 16:01:34 -07:00
Eric Fischer
0cdc3a1e16
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-05-03 16:01:16 -07:00
Eric Fischer
f6d67b31cf
Import translations. DO NOT MERGE
...
Change-Id: Icb1e3776db1979b823036f3322a14b66d0cace15
2012-05-03 15:57:12 -07:00
Eric Fischer
513fc4f973
Import translations. DO NOT MERGE
...
Change-Id: Ifb5adb2d887e6264aca0e664a119e9421739b2e5
2012-05-03 15:55:12 -07:00
Jeff Sharkey
70bb31795a
am d4d2528b
: am d86d44b7
: Merge "Fall back to Wi-Fi data when SIM missing." into jb-dev
...
* commit 'd4d2528b4012dce5125664845e5174b04844745e':
Fall back to Wi-Fi data when SIM missing.
2012-05-03 15:21:07 -07:00
Jeff Sharkey
d4d2528b40
am d86d44b7
: Merge "Fall back to Wi-Fi data when SIM missing." into jb-dev
...
* commit 'd86d44b7453e60f8dc40d61aa4a7c859bb6efa07':
Fall back to Wi-Fi data when SIM missing.
2012-05-03 15:18:01 -07:00
Jeff Sharkey
d86d44b745
Merge "Fall back to Wi-Fi data when SIM missing." into jb-dev
2012-05-03 15:13:49 -07:00
Jeff Sharkey
0bc5b93fe2
Fall back to Wi-Fi data when SIM missing.
...
Bug: 6427657
Change-Id: I0613b4b89ddbea1cde2fd96ce6dd4bacb0fb4eaa
2012-05-03 15:02:06 -07:00
Vikram Aggarwal
998c2b16ba
am cd345c96
: am c62d321e
: UI fixes for tablets
...
* commit 'cd345c96dca70deb827ded606df70cb144279b3d':
UI fixes for tablets
2012-05-03 14:57:59 -07:00
Vikram Aggarwal
cd345c96dc
am c62d321e
: UI fixes for tablets
...
* commit 'c62d321e8dcb023e8c7299802a75a271b7ca98d9':
UI fixes for tablets
2012-05-03 14:55:45 -07:00
Wink Saville
69801b36a1
Merge "RadioInfo: Update the network type listing"
2012-05-03 14:20:01 -07:00
Vikram Aggarwal
c62d321e8d
UI fixes for tablets
...
1. Center the clock on Xoom and large tablets. Fix b/5579000
2. Correctly remove the emergency call button if the device (*cough*
Nakasi *cough*) does not have telephone capability.
Change-Id: Ib7552dc35392a1b9d6c0381c6167949e2b163ddc
2012-05-03 12:48:48 -07:00
Ricardo Cerqueira
32310ee560
RadioInfo: Update the network type listing
...
The dropdown for the preferred type in the INFO menu is outdated.
ril.h and RILConstants now go up to type 11, due to the addition of
the LTE combinations.
If a device has one of these new types set up as the default, going
into this menu causes a crash for com.android.phone, since it attempts
to use array position "type" without verifying if it is that long.
Change-Id: I0bf4bb70e21aef79f22e7258c8154e3ec569a215
2012-05-03 19:12:13 +01:00
Amith Yamasani
94089e99d1
am 404e3a75
: am b3c17c57
: Merge "Removing static reference from sUnknown"
...
* commit '404e3a75922668b3d7709f5a5e23d611101c88d1':
Removing static reference from sUnknown
2012-05-02 17:24:46 -07:00
Amith Yamasani
404e3a7592
am b3c17c57
: Merge "Removing static reference from sUnknown"
...
* commit 'b3c17c570a6c26ece11b404a5918ce4bd64a0940':
Removing static reference from sUnknown
2012-05-02 17:22:40 -07:00
Vikram Aggarwal
7c16872a37
am 946f34d1
: am 277cf8cc
: Merge "Include the clock in landscape on Xoom" into jb-dev
...
* commit '946f34d189d8d927f6d571da215e27ac4f59b046':
Include the clock in landscape on Xoom
2012-05-02 16:25:16 -07:00
Vikram Aggarwal
946f34d189
am 277cf8cc
: Merge "Include the clock in landscape on Xoom" into jb-dev
...
* commit '277cf8cc5b1481ff59a760f712f3892229023329':
Include the clock in landscape on Xoom
2012-05-02 16:21:48 -07:00
Vikram Aggarwal
277cf8cc5b
Merge "Include the clock in landscape on Xoom" into jb-dev
2012-05-02 16:19:10 -07:00
Vikram Aggarwal
905c5bd334
am c6cce541
: am a3c3bf1d
: Merge "Notification alert every 5s and start after 30s." into jb-dev
...
* commit 'c6cce54189f3365c859d800280809d86d1ebc9a6':
Notification alert every 5s and start after 30s.
2012-05-02 16:11:35 -07:00
Vikram Aggarwal
c6cce54189
am a3c3bf1d
: Merge "Notification alert every 5s and start after 30s." into jb-dev
...
* commit 'a3c3bf1dee34940ade909306486a9bb12c75b8b7':
Notification alert every 5s and start after 30s.
2012-05-02 16:09:15 -07:00