Commit Graph

6989 Commits

Author SHA1 Message Date
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
Amith Yamasani
02c22131e9 Make Manage Apps remember which tab was shown.
This fixes the forgetfulness on orientation change. The code was
already in, but there was a typo in the key string that saved the tab.

Bug: 6000318
Change-Id: If29f42b83aa0ec9f05061b8690e0bdbe8c4a2812
2012-04-26 16:27:43 -07:00
Eric Fischer
9e264bf764 Import translations. DO NOT MERGE
Change-Id: I35b0b64b3819b917c8dc312c93bacb89bf4a7d1e
2012-04-26 15:48:31 -07:00
Afzal
dde0140971 Expandable NumberPicker width in bytesPicker dialog
Issue: The bytesPicker NumberPicker width was set to 48dip,
thus it couldn't accomodate more than 5 digits.
Solution: Set the NumberPicker layout_width to wrap_content and minWidth to 48dip.

Change-Id: Id2887cc5d48a94fa108f2ebe06f982cf2c1314dc
2012-04-26 04:05:03 -04:00
Russell Brenner
fc5dd2cbf0 Restore look of Wi-Fi panel for Setup Wizard
As part of the Wi-Fi refresh, this CL hides the action bar, menu, and
Settings icon in the context of the Setup Wizard. Dead code related
to WifiSettingsForSetupWizardXL has also been removed.

Bug: 5364589
Change-Id: Ib6716500153879b939a18a7007f1f6521b73890b
2012-04-25 16:31:23 -07:00
The Android Automerger
0148bee76e merge in jb-release history after reset to jb-dev 2012-04-25 07:49:01 -07:00
Michael Jurka
bd4bac327b Merge "New API to allow third-party apps to bind widgets" 2012-04-24 19:06:17 -07:00
Michael Jurka
c9029d99a3 New API to allow third-party apps to bind widgets
Change-Id: Ieec9f247fdbfc02c2ad8f5bb7f6b9efe0669af84
2012-04-24 18:52:53 -07:00
Amith Yamasani
76bb05c361 Merge "Safeguard from monkeys." 2012-04-24 15:24:25 -07:00
Amith Yamasani
8fda756e69 Safeguard from monkeys.
Bug: 6315950
Change-Id: I680b3f0a2cee565a39d58e95a8abe5f62cc7b466
2012-04-24 15:09:10 -07:00
Eric Fischer
17f67ad967 Merge "Import translations. DO NOT MERGE" 2012-04-24 13:55:56 -07:00
Eric Fischer
335c8c86b7 Import translations. DO NOT MERGE
Change-Id: Iaccf544def97f82cc295a845a90961dae92c1116
2012-04-24 13:44:08 -07:00
Amith Yamasani
3ec1cd0771 Merge "Make home-as-up work in UserDictionarySettings" 2012-04-24 13:23:12 -07:00
Amith Yamasani
432fafe200 Make home-as-up work in UserDictionarySettings
Since the home-as-up icon is delivered through onOptionsItemSelected,
need to check the ID.

Bug: 6388649
Change-Id: I00041b1a15e102826d05a40fdd288a9d8712dc48
2012-04-24 13:06:39 -07:00
Amith Yamasani
5132e5d815 Merge "Fix NPE due to delayed event handling." 2012-04-24 11:53:31 -07:00
Jeff Sharkey
a20ec538e5 Merge "Fix data usage settings button visibility." 2012-04-24 11:36:38 -07:00
Jeff Sharkey
d92e0419b1 Fix data usage settings button visibility.
Also check that fragment is attached before launching intent.

Bug: 6385040
Change-Id: If857758acbf6fe17c8ffbd75226114346ffe6c62
2012-04-24 11:35:43 -07:00
Amith Yamasani
9da80a90be Fix NPE due to delayed event handling.
a.k.a., annoying monkeys.

Bug: 6336430
Change-Id: Ie038a71d0ae66b3f30ccd704529f767fa2058542
2012-04-24 11:35:38 -07:00
The Android Automerger
5f136b3468 merge in jb-release history after reset to master 2012-04-24 07:04:50 -07:00
Dianne Hackborn
3e9263a972 Merge "Deal correctly with an unset brightness adjustment." 2012-04-23 18:55:32 -07:00