Commit Graph

7510 Commits

Author SHA1 Message Date
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
The Android Automerger
62792eaa93 merge in jb-release history after reset to jb-dev 2012-05-03 07:19:00 -07: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
Vikram Aggarwal
a3c3bf1dee Merge "Notification alert every 5s and start after 30s." into jb-dev 2012-05-02 16:07:14 -07:00
Vikram Aggarwal
c85f040829 Include the clock in landscape on Xoom
1. R.id.status was defined twice and was used inconsistently in code:
   (visibility set to enabled, but only on portrait...) This code removes
   the bad view.

2. The TextView date was never used, either by another layout or by
   code. Deleting this view too.

3. Including a standard status layout on smallest-width-600px, which includes
   a clock and a status message on Xoom.

Fix b/6061076

Change-Id: Ibb492e89f6a4a38ac6a22398ec9c14bbe3fb7e3d
2012-05-02 15:23:37 -07:00
Eric Fischer
bf11607a69 am 33dbfab0: (-s ours) am 4b57e6e4: Import translations. DO NOT MERGE
* commit '33dbfab05150f90552fd14fa97f9aaf30cae5127':
  Import translations. DO NOT MERGE
2012-05-02 15:10:52 -07:00
Eric Fischer
33dbfab051 am 4b57e6e4: Import translations. DO NOT MERGE
* commit '4b57e6e451806e4f4f78548f1ad7bc1929ec7b5b':
  Import translations. DO NOT MERGE
2012-05-02 15:07:56 -07:00
Eric Fischer
6f000706c1 Import translations. DO NOT MERGE
Change-Id: I1bf31cb0576ffcc208eb5c8c4fdf741701c05bcc
2012-05-02 14:13:27 -07:00
Amith Yamasani
b3c17c570a Merge "Removing static reference from sUnknown" 2012-05-02 14:12:36 -07:00
Eric Fischer
4b57e6e451 Import translations. DO NOT MERGE
Change-Id: Ie7a0ad55aa358abded6d5fe7d9d75b34dfc1c450
2012-05-02 14:11:40 -07:00
Vishal Mahaveer
9fc89cc8a8 wifi: update text displayed during hotspot on/off
Update the string used during hotspot on/off

Change-Id: I89f54f6c02ae26dd39b3cfdcd7587cf59ba81ca1
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
2012-05-02 15:21:44 -05:00
Vikram Aggarwal
86b93937fa Notification alert every 5s and start after 30s.
Justification: Most users will not need prompting, so for them a
notification will be an annoyance.  So we only notify if the no
password has been entered for 30 seconds.

Once a notification sound is made, we need to make it frequently so
the user can locate the device.

Change-Id: Ibf531aec89b5e3b3c72eaa36016bcc4cac1d6493
2012-05-02 09:42:32 -07:00
The Android Automerger
004193e0bc merge in jb-release history after reset to jb-dev 2012-05-02 07:10:58 -07:00
satok
472c3c93fc Always on the valid system default ime
Bug: 6422390

Change-Id: I9af4065e4b9f9332f3b0db168dea5546727d5951
2012-05-02 21:08:46 +09:00
Amith Yamasani
4fc269418f am 3931a90b: am 9593b743: Merge "Fix NPE in ManageApps when switching orientation." into jb-dev
* commit '3931a90bc3963d48eba59f1c965c69578dc0f8b6':
  Fix NPE in ManageApps when switching orientation.
2012-05-01 16:19:58 -07:00
Vikram Aggarwal
6d9fb7b632 am 34694975: am de3c9cb4: Notify user when waiting for decryption password
* commit '346949755f87e10e807a7da923f3b8f306f376d9':
  Notify user when waiting for decryption password
2012-05-01 16:18:14 -07:00
Amith Yamasani
3931a90bc3 am 9593b743: Merge "Fix NPE in ManageApps when switching orientation." into jb-dev
* commit '9593b743cb625e88b97b2674c5f528bb07f96011':
  Fix NPE in ManageApps when switching orientation.
2012-05-01 16:18:02 -07:00
Vikram Aggarwal
346949755f am de3c9cb4: Notify user when waiting for decryption password
* commit 'de3c9cb412688eb841993ad971d06039d8a952c3':
  Notify user when waiting for decryption password
2012-05-01 16:15:39 -07:00
Amith Yamasani
9593b743cb Merge "Fix NPE in ManageApps when switching orientation." into jb-dev 2012-05-01 16:15:25 -07:00
Vikram Aggarwal
de3c9cb412 Notify user when waiting for decryption password
1. Disable back presses from physical keyboard during encryption: Fix b/6139810
2. Keep screen on when waiting for password. Fix b/6153213 and b/6149606
3. Alert the user with sound when waiting for password. Fix b/6149606
4. Add debugging feature to display the password screen without having to reboot the device.

Change-Id: I588aa7d96e1140f95a6fa91e0281117907f666f7
2012-05-01 16:05:44 -07:00
Amith Yamasani
3b7dbcecf7 Fix NPE in ManageApps when switching orientation.
Bug: 6394351
Change-Id: Ia66ab18195325b024223cdbce19756150e1d6c8c
2012-05-01 14:56:13 -07:00
Eric Fischer
6e20b80838 am 6ac03ba5: (-s ours) am 7706a2a1: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '6ac03ba576cd446bdac815f7b37cf55f7d8efac7':
  Import translations. DO NOT MERGE
2012-05-01 13:54:58 -07:00
Eric Fischer
6ac03ba576 am 7706a2a1: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '7706a2a1432a67720e3f7906647c3c0d2afbfb8b':
  Import translations. DO NOT MERGE
2012-05-01 13:51:59 -07:00
Eric Fischer
683affe3ff Merge "Import translations. DO NOT MERGE" 2012-05-01 13:49:49 -07:00
Eric Fischer
7706a2a143 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-01 13:49:40 -07:00
Eric Fischer
a353f9ee69 Import translations. DO NOT MERGE
Change-Id: Ieef5e67dc77c84ce7a5c72c8763e3cf646d9a23c
2012-05-01 13:34:17 -07:00
Eric Fischer
0f0e51baa9 Import translations. DO NOT MERGE
Change-Id: Ie838fa4a75d736bb941cf0a626f0d1d017562dfa
2012-05-01 13:32:21 -07:00
Jean-Baptiste Queru
27a2fcb8dd am bb043006: am 299ed152: (-s ours) Merge "Wifi: Update message when scan result is empty"
* commit 'bb043006017fb7cc45eb20fcc7bc631c54654b3d':
  Wifi: Update message when scan result is empty
2012-05-01 13:26:39 -07:00
Jean-Baptiste Queru
bb04300601 am 299ed152: (-s ours) Merge "Wifi: Update message when scan result is empty"
* commit '299ed15213796bbcb953db12479b74a7c024e2c6':
  Wifi: Update message when scan result is empty
2012-05-01 13:24:28 -07:00
Jean-Baptiste Queru
299ed15213 Merge "Wifi: Update message when scan result is empty" 2012-05-01 12:40:13 -07:00
Justin Koh
f7077e3614 am 519dda9c: Disables BluetoothPairingDialog if in appliance mode.
* commit '519dda9c572309182cb29e247adafe2cd475a594':
  Disables BluetoothPairingDialog if in appliance mode.
2012-05-01 12:37:27 -07:00
Brian Carlstrom
f058ae28d8 am 0fc78608: am 81d7a806: Do not reuse master_clear_gesture_* strings for credential installation confirmation
* commit '0fc786085f8fe5be769300c857d86038f9f571ee':
  Do not reuse master_clear_gesture_* strings for credential installation confirmation
2012-05-01 12:07:21 -07:00
Brian Carlstrom
0fc786085f am 81d7a806: Do not reuse master_clear_gesture_* strings for credential installation confirmation
* commit '81d7a806a6403cd98a0c6dd0ba7288d728382144':
  Do not reuse master_clear_gesture_* strings for credential installation confirmation
2012-05-01 12:04:54 -07:00
Vikram Aggarwal
60df5835f6 am bb0dbc97: am b96b35a6: Enable back in CryptKeeper
* commit 'bb0dbc97e37f375f2bd3763269372d798c7a54f2':
  Enable back in CryptKeeper
2012-05-01 11:24:53 -07:00