PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,809 Commits 1 Branch 0 Tags
84f56ca6ba37112935b6e88ea2bc8dbf80db1ba3
Commit Graph

6809 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
f4245a6350 am a87fd6e0: am 7bb1c807: Merge "Settings: PT-BR translation fix" 
* commit 'a87fd6e02de71b0fd6a90c35c54a267b05de1671':
  Settings: PT-BR translation fix
 2012-05-01 06:59:51 -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
Justin Koh
519dda9c57 Disables BluetoothPairingDialog if in appliance mode. 
Disables the BluetoothPairingDialog if we are in appliance mode.

Bug: 6392817

TESTED = runs on Tungsten.

Change-Id: I62191496b412c6196e9a18a1dd1d3bc3dd70ba0c
 2012-04-30 18:08:19 -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
b9b849e2cc am a90015c2: Merge "Add wifi direct menu only for supported devices" into jb-dev 
* commit 'a90015c2c9795479ce6f1896f443948d615fd0c5':
  Add wifi direct menu only for supported devices
 2012-04-30 17:16:56 -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
adfd63f696 am 1d1cd10a: Merge "Fix manual brightness adjustment." into jb-dev 
* commit '1d1cd10a2afd29e2e9a501ced2a8d788e9330fd1':
  Fix manual brightness adjustment.
 2012-04-30 16:54:02 -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
c286367cd5 am 31a84c88: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '31a84c881cc5bcf51baa703a112604ae83d11ceb':
  Import translations. DO NOT MERGE
 2012-04-30 15:04:54 -07:00
Eric Fischer
f446022ae6 Merge "Import translations. DO NOT MERGE" 2012-04-30 15:00:08 -07:00
Eric Fischer
31a84c881c Merge "Import translations. DO NOT MERGE" into jb-dev 2012-04-30 14:59:39 -07:00
Gilles Debunne
ac8b25550a am 5a610b81: Merge "Fixed inconsistent gray background in Running app detail" into jb-dev 
* commit '5a610b813a2f7710fd67bd97dfac29b63e7d2d29':
  Fixed inconsistent gray background in Running app detail
 2012-04-30 14:37:50 -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
Amith Yamasani
7f3a06be11 am 4cc1c7a2: Merge "Move tether settings help to menu and remove local assets." into jb-dev 
* commit '4cc1c7a234fbf79f6264185306f69f1caaf312d1':
  Move tether settings help to menu and remove local assets.
 2012-04-30 13:44:42 -07:00
Eric Fischer
67e61f8516 Import translations. DO NOT MERGE 
Change-Id: I7cfa4e06e5203dad740fb1320a843d1ff85cc397
 2012-04-30 13:42:48 -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
01152305ed am d6d65741: Merge "Fix WPS string" into jb-dev 
* commit 'd6d65741f98db6db62564d94ab36107880755b0c':
  Fix WPS string
 2012-04-28 10:55:32 -07:00
Irfan Sheriff
d6d65741f9 Merge "Fix WPS string" into jb-dev 2012-04-28 10:51:18 -07:00
Eric Fischer
eafc163bb2 am 7708c883: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '7708c8837dba4ea74b6766959cbd16f3ba796e98':
  Import translations. DO NOT MERGE
 2012-04-27 20:57:26 -07:00
Eric Fischer
7b82e20b89 Merge "Import translations. DO NOT MERGE" 2012-04-27 20:52:13 -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
abdb4fcea7 am 436770c0: Merge "Fix 6291333: Don\'t show multiple pin/pattern/password confirmations" into jb-dev 
* commit '436770c085d19dd5d41de8393a9d68fb7dff4488':
  Fix 6291333: Don't show multiple pin/pattern/password confirmations
 2012-04-27 19:21:25 -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
8d626e3e0e am 34081631: Merge "Ignore invalid network forget" into jb-dev 
* commit '3408163152d055f4ff59b027e72b662e710e72aa':
  Ignore invalid network forget
 2012-04-27 16:47:25 -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
4f38f99996 am 4c428f9e: Merge "Add three new developer settings" into jb-dev 
* commit '4c428f9e83964e48defa34924ad93f0b72673916':
  Add three new developer settings
 2012-04-27 15:33:53 -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
60271fd262 Import translations. DO NOT MERGE 
Change-Id: Ibcba26354743d05e33901f11dcd348fb85a87281
 2012-04-27 13:39:10 -07:00
Eric Fischer
a8c0d3df70 Import translations. DO NOT MERGE 
Change-Id: I4917f245f548a61165e7e36367d99871d6474408
 2012-04-27 13:37:24 -07:00
Amith Yamasani
23ab4e1617 am e42b999e: Merge "Make Manage Apps remember which tab was shown." into jb-dev 
* commit 'e42b999e164c6995358271f2128ed296871fb4a1':
  Make Manage Apps remember which tab was shown.
 2012-04-27 10:51:52 -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
f43e590803 am 68389e75: Merge "Allow p2p device rename" into jb-dev 
* commit '68389e75a5c01b77f068113803913e683ba39aac':
  Allow p2p device rename
 2012-04-27 09:58:58 -07:00
Irfan Sheriff
68389e75a5 Merge "Allow p2p device rename" into jb-dev 2012-04-27 09:55:45 -07:00