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
33dbfab051
am 4b57e6e4
: Import translations. DO NOT MERGE
...
* commit '4b57e6e451806e4f4f78548f1ad7bc1929ec7b5b':
Import translations. DO NOT MERGE
2012-05-02 15:07:56 -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
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
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
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
7706a2a143
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-05-01 13:49:40 -07:00
Eric Fischer
0f0e51baa9
Import translations. DO NOT MERGE
...
Change-Id: Ie838fa4a75d736bb941cf0a626f0d1d017562dfa
2012-05-01 13:32:21 -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
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
bb0dbc97e3
am b96b35a6
: Enable back in CryptKeeper
...
* commit 'b96b35a62b1f092b6322643c3568f3e712543e53':
Enable back in CryptKeeper
2012-05-01 11:20:59 -07:00
Brian Carlstrom
81d7a806a6
Do not reuse master_clear_gesture_* strings for credential installation confirmation
...
Bug: http://code.google.com/p/android/issues/detail?id=29367
Change-Id: I3b651bc84f22b48d651802115600ab4e256bb3a6
2012-05-01 11:18:12 -07:00
Vikram Aggarwal
b96b35a62b
Enable back in CryptKeeper
...
Fix b/6280906
Change-Id: I38d75c4b4c928c77c20bf8eca2649bf6eaa95507
2012-05-01 11:12:09 -07:00
The Android Automerger
9cb25be2a7
merge in jb-release history after reset to jb-dev
2012-05-01 07:05:43 -07:00
Jean-Baptiste Queru
a87fd6e02d
am 7bb1c807
: Merge "Settings: PT-BR translation fix"
...
* commit '7bb1c807bfecc1ab34203b90942529aa24611362':
Settings: PT-BR translation fix
2012-05-01 06:58:07 -07:00
Jean-Baptiste Queru
7bb1c807bf
Merge "Settings: PT-BR translation fix"
2012-05-01 05:52:41 -07:00
Jeff Brown
7fee527867
Fix manual brightness adjustment.
...
getBrightness() was calculating the brightness ratio the wrong
way, resulting in brightness fractions always greater than 1.0
being produced (maximum brightness).
Bug: 6377115
Change-Id: Ia2fbae505ffdc382005722d25301bfb689b585fb
2012-04-30 17:53:10 -07:00
Irfan Sheriff
a90015c2c9
Merge "Add wifi direct menu only for supported devices" into jb-dev
2012-04-30 17:12:33 -07:00
Jeff Brown
1d1cd10a2a
Merge "Fix manual brightness adjustment." into jb-dev
2012-04-30 16:49:26 -07:00
Irfan Sheriff
e8d79cf188
Add wifi direct menu only for supported devices
...
Bug: 6421096
Change-Id: Iaf0ad85e97be8d750dd74808f840c6731d8130fd
2012-04-30 16:30:35 -07:00
Jeff Brown
829c79961c
Fix manual brightness adjustment.
...
getBrightness() was calculating the brightness ratio the wrong
way, resulting in brightness fractions always greater than 1.0
being produced (maximum brightness).
Bug: 6377115
Change-Id: Ia2fbae505ffdc382005722d25301bfb689b585fb
2012-04-30 16:19:46 -07:00
Eric Fischer
31a84c881c
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-04-30 14:59:39 -07:00
Gilles Debunne
5a610b813a
Merge "Fixed inconsistent gray background in Running app detail" into jb-dev
2012-04-30 14:32:35 -07:00
Eric Fischer
0af88f3883
Import translations. DO NOT MERGE
...
Change-Id: I8ea710c8a4a09a1e8a144d9b713e1fe9738c987d
2012-04-30 13:41:01 -07:00
Amith Yamasani
4cc1c7a234
Merge "Move tether settings help to menu and remove local assets." into jb-dev
2012-04-30 13:37:32 -07:00
Gilles Debunne
ebf44b1b89
Fixed inconsistent gray background in Running app detail
...
This is a cherry pick of https://android-review.googlesource.com/#/c/35200/
Checked with UI that this backgroud color was not wanted.
Change-Id: I10cd6757ed17fd3cf34f04e5d14e6f210f78ab2c
2012-04-30 12:47:32 -07:00
The Android Automerger
0a499f2210
merge in jb-release history after reset to jb-dev
2012-04-30 07:05:01 -07:00
Irfan Sheriff
d6d65741f9
Merge "Fix WPS string" into jb-dev
2012-04-28 10:51:18 -07:00
Eric Fischer
7708c8837d
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-04-27 20:51:35 -07:00
Irfan Sheriff
f911f8fc06
Fix WPS string
...
Change-Id: I5d45863c868c627fc48eefe1e15cb737b694d8ac
2012-04-27 20:30:24 -07:00
Jim Miller
436770c085
Merge "Fix 6291333: Don't show multiple pin/pattern/password confirmations" into jb-dev
2012-04-27 19:17:45 -07:00
Jim Miller
47f1cd4325
Fix 6291333: Don't show multiple pin/pattern/password confirmations
...
This fixes a bug where orientation changes caused the system to
ask for the pin/pattern/password multiple times.
It also fixes a minor issue where we were showing buttons
on the pattern confirmation screen (bug 6218057)
Change-Id: I0894f37bb697baa4cc17917aaeb466440279b092
2012-04-27 18:11:03 -07:00
Amith Yamasani
d3fed687e7
Move tether settings help to menu and remove local assets.
...
Bug: 5270092
Using web help instead of local assets.
Change-Id: Ib93e72443b30367521febc43279422ec130efbd5
2012-04-27 17:38:40 -07:00
Irfan Sheriff
3408163152
Merge "Ignore invalid network forget" into jb-dev
2012-04-27 16:43:38 -07:00
Irfan Sheriff
3ab5c6838f
Ignore invalid network forget
...
Bug: 6397063
Change-Id: I066bd45e95b7e8671bc7dfcb83e46246f110b3a9
2012-04-27 15:36:30 -07:00
Romain Guy
4c428f9e83
Merge "Add three new developer settings" into jb-dev
2012-04-27 15:29:59 -07:00
Romain Guy
c1fa3e64b8
Add three new developer settings
...
- Show hw screen updates: show where apps udpate the screen when running with
hw acceleration
- Profile hw rendering: add extra profiling info to dumpsys gfxinfo for
performance tracking
- Debug layout: show layout info on screen
Change-Id: I6f7cad762d65ec3be2debfb4a88c25d35bf11079
2012-04-27 15:27:54 -07:00
Eric Fischer
a8c0d3df70
Import translations. DO NOT MERGE
...
Change-Id: I4917f245f548a61165e7e36367d99871d6474408
2012-04-27 13:37:24 -07:00
Amith Yamasani
e42b999e16
Merge "Make Manage Apps remember which tab was shown." into jb-dev
2012-04-27 10:47:59 -07:00
Irfan Sheriff
68389e75a5
Merge "Allow p2p device rename" into jb-dev
2012-04-27 09:55:45 -07:00
Irfan Sheriff
97617ce89e
Allow p2p device rename
...
Change-Id: Ib61425da344f955b0a583716516181bdfbd4b504
2012-04-26 16:39:10 -07:00