Danielle Millett
ff65fd09c6
am af1ef9ed: Merge "Adding a flag for if biometric weak has ever been used"
...
* commit 'af1ef9ed034e68db9d6c25f8b174fabf60b779d9':
Adding a flag for if biometric weak has ever been used
2011-10-05 06:37:06 -07:00
Fabrice Di Meglio
645b7fa5b6
am e921572b: Merge "Revert "Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)""
...
* commit 'e921572bda621b75a217bce115c2b605caf9b26a':
Revert "Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)"
2011-10-05 06:36:45 -07:00
Svetoslav Ganov
97e1af548e
am 63f5e09c: Merge "Make prompt for headset while typing a password if accessibilbity is on less verbose."
...
* commit '63f5e09c8cce112b0945190da7d4a108b92a6c52':
Make prompt for headset while typing a password if accessibilbity is on less verbose.
2011-10-05 06:36:43 -07:00
Danielle Millett
af1ef9ed03
Merge "Adding a flag for if biometric weak has ever been used"
2011-10-04 18:44:55 -07:00
Danielle Millett
7a07219a1f
Adding a flag for if biometric weak has ever been used
...
This flag will be used to show a tutorial screen first time it is used.
The flag is set to true once facelock has been set (via the savePassword or
savePattern when in fallback mode)
Change-Id: I43e3f876810fd32d3d5a5a285201e8054c4b3098
2011-10-04 21:01:52 -04:00
Fabrice Di Meglio
e921572bda
Merge "Revert "Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)""
2011-10-04 17:24:37 -07:00
Fabrice Di Meglio
ad0b051b13
Revert "Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)"
...
This reverts commit a130e5f59d
2011-10-04 17:21:26 -07:00
Svetoslav Ganov
63f5e09c8c
Merge "Make prompt for headset while typing a password if accessibilbity is on less verbose."
2011-10-04 17:14:57 -07:00
Svetoslav Ganov
bd39ca7014
Make prompt for headset while typing a password if accessibilbity is on less verbose.
...
If accessibility is enabled and there is no headset we do not speak the pressed keys.
In such a case we provide a prompt to the blind user to use a headset. This was announced
on every keypress which is quite annoying. Now this is announced only once.
bug:5342234
Change-Id: Ibe55ad991ad2153d09cde57b030544948fa0d73b
2011-10-04 17:05:55 -07:00
Christopher Tate
e706cef1c5
am b5de5985: Merge "Add -nosystem flag to adb backup"
...
* commit 'b5de598554a97c557a3e0c20c28bbe5454164a6d':
Add -nosystem flag to adb backup
2011-10-04 16:18:24 -07:00
Christopher Tate
b5de598554
Merge "Add -nosystem flag to adb backup"
2011-10-04 16:16:11 -07:00
Dave Santoro
ef728978b3
am 2aeecb7a: Merge "Add new permissions for read/write social stream."
...
* commit '2aeecb7aa57242aae29dddff2b9ebd5d21aa3824':
Add new permissions for read/write social stream.
2011-10-04 15:47:39 -07:00
Dave Santoro
2aeecb7aa5
Merge "Add new permissions for read/write social stream."
2011-10-04 15:46:10 -07:00
Dave Santoro
0b61f59d77
Add new permissions for read/write social stream.
...
This is a manual merge of a change going in to ICS-FactoryROM.
These permissions are needed to separate the (potentially invasive)
access to the user's social stream from the existing read/write
contacts permission.
Per discussion with Android release team, we are also hiding the
stream item API until we figure out a better way to guard the data.
Bug 5406886
Change-Id: I8339d743c3ebe8923c7ee47f2900444efcf82a52
2011-10-04 15:35:48 -07:00
Christopher Tate
240c7d2d1f
Add -nosystem flag to adb backup
...
This makes it easy to back up everything that belongs to 3rd party apps, but
nothing that comes with the system per se. If any system packages are
explicitly named on the command line they will be included in the backup
even if -nosystem was passed. So, for example, this will back up all 3rd
party apps as well as system settings, but nothing else belonging to
system-deployed apps:
adb backup -all -nosystem com.android.provider.settings
Bug 5361503
Change-Id: Iebe04b7d7027ca58b9f55e8eb7f219d6cca69269
2011-10-04 15:35:00 -07:00
Ben Komalo
f98a21ee7f
am a1aebdf7: Merge "New PIN unlock screen layout."
...
* commit 'a1aebdf787443413ba870fc9203639405a5ff7bf':
New PIN unlock screen layout.
2011-10-04 14:29:51 -07:00
Ben Komalo
a1aebdf787
Merge "New PIN unlock screen layout."
2011-10-04 14:27:24 -07:00
Joe Fernandez
90b66cb321
am cac15eb2: Merge "docs: add developer guide cross-references, Project ACRE"
...
* commit 'cac15eb21cab68e5b76fe06f9aff273978c92054':
docs: add developer guide cross-references, Project ACRE
2011-10-04 14:04:53 -07:00
Joe Fernandez
cac15eb21c
Merge "docs: add developer guide cross-references, Project ACRE"
2011-10-04 14:03:12 -07:00
Joe Fernandez
b54e7a3d9f
docs: add developer guide cross-references, Project ACRE
...
Change-Id: I5df1c4e13af67ff4c4a5b22f3cb1247bf0103b09
2011-10-04 13:57:00 -07:00
Danielle Millett
ec41b1a15b
am b177b190: Merge "Fix 5405210: DevicePolicyManager doesn\'t allow Face Unlock"
...
* commit 'b177b190a0c24754fc9af042681be7cd0284040e':
Fix 5405210: DevicePolicyManager doesn't allow Face Unlock
2011-10-04 13:26:28 -07:00
Danielle Millett
b177b190a0
Merge "Fix 5405210: DevicePolicyManager doesn't allow Face Unlock"
2011-10-04 13:23:55 -07:00
Jeff Sharkey
ba36487a48
am c58111b3: Merge "Track xtables summary, move tether stats, time."
...
* commit 'c58111b307018da66bc227ed5ca019f7d8143b9a':
Track xtables summary, move tether stats, time.
2011-10-04 13:13:55 -07:00
Jeff Sharkey
c58111b307
Merge "Track xtables summary, move tether stats, time."
2011-10-04 13:12:06 -07:00
Irfan Sheriff
c08ea6af1e
am 2e93402d: Merge "Reduce/Fix system logging"
...
* commit '2e93402d0e90b484df8ee2ca0319e49ae20614ca':
Reduce/Fix system logging
2011-10-04 12:16:25 -07:00
Irfan Sheriff
2e93402d0e
Merge "Reduce/Fix system logging"
2011-10-04 12:13:27 -07:00
Irfan Sheriff
7f8a12c75c
Reduce/Fix system logging
...
Bug: 5410239
Change-Id: I2f91dfde0b701e8905a1235696591b3154693c7c
2011-10-04 12:01:31 -07:00
Gilles Debunne
fdfea1d2e5
am 8c60235b: Merge "5402566: Copy/cut icons do not appear if the text is Japanese only"
...
* commit '8c60235b550ecbd5cba594584f78ef6630953e56':
5402566: Copy/cut icons do not appear if the text is Japanese only
2011-10-04 10:52:47 -07:00
Gilles Debunne
e5eccea432
am a13a322e: Merge "Optimisations and bugs in SpellChecker"
...
* commit 'a13a322e090c50549ce5a42c382e1ef668cf0481':
Optimisations and bugs in SpellChecker
2011-10-04 10:52:45 -07:00
Gilles Debunne
8c60235b55
Merge "5402566: Copy/cut icons do not appear if the text is Japanese only"
2011-10-04 10:51:13 -07:00
Gilles Debunne
a13a322e09
Merge "Optimisations and bugs in SpellChecker"
2011-10-04 10:50:54 -07:00
Matthew Xie
da208048c1
am 3b8e0726: Merge "Send TURN_HOT message to the state machine from BluetoothService after it starts"
...
* commit '3b8e07269a66f54163452adbd2557d406253592c':
Send TURN_HOT message to the state machine from BluetoothService after it starts
2011-10-04 10:23:19 -07:00
Matthew Xie
3b8e07269a
Merge "Send TURN_HOT message to the state machine from BluetoothService after it starts"
2011-10-04 10:21:37 -07:00
Danielle Millett
c8fb532d45
Fix 5405210: DevicePolicyManager doesn't allow Face Unlock
...
If Face Unlock is currently enabled when the device policy manager is installed
it now forces the user to choose a new acceptable lock type
Change-Id: I725e923240538df3f706251670bf497857d2a25f
2011-10-04 12:18:51 -04:00
Alon Albert
b69595c943
am 62abf34d: Merge "Update dumpsys output"
...
* commit '62abf34d0dce0deb017b18beef3d8f73bd90981a':
Update dumpsys output
2011-10-04 08:41:25 -07:00
Alon Albert
62abf34d0d
Merge "Update dumpsys output"
2011-10-04 08:39:46 -07:00
Flavio Lerda
906da90834
am 3c5cef23: Merge "Add a cached formatted phone number to call log."
...
* commit '3c5cef23aa504e9f424aee8ed4399b0ad35a4493':
Add a cached formatted phone number to call log.
2011-10-04 02:26:37 -07:00
Flavio Lerda
3c5cef23aa
Merge "Add a cached formatted phone number to call log."
2011-10-04 02:24:28 -07:00
Jim Miller
34cfd4ae04
am ebccf3c2: Merge "Fix 5185505: allow facelock to be enabled by a setting."
...
* commit 'ebccf3c2c8f31d54505b6250ef87c8db5587c1bc':
Fix 5185505: allow facelock to be enabled by a setting.
2011-10-03 22:01:44 -07:00
Jim Miller
ebccf3c2c8
Merge "Fix 5185505: allow facelock to be enabled by a setting."
2011-10-03 22:00:03 -07:00
Dianne Hackborn
08286c1224
am c04db7e0: Fix handling of "allow fds" state.
...
* commit 'c04db7e06737c5b9bae276ac462858d44002672e':
Fix handling of "allow fds" state.
2011-10-03 21:23:02 -07:00
Jim Miller
cb3521e3bb
Fix 5185505: allow facelock to be enabled by a setting.
...
This allows face recognition to be enabled through Settings.Secure,
so we can test on selected devices.
Change-Id: I7f832cafd6a98f4289d618bc8924cd467706b778
2011-10-03 21:17:53 -07:00
Dianne Hackborn
c04db7e067
Fix handling of "allow fds" state.
...
Didn't take into account nesting of bundles. Boo.
Change-Id: Ic8cf21ad8d6f4938a3e105128624c9d162310d01
2011-10-03 21:09:35 -07:00
Svetoslav Ganov
8f813df652
am 2588a077: Merge "The logic for not populating text to some accessibility events is scattered."
...
* commit '2588a07730ff511329c87b5f61b20419b2443d48':
The logic for not populating text to some accessibility events is scattered.
2011-10-03 18:34:53 -07:00
Gilles Debunne
8f3105ff9b
5402566: Copy/cut icons do not appear if the text is Japanese only
...
When the word iterator return an empty range, select an arbitrary
character so that cut/copy icons are available.
Change-Id: I16e5a3c7f10886db967d870706da7f2d690af013
2011-10-03 18:34:28 -07:00
Svetoslav Ganov
2588a07730
Merge "The logic for not populating text to some accessibility events is scattered."
2011-10-03 18:33:32 -07:00
Ben Komalo
51ea88a86e
New PIN unlock screen layout.
...
Moves "OK" to the right and moves backspace up to beside the text field.
Bug: 5255976
Change-Id: I1b97ee108c9f10f11e5feb361810150bd6dbc776
2011-10-03 18:29:39 -07:00
Svetoslav Ganov
c27149ac0e
am 0058f724: Merge "Accessibility services cannot obtain the source of an event coming from a root namespace descendant."
...
* commit '0058f724eb5a4e8b8f7409cdcea0ba154b5d2332':
Accessibility services cannot obtain the source of an event coming from a root namespace descendant.
2011-10-03 17:46:13 -07:00
Svetoslav Ganov
0058f724eb
Merge "Accessibility services cannot obtain the source of an event coming from a root namespace descendant."
2011-10-03 17:43:39 -07:00
Danielle Millett
24a936febd
am fee5cb54: Merge "Reworked biometric weak check functions"
...
* commit 'fee5cb54af9c86c045f1cb5d129c2cc395fe56db':
Reworked biometric weak check functions
2011-10-03 17:39:54 -07:00