Elliott Hughes
3b14b94078
am c12d642f: Merge "Revert "Add day_of_week_medium_* and day_of_week_short_* for Persian [fa]"" into jb-mr1-dev
...
* commit 'c12d642f040d6ea3e87d0ba187085bcdd11c2978':
Revert "Add day_of_week_medium_* and day_of_week_short_* for Persian [fa]"
2012-09-15 16:11:59 -07:00
Elliott Hughes
3d4967df25
am a8deafb4: Merge "Deprecate those parts of DateUtils the documentation says not to use." into jb-mr1-dev
...
* commit 'a8deafb4a68a0bdac2b5008f0f43c6645af2caf3':
Deprecate those parts of DateUtils the documentation says not to use.
2012-09-15 16:11:56 -07:00
Christopher Tate
55ffb815ae
am 2892dfbe: Merge "Fix default population of wifi settings" into jb-mr1-dev
...
* commit '2892dfbeafec5315d05fb6ceabeaee73b88f5ff0':
Fix default population of wifi settings
2012-09-15 16:11:53 -07:00
Daniel Sandler
3b9d9b1bd4
am 8dd9206a: Fix NPE in rotation lock QS.
...
* commit '8dd9206abbca6d143e3874abf46eca67f5340b31':
Fix NPE in rotation lock QS.
2012-09-15 16:11:49 -07:00
Geremy Condra
32e49bb65a
am 74a550fa: Merge "Change verifyServerDomainAndCertificates to pass in a hostname." into jb-mr1-dev
...
* commit '74a550fac7f30463c368bc01969a4fa57ac61791':
Change verifyServerDomainAndCertificates to pass in a hostname.
2012-09-15 16:11:45 -07:00
Elliott Hughes
c12d642f04
Merge "Revert "Add day_of_week_medium_* and day_of_week_short_* for Persian [fa]"" into jb-mr1-dev
2012-09-14 18:54:30 -07:00
Elliott Hughes
a8deafb4a6
Merge "Deprecate those parts of DateUtils the documentation says not to use." into jb-mr1-dev
2012-09-14 18:53:14 -07:00
Christopher Tate
2892dfbeaf
Merge "Fix default population of wifi settings" into jb-mr1-dev
2012-09-14 17:59:00 -07:00
Christopher Tate
6f5a9a9652
Fix default population of wifi settings
...
Various wifi settings that are explicitly defaulted did not get their
default code properly converted to refer to the correct settings
database table.
A collection of moved-to-Global settings that had not yet been
marked @deprecated in the Secure.* namespace are now so marked.
Also updated the namespace used to refer to wifi settings from the
Wifi Service. These changes are cosmetic, but they do eliminate a
number of runtime log messages.
Bug 7153671
Change-Id: I9e5b6464d025cfb480ef97373996e38e82f90593
2012-09-14 17:57:35 -07:00
Kenny Root
84193b198f
resolved conflicts for merge of 1c9894aa to jb-mr1-aah-dev
...
Change-Id: Ia640fa6a88fc75ac919eb542c1263756a9c3229a
2012-09-14 17:43:38 -07:00
Daniel Sandler
8dd9206abb
Fix NPE in rotation lock QS.
...
Bug: 7172228
Change-Id: I3ac35e18fe7ce5af13ee4c54dabae80df696c819
2012-09-14 17:29:21 -07:00
Geremy Condra
74a550fac7
Merge "Change verifyServerDomainAndCertificates to pass in a hostname." into jb-mr1-dev
2012-09-14 17:07:33 -07:00
Irfan Sheriff
7f55728213
am 42496826: Merge "Fix suspend bugs" into jb-mr1-dev
...
* commit '424968261fb346859a7ac796703527f2e34c0a84':
Fix suspend bugs
2012-09-14 16:56:18 -07:00
Kenny Root
1c9894aa7f
Merge "Remove AndroidKeyStore from API" into jb-mr1-dev
2012-09-14 16:55:47 -07:00
Irfan Sheriff
424968261f
Merge "Fix suspend bugs" into jb-mr1-dev
2012-09-14 16:54:09 -07:00
Elliott Hughes
7f269e4682
Deprecate those parts of DateUtils the documentation says not to use.
...
Applications using these fields and methods are just asking for i18n bugs.
Also @deprecate two int[]s that were never meant to be public.
(cherry-pick of d3c01012d8d329e541214e8207272ab5cc9ca004.)
Change-Id: I9fd131108ad82bacb9434ffbf40eddfde3459862
2012-09-14 16:52:33 -07:00
Elliott Hughes
fea122e6f0
Revert "Add day_of_week_medium_* and day_of_week_short_* for Persian [fa]"
...
This reverts commit f3875177254bb116028f8200c88d0b7a8ff9ab1c
This change conflicts with the intended cherry-pick of https://googleplex-android-review.googlesource.com/214542
Change-Id: If383a01dbd5de92d3e1d3ea2d55de15f7ccf9340
2012-09-14 16:49:55 -07:00
Geremy Condra
f743e54f2d
Change verifyServerDomainAndCertificates to pass in a hostname.
...
This is required for cert pinning.
Change-Id: I16041f17e97d9ae592a2b809f6a8164268338d1b
2012-09-14 16:43:52 -07:00
Irfan Sheriff
633fe60b78
Fix suspend bugs
...
Listen to screen broadcast all the time to avoid situations of losing
this information when wifi is turned on and off
Avoid duplicate suspend commands to driver
Bug: 7156907
Change-Id: I162b7ba249ae8925119a534229045965c0c13d1f
2012-09-14 16:42:58 -07:00
Elliott Hughes
f49a31626b
am 9ceede6d: am 086676a4: am f5437ee8: am 297ad257: Merge "Deprecate those parts of DateUtils the documentation says not to use."
...
* commit '9ceede6d7e250922e63b0d2c90403089f8736e0c':
Deprecate those parts of DateUtils the documentation says not to use.
2012-09-14 16:41:11 -07:00
Elliott Hughes
9ceede6d7e
am 086676a4: am f5437ee8: am 297ad257: Merge "Deprecate those parts of DateUtils the documentation says not to use."
...
* commit '086676a4a669b5d3a90c01e4d88ab8d628ca65f0':
Deprecate those parts of DateUtils the documentation says not to use.
2012-09-14 16:39:12 -07:00
Elliott Hughes
086676a4a6
am f5437ee8: am 297ad257: Merge "Deprecate those parts of DateUtils the documentation says not to use."
...
* commit 'f5437ee86a34751fa6d441b95282feb315e19eb6':
Deprecate those parts of DateUtils the documentation says not to use.
2012-09-14 16:36:33 -07:00
Elliott Hughes
f5437ee86a
am 297ad257: Merge "Deprecate those parts of DateUtils the documentation says not to use."
...
* commit '297ad257464d2ea65cabd45ddb19f6da34b39157':
Deprecate those parts of DateUtils the documentation says not to use.
2012-09-14 16:34:41 -07:00
Kenny Root
ce24985ad6
Remove AndroidKeyStore from API
...
Change-Id: Ibe09d78e5a5b86604f01144f344525bff94c2dde
2012-09-14 16:23:37 -07:00
Elliott Hughes
297ad25746
Merge "Deprecate those parts of DateUtils the documentation says not to use."
2012-09-14 16:12:36 -07:00
Elliott Hughes
d3c01012d8
Deprecate those parts of DateUtils the documentation says not to use.
...
Applications using these fields and methods are just asking for i18n bugs.
Also @deprecate two int[]s that were never meant to be public.
Change-Id: I29b3a1c0c663fe344d2567df6ed3bb537270b3b7
2012-09-14 16:06:50 -07:00
rich cannings
63eda54c9d
am 0b62fa23: Merge "Send more information to verifiers" into jb-mr1-dev
...
* commit '0b62fa234d2e3580b1f04cb9c4a6a308be99a5ae':
Send more information to verifiers
2012-09-14 16:04:30 -07:00
rich cannings
0b62fa234d
Merge "Send more information to verifiers" into jb-mr1-dev
2012-09-14 16:02:29 -07:00
Svetoslav Ganov
65a65db3b8
am 8b681cb8: Some formatting missed in the previous patch
...
* commit '8b681cb8813454aac8a626bf3d7adaa8beca4d75':
Some formatting missed in the previous patch
2012-09-14 15:22:34 -07:00
Svetoslav Ganov
8b681cb881
Some formatting missed in the previous patch
...
Change-Id: I299090ca67b1d90cf75a46dc85b13970d32511e5
2012-09-14 15:20:45 -07:00
Svetoslav Ganov
f46519a97d
am 3efa8bab: Merge "Adding accessibility events for touch and gesture detection states." into jb-mr1-dev
...
* commit '3efa8babf581b107f63e29dedb56166e5db1bfdb':
Adding accessibility events for touch and gesture detection states.
2012-09-14 15:18:53 -07:00
Svetoslav Ganov
3efa8babf5
Merge "Adding accessibility events for touch and gesture detection states." into jb-mr1-dev
2012-09-14 15:16:27 -07:00
Svetoslav Ganov
77276b6085
Adding accessibility events for touch and gesture detection states.
...
1. Currently the system fires accessibility events to announce the
start and end of a touch exploration gesture. However, such a
gesture starts after we have decided that the user is not
performing a gesture which is achieved by measuring speed of
movement during a threshold distance. This allows an accessibility
service to provide some feedback to the user so he knows that
he is touch exploring.
This change adds event types for the first and last touches
of the user. Note that the first touch does not conincide with
the start of a touch exploration gesture since we need a time
or distance to pass before we know whether the user explores
or gestures. However, it is very useful for an accessibility
service to know when the user starts to interact with the
touch screen so it can turn the speech off, to name one
compelling use case.
This change also provides event types for the start and end
of gesture detection. If the user has moved over the threshold
with a speed greater than X, then the system detects gestures.
It is useful for an accessibility service to know the begin
and end of gesture detection so it can provide given feedback
type for such a gesture, say it may produce haptic feedback
or sound that differs for the one for touch exploration.
The main benefit of announcing these new events is that an
accessibility service can provide feedback for each touch
state allowing the user to always know what he is doing.
bug:7166935
Change-Id: I26270d774cc059cb921d6a4254bc0aab0530c1dd
2012-09-14 15:12:54 -07:00
Irfan Sheriff
df792631a1
am b4ad71ae: Merge "Increase GO idle time out to 5 seconds" into jb-mr1-dev
...
* commit 'b4ad71aee547d37ff65e67d2fd8743da0b17b258':
Increase GO idle time out to 5 seconds
2012-09-14 15:08:52 -07:00
Irfan Sheriff
b4ad71aee5
Merge "Increase GO idle time out to 5 seconds" into jb-mr1-dev
2012-09-14 15:06:19 -07:00
Baligh Uddin
d4dc1d48c1
am c3a691ec: Merge "Add day_of_week_medium_* and day_of_week_short_* for Persian [fa]" into jb-mr1-dev
...
* commit 'c3a691ec3c340f6d37b85a85406eeacc88b783d5':
Add day_of_week_medium_* and day_of_week_short_* for Persian [fa]
2012-09-14 15:04:43 -07:00
Irfan Sheriff
a149edf438
Increase GO idle time out to 5 seconds
...
This is needed to work well with cavium dongle and 2 seconds
was too aggressive to let a client scan and connect.
Change-Id: Id3f1e3711333365c1e90827fb92675fd5dbc49da
2012-09-14 15:04:36 -07:00
Baligh Uddin
c3a691ec3c
Merge "Add day_of_week_medium_* and day_of_week_short_* for Persian [fa]" into jb-mr1-dev
2012-09-14 15:02:17 -07:00
Jatin Lodhia
206820357a
am 836033d6: Merge "Update account list on account picker activity resume" into jb-mr1-dev
...
* commit '836033d6502641a4631bdc5cbd2d57848561e7ca':
Update account list on account picker activity resume
2012-09-14 14:44:51 -07:00
Jatin Lodhia
836033d650
Merge "Update account list on account picker activity resume" into jb-mr1-dev
2012-09-14 14:42:00 -07:00
rich cannings
13d428e830
Send more information to verifiers
...
Send package name, version code and the uid of the application requesting the
install to package verifiers.
Bug: 7164155
Change-Id: I2464dc5d4551f60b4f38f7982495a8920c83e1cd
2012-09-14 14:25:52 -07:00
Amith Yamasani
f0bb0f4e7d
am a87826c3: Merge "Fix face unlock for multiple users" into jb-mr1-dev
...
* commit 'a87826c345dbd692a86a340691cf7471a2505809':
Fix face unlock for multiple users
2012-09-14 14:14:01 -07:00
Amith Yamasani
a87826c345
Merge "Fix face unlock for multiple users" into jb-mr1-dev
2012-09-14 14:11:58 -07:00
Kristian Monsen
cdd2dd58d8
am 4cb846b8: Merge "Hiding some of the deprecated android.webkit API\'s" into jb-mr1-dev
...
* commit '4cb846b8defa298fe62e6420d1dcd7d8f65a1d74':
Hiding some of the deprecated android.webkit API's
2012-09-14 14:03:59 -07:00
Ben Gruver
ff02582a3b
am 51fbaff1: Merge "DEFAULT_VERIFY_ENABLE turns verification off" into jb-mr1-dev
...
* commit '51fbaff11c195d3004f872d19f98a20fa6c44456':
DEFAULT_VERIFY_ENABLE turns verification off
2012-09-14 14:03:56 -07:00
Winson Chung
dda3f13f52
am 4f49d945: Adding data type overlay to network tile.
...
* commit '4f49d9450fe919868f9a9a9a44db59ca2497150c':
Adding data type overlay to network tile.
2012-09-14 14:02:10 -07:00
Winson Chung
4f49d9450f
Adding data type overlay to network tile.
...
Change-Id: Iae3c188e2f7f03bd1ebaddc756021be312ddb0aa
2012-09-14 14:02:07 -07:00
Kristian Monsen
4cb846b8de
Merge "Hiding some of the deprecated android.webkit API's" into jb-mr1-dev
2012-09-14 14:01:37 -07:00
Ben Gruver
51fbaff11c
Merge "DEFAULT_VERIFY_ENABLE turns verification off" into jb-mr1-dev
2012-09-14 14:01:37 -07:00
Jeff Sharkey
d0f5607e76
am 04a34b37: Merge "Actually move to Global settings." into jb-mr1-dev
...
* commit '04a34b375513eaeec67f54bb203ef6b763328751':
Actually move to Global settings.
2012-09-14 13:51:19 -07:00