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

5705 Commits

Author SHA1 Message Date
Adam Powell
fea6a7597f am a4b0e559: Merge "Use a larger scaling span for larger screen devices." into jb-mr1-dev 
* commit 'a4b0e5590dc303df68256254f732ef632e6912f3':
  Use a larger scaling span for larger screen devices.
 2012-09-18 10:44:24 -07:00
Adam Powell
a4b0e5590d Merge "Use a larger scaling span for larger screen devices." into jb-mr1-dev 2012-09-18 10:25:00 -07:00
Adam Powell
8b1821979b Use a larger scaling span for larger screen devices. 
Change-Id: I67486e65799c076fc9ac150f67a6be715c2ed4d0
 2012-09-18 10:23:43 -07:00
Irfan Sheriff
196813cf9f am 5bc09e26: Merge "Disable notification scans when p2p is connected" into jb-mr1-dev 
* commit '5bc09e2683202856d2a1ee50c93965895c2e6a2e':
  Disable notification scans when p2p is connected
 2012-09-17 21:03:24 -07:00
Irfan Sheriff
5bc09e2683 Merge "Disable notification scans when p2p is connected" into jb-mr1-dev 2012-09-17 20:58:42 -07:00
Irfan Sheriff
3809f500c3 Disable notification scans when p2p is connected 
Also reduce scan interval for STA scans to one minute.

Bug: 7138968
Change-Id: I03620f6d462e4ec90d9bb25bbfe709f63173df21
 2012-09-17 20:52:23 -07:00
Eric Laurent
a3a58ff13a am 21dfd7c5: Merge "Update headphone volume safety warning message." into jb-mr1-dev 
* commit '21dfd7c5fe9e42d2ef3ac7423065c86dfe8f29da':
  Update headphone volume safety warning message.
 2012-09-17 18:30:54 -07:00
Eric Laurent
21dfd7c5fe Merge "Update headphone volume safety warning message." into jb-mr1-dev 2012-09-17 18:29:27 -07:00
Dianne Hackborn
d2011dcdc4 am c33f94e2: Merge "Fix API review bugs." into jb-mr1-dev 
* commit 'c33f94e2a50c9b03cb771237e8672743da8b1314':
  Fix API review bugs.
 2012-09-17 18:25:00 -07:00
Dianne Hackborn
c33f94e2a5 Merge "Fix API review bugs." into jb-mr1-dev 2012-09-17 18:22:38 -07:00
Dianne Hackborn
8832c18d8b Fix API review bugs. 
7173152 API REVIEW: android.content.pm.PackageUserState
7172969 API REVIEW: android.app.PendingIntent
7172730 API REVIEW: android.content.Context
7172726 API REVIEW: android.manifest.permission

Change-Id: Iad470256d3b5ca5596487f6a699ec1871457c3b5
 2012-09-17 17:27:15 -07:00
Eric Laurent
b6397c7170 Update headphone volume safety warning message. 
Change-Id: Ic2d5d9d247b76b6ede0f90b861c235c1c0f5dc08
 2012-09-17 16:59:19 -07:00
Adam Cohen
be2572af06 am e2f0ec89: Merge "Enabling hardware layers while overscrolling widget pager" into jb-mr1-dev 
* commit 'e2f0ec8923d42b47225225345a960e41dfbb5bd1':
  Enabling hardware layers while overscrolling widget pager
 2012-09-17 14:14:44 -07:00
Adam Cohen
5b50a25e6d Enabling hardware layers while overscrolling widget pager 
Change-Id: I94bef1aa614f91b115105adbb409def8027f3651
 2012-09-17 14:11:14 -07:00
Baligh Uddin
c71a57d6fa Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-17 10:06:21 -07:00
Eric Laurent
1d75bedfbb am 39a37c3b: Merge "headphone volume limitation" into jb-mr1-dev 
* commit '39a37c3bb3d21c119cca536f85c298db805f86cd':
  headphone volume limitation
 2012-09-17 08:18:50 -07:00
Eric Laurent
39a37c3bb3 Merge "headphone volume limitation" into jb-mr1-dev 2012-09-17 08:16:01 -07:00
Eric Laurent
c34dcc1e1e headphone volume limitation 
Limit music volume when headphones or headset are inserted.
Display warning message when user wants to increase the volume
above a platform specific volume and request user acknowledgement
before proceeding.

TODO: exact wording of the warning message must be defined by UX.

Change-Id: I00f429f602534c6d8783126b929371c4d432e6e2
 2012-09-16 17:44:45 -07:00
Adam Powell
abc479b0a3 am fa9fc5bc: Merge "Add a minimum height of 64dp for AlertDialog content" into jb-mr1-dev 
* commit 'fa9fc5bc1525f65bf042f6e30c32a985cd12a04f':
  Add a minimum height of 64dp for AlertDialog content
 2012-09-16 17:11:20 -07:00
Dianne Hackborn
c67bc2672b am b137c806: Merge "More adjustments to permissions." into jb-mr1-dev 
* commit 'b137c8065db941b23ab23f6550a1c65693039ff5':
  More adjustments to permissions.
 2012-09-16 17:11:17 -07:00
Adam Powell
fa9fc5bc15 Merge "Add a minimum height of 64dp for AlertDialog content" into jb-mr1-dev 2012-09-16 17:08:18 -07:00
Adam Powell
489f3451e2 Add a minimum height of 64dp for AlertDialog content 
Bug 7094388

Change-Id: Ia4316c9d9d5971734c8930fcb1c4cd6ae3661a94
 2012-09-16 17:04:20 -07:00
Dianne Hackborn
b137c8065d Merge "More adjustments to permissions." into jb-mr1-dev 2012-09-16 16:42:43 -07:00
Dianne Hackborn
2ca2c87871 More adjustments to permissions. 
- New "cost money" flag can be put on a permission to
  have this emphasized in the UI.
- Some further re-organization of permissions to better
  match UX spec.

Change-Id: I450ac739eff6b90e7c7fc39589d68db82b61f897
 2012-09-16 16:41:27 -07:00
Adam Powell
6b23187103 am 1f13a98c: Merge "Import panel background assets from UX" into jb-mr1-dev 
* commit '1f13a98cf2758211b5525addd098f7788f180d79':
  Import panel background assets from UX
 2012-09-16 16:21:50 -07:00
Adam Powell
1f13a98cf2 Merge "Import panel background assets from UX" into jb-mr1-dev 2012-09-16 16:18:59 -07:00
Adam Powell
2d5b6e8204 Import panel background assets from UX 
Change-Id: I13b890cf24d71fdcfeb329f6cbc276b780f3cb02
 2012-09-16 16:17:40 -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
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
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
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