34465 Commits

Author SHA1 Message Date
rich cannings
a9819f4e24 am 42af7518: Merge "Add setting to change verifier visibility" into jb-mr1-dev
* commit '42af7518f55afebcf9b7656853d1a0e34361c3be':
  Add setting to change verifier visibility
2012-09-16 15:52:14 -07:00
Adam Powell
746fb290d2 am 89e68d78: Merge "Create main activity intents as needed for TaskStackBuilder/Up nav" into jb-mr1-dev
* commit '89e68d783b381a7dcbce5b1d603f4e2d8ee51c79':
  Create main activity intents as needed for TaskStackBuilder/Up nav
2012-09-16 15:50:29 -07:00
rich cannings
42af7518f5 Merge "Add setting to change verifier visibility" into jb-mr1-dev 2012-09-16 15:48:23 -07:00
Adam Powell
89e68d783b Merge "Create main activity intents as needed for TaskStackBuilder/Up nav" into jb-mr1-dev 2012-09-16 15:46:58 -07:00
Adam Powell
5a4010c054 Create main activity intents as needed for TaskStackBuilder/Up nav
If a generated parent intent targets an Activity that itself has no
parent specified, generate the intent using Intent.makeMainActivity
to gather the correct flags for the root intent of a task.

Bug 6457058

Change-Id: I8d4a3823eda752306da18c2c38fa7e57f0a33bf3
2012-09-16 15:15:46 -07:00
Adam Cohen
5ccbd2d9d5 am 62539859: Merge "Second pass on Keyguard multi-user switcher" into jb-mr1-dev
* commit '625398598894b18d797cc407632b78979b20a604':
  Second pass on Keyguard multi-user switcher
2012-09-16 14:49:06 -07:00
Adam Cohen
6253985988 Merge "Second pass on Keyguard multi-user switcher" into jb-mr1-dev 2012-09-16 14:46:55 -07:00
Adam Cohen
24b351ab74 Second pass on Keyguard multi-user switcher
-> animating active user to inactive, fading out lock
   selector, freezing screen, then switching users
-> for now, just using a fade, but this will likely
   see iteration

Change-Id: I3acc0b53f2cbf132741e3e0529e2e53fa2824542
2012-09-16 14:46:02 -07:00
John Huang
d320c6b837 am 4505a43f: Merge "Add support for per-package policy for sending premium SMS." into jb-mr1-dev
* commit '4505a43f300568811d3260d25381a61c7fff65ea':
  Add support for per-package policy for sending premium SMS.
2012-09-16 14:33:21 -07:00
John Huang
4505a43f30 Merge "Add support for per-package policy for sending premium SMS." into jb-mr1-dev 2012-09-16 14:31:16 -07:00
rich cannings
e6686b3e23 Add setting to change verifier visibility
Added a setting that will be used to control whether the user can see the
package verification setting in the Setting app.

Bug: 7022814
Change-Id: Ifa096682e90c83760df5db12c4cf72e2f897db9c
2012-09-16 14:02:20 -07:00
Jim Miller
929a40a4a1 Remove trailing period from missing SIM string
Fixes bug 6719893

Change-Id: I551da914baeeabe4a048855aa937ac3a5dcbb904
2012-09-16 13:17:44 -07:00
Victoria Lease
0187c1822f am 306df863: Merge "New location service permission strings." into jb-mr1-dev
* commit '306df86302a96c7bf3d86aed81190c10ea6c2ccd':
  New location service permission strings.
2012-09-16 13:08:37 -07:00
Victoria Lease
306df86302 Merge "New location service permission strings." into jb-mr1-dev 2012-09-16 13:06:08 -07:00
Victoria Lease
b278933bbf New location service permission strings.
Updated for the new LocationManager's COARSE / FINE distinction.

Bug: 6996292
Change-Id: I6cb579c20dd4b6a44218cc1f19a849f845da6e6b
2012-09-16 12:39:54 -07:00
Adam Powell
f4261da827 am b1861c3e: Minor fixes/clarifications for previous patch.
* commit 'b1861c3e89c3e869c95c5c01b78320a1dcef26ad':
  Minor fixes/clarifications for previous patch.
2012-09-16 12:36:19 -07:00
Adam Powell
b1861c3e89 Minor fixes/clarifications for previous patch.
Change-Id: Ib44f6de570064b3f3ddf70b6727b479a09ae5d7a
2012-09-16 12:17:53 -07:00
Adam Powell
2df67ae100 am 7db4eec5: Merge "Squish!" into jb-mr1-dev
* commit '7db4eec5951aac8dc9428430d7928f96062fa8d4':
  Squish!
2012-09-16 11:55:14 -07:00
Adam Powell
828e56ea6e Squish!
Take touch point size into account during the detection of scaling
gestures. Average together the major/minor axes of the size.

Add a config resource for tuning the minimum span requred to begin
(or end) a scale. This may be altered in a device-specific overlay
for devices that deviate too far from their assigned density bucket.

Change-Id: I2986888e9427a7e4cb56717d59c4fa7858ba9ca7
2012-09-16 10:27:03 -07:00
Dianne Hackborn
addd270c5b am d65afc65: Merge "More multi-user stuff." into jb-mr1-dev
* commit 'd65afc65ea5b2bf83889dd88a9c94f895da8aece':
  More multi-user stuff.
2012-09-16 00:08:39 -07:00
Dianne Hackborn
d65afc65ea Merge "More multi-user stuff." into jb-mr1-dev 2012-09-16 00:05:46 -07:00
Dianne Hackborn
5dc5a00e7e More multi-user stuff.
- New public APIs to find out when a user goes to the foreground,
  background, and is first initializing.
- New activity manager callback to be involved in the user switch
  process, allowing other services to let it know when it is safe
  to stop freezing the screen.
- Wallpaper service now implements this to handle its user switch,
  telling the activity manager when it is done.  (Currently this is
  only handling the old wallpaper going away, we need a little more
  work to correctly wait for the new wallpaper to get added.)
- Lock screen now implements the callback to do its user switch.  It
  also now locks itself when this happens, instead of relying on
  some other entity making sure it is locked.
- Pre-boot broadcasts now go to all users.
- WallpaperManager now has an API to find out if a named wallpaper is
  in use by any users.

Change-Id: I27877aef1d82126c0a1428c3d1861619ee5f8653
2012-09-15 23:58:55 -07:00
Jeff Sharkey
8e53462d94 am d0c6ccba: Move NetworkPolicy from apps to UID.
* commit 'd0c6ccbafdebc73d03cf3cd47f02f9f6c78a69ff':
  Move NetworkPolicy from apps to UID.
2012-09-15 16:12:23 -07:00
Elliott Hughes
a16bec91c1 am edf60d3d: Fix up symbols.xml.
* commit 'edf60d3d0ab0b9e14c023ecf7aacf72c480dec24':
  Fix up symbols.xml.
2012-09-15 16:12:12 -07:00
Elliott Hughes
1a698714b9 am c3ff72f5: Use icu4c for CLDR "yesterday", "today", and "tomorrow" strings.
* commit 'c3ff72f5bd5896ad2584e0cc0582cbd2ad8191f2':
  Use icu4c for CLDR "yesterday", "today", and "tomorrow" strings.
2012-09-15 16:12:09 -07:00
Elliott Hughes
5f09b9f52d am 08153ee0: Switch DateUtils and Time over to using the CLDR for all week and month names.
* commit '08153ee01e6aa67061f628bc3fed66c6400dfd1c':
  Switch DateUtils and Time over to using the CLDR for all week and month names.
2012-09-15 16:12:06 -07:00
Elliott Hughes
ee783e6075 am 23321b88: Merge "Use ICU\'s CLDR data for "AM" and "PM" strings." into jb-mr1-dev
* commit '23321b88578a4b4438e7563ff7616b98a1c1a520':
  Use ICU's CLDR data for "AM" and "PM" strings.
2012-09-15 16:12:02 -07:00
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
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
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
Eino-Ville Talvala
8df3b2b398 Camera: Document face detection confidence recommendations.
Bug: 7108023
Change-Id: I9de583254d127f9c1f702b7ed159a7080bcbfd25
2012-09-15 14:32:14 -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
edf60d3d0a Fix up symbols.xml.
These dependent changes removed things from public.xml that have
since been moved to symbols.xml, so we need to remove them again.

Bug: 6811501
Change-Id: I1b333a5d3174de9b90039dcebbadcef65e8ae7b8
2012-09-14 20:22:17 -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
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
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
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
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
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