Jeff Sharkey
40210f98ba
am 06f01326: am d0c6ccba: Move NetworkPolicy from apps to UID.
...
* commit '06f01326dfd9e2ee557fd817481081bc3f36e35e':
Move NetworkPolicy from apps to UID.
2012-09-17 14:43:36 -07:00
Christopher Tate
5067ea3751
am 5bae602c: am 2892dfbe: Merge "Fix default population of wifi settings" into jb-mr1-dev
...
* commit '5bae602cbbb96af3290d430ab25600149d4d073d':
Fix default population of wifi settings
2012-09-17 12:47:03 -07:00
Geremy Condra
393760861d
am 81953a34: am 74a550fa: Merge "Change verifyServerDomainAndCertificates to pass in a hostname." into jb-mr1-dev
...
* commit '81953a3437c3af24dfb53cc7c106147d9a89be1f':
Change verifyServerDomainAndCertificates to pass in a hostname.
2012-09-17 12:46:56 -07:00
Kenny Root
24499c9e50
am 049005e3: am 1c9894aa: Merge "Remove AndroidKeyStore from API" into jb-mr1-dev
...
* commit '049005e3c55b5f5dfda1c69482c6104d5931a2fc':
Remove AndroidKeyStore from API
2012-09-17 12:46:13 -07:00
Elliott Hughes
7850a41871
am 42e7af25: am 9ceede6d: am 086676a4: am f5437ee8: am 297ad257: Merge "Deprecate those parts of DateUtils the documentation says not to use."
...
* commit '42e7af25c06e2d1dbf8201d1ff1528311cf8c44e':
Deprecate those parts of DateUtils the documentation says not to use.
2012-09-17 12:45:47 -07:00
rich cannings
ecfc9d8253
am d063b14d: am 0b62fa23: Merge "Send more information to verifiers" into jb-mr1-dev
...
* commit 'd063b14dc8ef3cdf63d658b5375bf84b5cb1dc02':
Send more information to verifiers
2012-09-17 12:45:31 -07:00
Svetoslav Ganov
664222b066
am acbea737: am 3efa8bab: Merge "Adding accessibility events for touch and gesture detection states." into jb-mr1-dev
...
* commit 'acbea737ec97f0fd15f2818196495b2355094065':
Adding accessibility events for touch and gesture detection states.
2012-09-17 12:45:14 -07:00
Jatin Lodhia
dbef28ab73
am 4dc67287: am 836033d6: Merge "Update account list on account picker activity resume" into jb-mr1-dev
...
* commit '4dc67287774495e192193e888fae6603ed85c4be':
Update account list on account picker activity resume
2012-09-17 11:29:54 -07:00
Kristian Monsen
7f52de24d6
am 7b1be537: am 4cb846b8: Merge "Hiding some of the deprecated android.webkit API\'s" into jb-mr1-dev
...
* commit '7b1be537546481c6687efd03c3c709b266502abf':
Hiding some of the deprecated android.webkit API's
2012-09-17 11:29:20 -07:00
Jeff Sharkey
67bbcd036a
am 1e364aca: am 04a34b37: Merge "Actually move to Global settings." into jb-mr1-dev
...
* commit '1e364acac6f4768672deb73485e93c32929e25fd':
Actually move to Global settings.
2012-09-17 11:10:16 -07:00
Jeff Sharkey
ddf93f9503
am 892bf6c6: am a043c2c0: Merge "Move to Global.NETSTATS and Global.NTP constants." into jb-mr1-dev
...
* commit '892bf6c607127ae8405fd589ae70023e457844f5':
Move to Global.NETSTATS and Global.NTP constants.
2012-09-17 11:10:05 -07:00
Jim Miller
391513a0a8
am e98aef73: am f229e4d3: Add support for settings for lock widgets
...
* commit 'e98aef734657cc129143a4a25ee78ade48d34037':
Add support for settings for lock widgets
2012-09-17 11:09:55 -07:00
Michael Jurka
5a8deb16b9
am 5f76482f: am 95a2ff7c: Merge "Adding a couple extras keys for keyguard widget selection" into jb-mr1-dev
...
* commit '5f76482f46139809dda13e01ec81ca87ca0803d7':
Adding a couple extras keys for keyguard widget selection
2012-09-17 11:09:34 -07:00
Svetoslav Ganov
55ab5105d4
am 71e3cb14: am e136a728: Merge "Text layout in switch may be null when accessibility events are fired." into jb-mr1-dev
...
* commit '71e3cb143b6eb6052bb6820bf551a1d74e19ee8d':
Text layout in switch may be null when accessibility events are fired.
2012-09-17 11:09:16 -07:00
Christopher Tate
ed1c549a7d
am 45b2dce9: am 0dbc4108: Merge "Fix Settings writes to a different user" into jb-mr1-dev
...
* commit '45b2dce9822caefe69f3f680f9e60f076f9e2eaf':
Fix Settings writes to a different user
2012-09-17 11:09:11 -07:00
Jeff Sharkey
d0c6ccbafd
Move NetworkPolicy from apps to UID.
...
For multi-user devices, switch to storing policy per-user instead of
per-app. Also watch for user added/removed broadcasts to clean up
policies and apply global restrictions.
Bug: 7121279
Change-Id: Ia7326bd0ebe0586fa4ec6d3a62f6313dc8814007
2012-09-14 23:00:27 -07:00
Elliott Hughes
c3ff72f5bd
Use icu4c for CLDR "yesterday", "today", and "tomorrow" strings.
...
(cherry-pick of 47a0539ecaf7d7a15008704bd89f748aebf85d47.)
Conflicts:
core/res/res/values/public.xml
Bug: 6811501
Change-Id: Ifb2e030a9fda85a7f664feac812b63e67780e68f
2012-09-14 20:22:17 -07:00
Elliott Hughes
08153ee01e
Switch DateUtils and Time over to using the CLDR for all week and month names.
...
(cherry-pick of 99c406e42ba154584070ca7ec100e8be7ff8a800.)
Conflicts:
core/res/res/values-fa/donottranslate-cldr.xml
core/res/res/values/public.xml
Bug: 6811501
Change-Id: I2ad9608ae34804e02c6b0271197e96611df12b0a
2012-09-14 20:22:17 -07:00
Elliott Hughes
23321b8857
Merge "Use ICU's CLDR data for "AM" and "PM" strings." into jb-mr1-dev
2012-09-14 18:56:15 -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
Elliott Hughes
4af85345e7
Use ICU's CLDR data for "AM" and "PM" strings.
...
This brings DateUtils and Time in sync with bionic, icu, WebKit,
DateFormatSymbols, Formatter, and SimpleDateFormat. And specifically
means that DateUtils now knows how to say "AM" and "PM" in Japanese.
Bug: 6719054
(cherry-pick of b12b61a88a029730b1f2b006ff914c9c719f3942.)
Conflicts:
core/res/res/values/public.xml
Change-Id: Ic1a811621a0ec338abd77458ac2046577f87c1e4
2012-09-14 17:10:00 -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
Kenny Root
1c9894aa7f
Merge "Remove AndroidKeyStore from API" into jb-mr1-dev
2012-09-14 16:55:47 -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
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
0b62fa234d
Merge "Send more information to verifiers" into jb-mr1-dev
2012-09-14 16:02:29 -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
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
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
Jeff Sharkey
04a34b3755
Merge "Actually move to Global settings." into jb-mr1-dev
2012-09-14 13:49:24 -07:00
Jeff Sharkey
e6e6197d7c
Actually move to Global settings.
...
Also add better ConnectivityService logging.
Bug: 7157464
Change-Id: Ia235a7e62ed809240913c4782920c1410c7d597d
2012-09-14 13:47:51 -07:00
Jeff Sharkey
a043c2c053
Merge "Move to Global.NETSTATS and Global.NTP constants." into jb-mr1-dev
2012-09-14 13:15:16 -07:00
Jeff Sharkey
023c05a341
Move to Global.NETSTATS and Global.NTP constants.
...
Bug: 7157464
Change-Id: Ief10fd37940f62420f5684940994c9f93802e0be
2012-09-14 13:14:21 -07:00
Jim Miller
f229e4d3eb
Add support for settings for lock widgets
...
Change-Id: Iade094c6f32a7653bdbbd4921d345d68f2443ff4
2012-09-14 12:31:24 -07:00
Michael Jurka
95a2ff7cb4
Merge "Adding a couple extras keys for keyguard widget selection" into jb-mr1-dev
2012-09-14 12:20:08 -07:00
Svetoslav Ganov
e136a72810
Merge "Text layout in switch may be null when accessibility events are fired." into jb-mr1-dev
2012-09-14 11:37:15 -07:00
Svetoslav Ganov
b8c50e8e44
Text layout in switch may be null when accessibility events are fired.
...
1. The layout containing the text of a Switch is initialized on measure
and if an accessibility event is fired before that then a NPE happens.
bug:7169419
Change-Id: Iee3c01ca9157d14d228c4ff33c0810507e0e25a7
2012-09-14 11:36:29 -07:00
Christopher Tate
0dbc410800
Merge "Fix Settings writes to a different user" into jb-mr1-dev
2012-09-14 11:35:19 -07:00
Jeff Brown
3fa6a3b6ef
am 3113f983: am 2dc6af20: Merge "Fixup a comment." into jb-mr1-dev
...
* commit '3113f9833b01b7b682f592c7fc1259619df137ec':
Fixup a comment.
2012-09-14 10:30:51 -07:00
Romain Guy
f814ec337d
am 7acf9c14: am 51d71003: Merge "Prevent crash when invalidating all Views Bug #7165793 " into jb-mr1-dev
...
* commit '7acf9c1442693fc20e44e16c5890c8560d9bdbba':
Prevent crash when invalidating all Views Bug #7165793
2012-09-14 10:30:46 -07:00
Svetoslav Ganov
d9c18b307b
am 57ac3090: am 33aef98f: Allowing association between a view and its label for accessibility.
...
* commit '57ac30901912accc5814cd8122ca419524b8ca5b':
Allowing association between a view and its label for accessibility.
2012-09-14 10:29:15 -07:00
Alan Viverette
6304ad8e7c
am 459bde56: am 0f755134: Revert "Add accessibility scroll actions to TabWidget"
...
* commit '459bde565e2d741006d48fa59b413449d5b3b954':
Revert "Add accessibility scroll actions to TabWidget"
2012-09-14 10:29:11 -07:00