Irfan Sheriff
fec195d756
Fix NPE in advanced settings
...
Bug: 5723974
Change-Id: Ia0ad05c88f92b6c4b4d87f8565b9a6076cbf7542
2011-12-07 12:08:57 -08:00
Irfan Sheriff
d03c15119d
Remove watchdog setting for poor network avoidance
...
Change-Id: I3b0bf26ea73b909055d6cde8b18ff8c26922a7d2
2011-12-06 11:21:49 -08:00
The Android Open Source Project
c90961d431
Reconcile with ics-factoryrom-2-release
...
Change-Id: Ie2cc2f5f8339562f612278346ebd1d0aae763607
2011-11-16 08:56:44 -08:00
Eric Fischer
1b7268ef5c
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
2011-11-14 15:09:10 -08:00
Danielle Millett
6f3b1bb1d7
DO NOT MERGE Cherry picking from MR0 cl 147215
...
Adding an improve face matching settings option for Face Unlock
Adding an option which will launch a version of setup where faces
can be added to the current gallery. It requires the user to first
confirm their password before launching addToSetup.
Patch 3 - Updated for renaming of FackLockTutorial to SetupIntro.
Now it is called every time regardless of it it's showing the tutorial
and a flag is passed in to determine whether or not SetupIntro shows
the tutorial.
Patch 4 - Removed 'Setup Complete' toast at the end of screen lock
setups since it was primarily for Face Unlock and the congratulations
screen removes the need for it.
Change-Id: Idc5f960809d992ec7bbce59ef1e13b95ef7cce45
2011-11-14 16:40:40 -05:00
Eric Fischer
bf0e6d138e
Import revised translations. DO NOT MERGE
...
Change-Id: I3c719179477fda49580dbc58f79443a4e5c25cc9
2011-11-14 13:33:52 -08:00
Eric Fischer
de8cd9e6f0
Import revised translations. DO NOT MERGE
...
Change-Id: I57c6d5fdf39f880dab16d5db78bc6673d74090a9
2011-11-08 17:42:11 -08:00
Irfan Sheriff
01b32368ff
Add provisioning checks for BT and USB
...
Bug: 5568752
Change-Id: Ide4f3c0eb19f8e70e301a13d81b76dd6a0516c3a
2011-11-04 15:12:13 -07:00
The Android Automerger
850cb95af3
Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0"
...
This reverts commit 1b4f5d7435
, reversing
changes made to 19d9a3d284
.
2011-11-02 20:58:19 -07:00
The Android Automerger
ae076c958c
Revert "Merge "Fix WPS pin input UI" into ics-mr0"
...
This reverts commit 19d9a3d284
, reversing
changes made to 480b2e4406
.
2011-11-02 20:58:10 -07:00
The Android Automerger
5b5561197a
merge in ics-factoryrom-2-release history after reset to ics-mr0
2011-11-02 20:53:25 -07:00
Eric Fischer
553a2bda17
Import revised translations. DO NOT MERGE
...
Change-Id: I845d6b903ad4314b9aa61ea9ee03d7248164330a
2011-11-02 15:19:25 -07:00
The Android Automerger
12790a38a6
Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0"
...
This reverts commit 1b4f5d7435
, reversing
changes made to 19d9a3d284
.
2011-11-02 10:07:45 -07:00
The Android Automerger
90e6d79333
Revert "Merge "Fix WPS pin input UI" into ics-mr0"
...
This reverts commit 19d9a3d284
, reversing
changes made to 480b2e4406
.
2011-11-02 10:07:38 -07:00
The Android Automerger
849b109b27
merge in ics-factoryrom-2-release history after reset to ics-mr0
2011-11-02 09:48:56 -07:00
The Android Automerger
9e29ad6cb2
Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0"
...
This reverts commit 1b4f5d7435
, reversing
changes made to 19d9a3d284
.
2011-11-02 04:41:12 -07:00
Irfan Sheriff
1103c3beb8
Merge "Use component details to send provisionig intent" into ics-mr0
2011-11-01 21:15:30 -07:00
Irfan Sheriff
642a3c78f8
Use component details to send provisionig intent
...
Bug: 5544654
Change-Id: I0bd33c2a0d4c657bd10ba966d67ff54c27e42ea1
2011-11-01 14:58:31 -07:00
The Android Open Source Project
7d1737e045
Reconcile with ics-factoryrom-2-release
...
Change-Id: I744c148cd22781c33cd51cd734a055952f39d648
2011-11-01 10:08:55 -07:00
Nick Pelly
1b4f5d7435
Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0
2011-10-31 17:02:15 -07:00
The Android Automerger
150cc1dcdd
Revert "Merge "Fix WPS pin input UI" into ics-mr0"
...
This reverts commit 19d9a3d284
, reversing
changes made to 480b2e4406
.
2011-10-31 16:47:58 -07:00
Nick Pelly
e0eedf7157
Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS.
...
ACTION_NFCSHARING_SETTINGS is a new ICS API that doesn't work until now.
It allows application to show UI to turn Android Beam on.
Add ACTION_NFC_SHARING - exposed in MR2.
Remove ANDROID_BEAM_SETTINGS, this was orphanned.
I wish we had renamed ACTION_NFCSHARING_SETTINGS to ACTION_NDEF_PUSH_SETTINGS,
but too late now. It's already released in SDK.
Bug: 5465097
Change-Id: I641b2efa39a3567cbd1c31587f3b67b1b0a0caa0
Signed-off-by: Nick Pelly <npelly@google.com >
2011-10-31 14:56:18 -07:00
Irfan Sheriff
19d9a3d284
Merge "Fix WPS pin input UI" into ics-mr0
2011-10-31 14:01:42 -07:00
Irfan Sheriff
b9dfea636f
Fix WPS pin input UI
...
Change If60f42f7 introduces a bug for the WPS UI.
The input from access point text box should be shown for KEYPAD input
Bug: 5542833
Change-Id: I27f758b31b69425f51fe7ed17bf9b787a1bf66cc
2011-10-31 13:39:14 -07:00
Amith Yamasani
480b2e4406
Merge "Use vibrate icon in volume settings when appropriate." into ics-mr0
2011-10-28 19:40:42 -07:00
Amith Yamasani
ca7205842a
Use vibrate icon in volume settings when appropriate.
...
Clicking on icon will now put it in vibrate mode (instead of silent)
if vibrate is enabled for silent mode.
Bug: 5530217
Change-Id: Icd314981734af2cb37cf47fe27fc697bf447af73
2011-10-28 19:22:05 -07:00
Eric Fischer
6fded4ab3f
Import revised translations. DO NOT MERGE
...
Change-Id: Ib938444059955eab65a79afef9d9ec3c971dcd8c
2011-10-28 17:06:49 -07:00
Jaikumar Ganesh
d9bf0d1afa
Merge "Fix UI issue with Bluetooth Settings." into ics-mr0
2011-10-27 16:49:39 -07:00
Jaikumar Ganesh
f5754a078c
Fix UI issue with Bluetooth Settings.
...
When a profile fails to connect, the preference was getting unset.
Patch generated in conversation with Jake Hamby.
Bug: 5526404
Change-Id: I27ab8d337b6d121f8d369841d3f9a691293ef922
2011-10-27 16:39:50 -07:00
Eric Fischer
65c61ef8cd
Import revised translations. DO NOT MERGE
...
Change-Id: I2731df18113b720c7b2894c670302330c9c29f9f
2011-10-27 09:53:19 -07:00
Eric Fischer
d27fa50a0a
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
2011-10-26 14:06:13 -07:00
Eric Fischer
c57348f035
Import revised translations. DO NOT MERGE
...
Change-Id: I7d78b6f42431a906f9a8f624c9f0e573859ea4bc
2011-10-26 10:24:56 -07:00
Todd Poynor
a94320e332
Settings use minimum manual brightness from config
...
Remove use of deprecated android.os.Power.BRIGHTNESS_DIM (20) + 10.
Change-Id: I24aff7d7fc93b4b67dedb1047bbbd4dbe3fae382
Signed-off-by: Todd Poynor <toddpoynor@google.com >
2011-10-25 17:14:33 -07:00
Eric Fischer
caf76c08b3
Import revised translations. DO NOT MERGE
...
Change-Id: I7df445e1dff14ef16380b371d8e14af1b6a98295
2011-10-24 17:09:58 -07:00
Eric Fischer
b8568b2111
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
2011-10-21 16:00:30 -07:00
Eric Fischer
d27a632d94
Import revised translations. DO NOT MERGE
...
Change-Id: I1ccc1ed633e301bb2db039ea8ce1041a00daccc3
2011-10-21 14:41:59 -07:00
Irfan Sheriff
cb5fa5a447
Merge "Remove wifidirect UI listing" into ics-mr0
2011-10-21 13:29:53 -07:00
Irfan Sheriff
74fda1065a
Remove wifidirect UI listing
...
Was used for testing. remove it until proper UI is
added
Bug: 5497909
Change-Id: Ic8bd1afbe348ede9031f2446b30a99d7efc88f7c
2011-10-21 13:11:37 -07:00
Eric Fischer
388c9e2f14
Import revised translations. DO NOT MERGE
...
Change-Id: Ib962f495098fdcffdcf5f75d5813bb5fb1e94d7c
2011-10-20 18:04:50 -07:00
Eric Fischer
49a681c492
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
2011-10-20 11:29:07 -07:00
Eric Fischer
e373aa16f7
Import revised translations. DO NOT MERGE
...
Change-Id: Ic01568aa596d6aa3b36ee03d37f5d128e0744886
2011-10-20 11:16:21 -07:00
Danielle Millett
8123493ef9
Fix 5428748: Added more options for biometric weak
...
Adding make pattern visible (for pattern backup only) and vibrate
on touch as options for when biometric weak is enabled.
Change-Id: I6319f4f321779ebc6cf4acbfc0dd49b5014c0c88
2011-10-19 13:58:30 -04:00
Chih-Chung Chang
0bcd8a95a9
Fix 5352588: Accept view intent without URI.
...
Change-Id: Ibfcf32a7d27c3ac2d3fa3695e430b3e29f3ecd20
2011-10-19 11:07:19 +08:00
Dianne Hackborn
644fa4243b
Work on issue #5461497 : Landed on Welcome screen after a tap on 'Next' in Screen 500
...
With the corresponding change for the activity manager to allow the home
activity to finish itself, this activity can now be a little less dirty
and just call finish() when it finds it is not needed.
Change-Id: I1a449c7bec9fba659e27a9e918f8a9b0c55b2098
2011-10-18 13:41:26 -07:00
Svetoslav Ganov
39b8eb6ce5
Merge "Accessibility service toggle setting state not preserved on screen rotation." into ics-mr0
2011-10-18 13:14:38 -07:00
Svetoslav Ganov
96832f8cce
Accessibility service toggle setting state not preserved on screen rotation.
...
The state of the toggle switch for enabling/disabling an accessibility service
is not preserved on screen rotation after its state has been changed once.
bug:5478062
Change-Id: Ie453f78bc07dcd39d88bb4acf260768eccc73a74
2011-10-18 11:58:25 -07:00
Eric Fischer
3d0b525491
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
2011-10-18 11:31:06 -07:00
Eric Fischer
d31802575e
Import revised translations. DO NOT MERGE
...
Change-Id: Idddc20bec80db65304678bc5ad191cff3f2d2c5f
2011-10-18 11:13:37 -07:00
Danielle Millett
4c9a5fe6a3
Merge "Fix 5466557: Removed secondary screenlock settings labels" into ics-mr0
2011-10-18 10:27:41 -07:00
Justin Ho
6ab0c12ca4
Updated bandwidth assets
...
Change-Id: Ia180ff9dfb020ab2f3528638f522c38f11ea010f
2011-10-17 18:09:43 -07:00