drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,729 Commits 1 Branch 0 Tags
Commit Graph

84729 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Irfan Sheriff
6b2fc4f865 am 3849490c: Merge "Return empty scan results for background user" into jb-mr1-dev 
* commit '3849490c6314d5887f534cc5dea0fc56499465aa':
  Return empty scan results for background user
 2012-09-16 15:26:08 -07:00
Irfan Sheriff
3849490c63 Merge "Return empty scan results for background user" into jb-mr1-dev 2012-09-16 15:23:55 -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
Ying Wang
8f09570f41 am df5bdd72: Merge "Make librs_jni depend on libRSDriver to remove circular dependency" into jb-mr1-dev 
* commit 'df5bdd721bdfd1a8f370dd3a18d1b0e655f71cd5':
  Make librs_jni depend on libRSDriver to remove circular dependency
 2012-09-16 14:51:53 -07:00
Ying Wang
df5bdd721b Merge "Make librs_jni depend on libRSDriver to remove circular dependency" into jb-mr1-dev 2012-09-16 14:49:43 -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
Ying Wang
12618a7f20 Make librs_jni depend on libRSDriver to remove circular dependency 
Change-Id: Ia607f732f2f22968fd6f1793c2f252f08300357d
 2012-09-16 13:31:30 -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
Irfan Sheriff
330b187574 Return empty scan results for background user 
Bug: 7087342
Change-Id: I62493e5004111311b7ac9b7610c85e6784e2c7e4
 2012-09-16 12:39:06 -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
Jim Miller
04b28d518c am b45965f5: Merge "Fix keyguard timeout dialog messages" into jb-mr1-dev 
* commit 'b45965f519d41f138f0d0edfb587e4861e2199f4':
  Fix keyguard timeout dialog messages
 2012-09-16 12:00:01 -07:00
Jim Miller
b45965f519 Merge "Fix keyguard timeout dialog messages" into jb-mr1-dev 2012-09-16 11:57:23 -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
7db4eec595 Merge "Squish!" into jb-mr1-dev 2012-09-16 11:52:31 -07:00
Craig Mautner
a5db12ae6d am a91f9e29: Make more items per-Display. 
* commit 'a91f9e2959ee905f97977a88fe45bde6ffb874b0':
  Make more items per-Display.
 2012-09-16 10:48:11 -07:00
Craig Mautner
a91f9e2959 Make more items per-Display. 
Moving DimSurfaces, DimBackgrounds and Rotation surfaces into
per-display class.

Fixes bug 7167028.

Change-Id: I7408b3a27b5a7a8d0d59e9d6109c002fc627e536
 2012-09-16 10:44:06 -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
953005125c am 398bad04: Merge "Fix debug log." into jb-mr1-dev 
* commit '398bad04a0ced9dacda185db8af7526002631f62':
  Fix debug log.
 2012-09-16 00:05:46 -07:00
Dianne Hackborn
398bad04a0 Merge "Fix debug log." into jb-mr1-dev 2012-09-16 00:03:39 -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
Jeff Sharkey
7fe049f779 am ee100445: Updating public API. 
* commit 'ee100445b7c1f8789d1c8ff7d4ae2d28656657db':
  Updating public API.
 2012-09-15 16:12:19 -07:00
Jeff Sharkey
176a014788 am b3571a6c: Merge "Fix build" into jb-mr1-dev 
* commit 'b3571a6ca8877181695ddbd916c2be73625e5a99':
  Fix build
 2012-09-15 16:12:16 -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
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
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
Jeff Sharkey
ee100445b7 Updating public API. 
Change-Id: I7b549af9af5cee21600fb356a411794320e84c56
 2012-09-14 21:57:38 -07:00
Jeff Sharkey
b3571a6ca8 Merge "Fix build" into jb-mr1-dev 2012-09-14 21:16:03 -07:00
Christopher Tate
5f9c4c475f Fix build 
(Deprecation changes are considered API changes.  I knew that.)

Change-Id: I58da073875efc77b833fa55ce15541fd48c5d335
 2012-09-14 21:15:29 -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