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

85131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eino-Ville Talvala
b181909eef Merge "Camera: Document face detection confidence recommendations." into jb-mr1-dev 2012-09-17 08:37:44 -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
Irfan Sheriff
5e2f5fbccd am 89c82814: Merge "Add restoreCallingIdentity under finally" into jb-mr1-dev 
* commit '89c82814dbdfd807b1611a8379be0421cd2f512d':
  Add restoreCallingIdentity under finally
 2012-09-16 18:56:07 -07:00
Irfan Sheriff
89c82814db Merge "Add restoreCallingIdentity under finally" into jb-mr1-dev 2012-09-16 18:53:25 -07:00
Dianne Hackborn
2fba16d19d am 8406d05b: Merge "New uninstall option to uninstall for all users." into jb-mr1-dev 
* commit '8406d05b0fa368f62cda0c0d2b41295f6ac11dc6':
  New uninstall option to uninstall for all users.
 2012-09-16 18:32:00 -07:00
Dianne Hackborn
8406d05b0f Merge "New uninstall option to uninstall for all users." into jb-mr1-dev 2012-09-16 18:29:58 -07:00
Dianne Hackborn
6d235d8265 New uninstall option to uninstall for all users. 
Change-Id: Ie8eb59564078069633a89fc8a92d4f8531baa1aa
 2012-09-16 18:25:40 -07:00
Dianne Hackborn
eb1b5e2f1c am 443e4748: Merge "Fix issue #7175553: GRANT_URI_PERMISSION doesn\'t apper to work on secondary user" into jb-mr1-dev 
* commit '443e474881e2b8d2fce0d23c54f8930742d8cdee':
  Fix issue #7175553: GRANT_URI_PERMISSION doesn't apper to work on secondary user
 2012-09-16 18:13:33 -07:00
Irfan Sheriff
d2839e64ad am db831da4: Fix permission accessing getCurrentUser 
* commit 'db831da426602f36e4ccf2eae64e999fcc52736a':
  Fix permission accessing getCurrentUser
 2012-09-16 18:13:30 -07:00
Dianne Hackborn
443e474881 Merge "Fix issue #7175553: GRANT_URI_PERMISSION doesn't apper to work on secondary user" into jb-mr1-dev 2012-09-16 18:07:14 -07:00
Irfan Sheriff
3d33a63391 Add restoreCallingIdentity under finally 
Change-Id: I068b1a2fc93300aa9bd17da6933bc8c5f0a6b5e4
 2012-09-16 17:59:13 -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
Irfan Sheriff
db831da426 Fix permission accessing getCurrentUser 
Bug: 7174737
Change-Id: I0a6a9a46f4115743d16ada401cd67e3cf30fb380
 2012-09-16 17:40:59 -07:00
Irfan Sheriff
f4dd0fb23c am 61e8180b: Merge "Fix suspend settings at boot" into jb-mr1-dev 
* commit '61e8180b09a6d64fdb93c867217a97f8084753f1':
  Fix suspend settings at boot
 2012-09-16 17:21:52 -07:00
Irfan Sheriff
61e8180b09 Merge "Fix suspend settings at boot" into jb-mr1-dev 2012-09-16 17:19:21 -07:00
Dianne Hackborn
11f0cb7d07 Fix issue #7175553: GRANT_URI_PERMISSION doesn't apper to work on secondary user 
Change-Id: I0ab372978f8599d0fe8d5da8aeb73965ab85797f
 2012-09-16 17:12:34 -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
Irfan Sheriff
1c045ec2b7 Fix suspend settings at boot 
Bug: 7175460
Change-Id: Ibf5e063603866289b3dbae278bc384b833e4a75e
 2012-09-16 17:04:48 -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
Kenny Root
6d80a5dffb am a40b2b34: Merge "Add test for failed dexopt" into jb-mr1-dev 
* commit 'a40b2b3457e233d5f601260761d1f39e894eb384':
  Add test for failed dexopt
 2012-09-16 16:38:34 -07:00
Kenny Root
a40b2b3457 Merge "Add test for failed dexopt" into jb-mr1-dev 2012-09-16 16:35:57 -07:00
rich cannings
f8f28e8735 am 97e7c59c: Merge "Enable package verification" into jb-mr1-dev 
* commit '97e7c59c5f669f4af8a77aee4646933108dfff48':
  Enable package verification
 2012-09-16 16:32:49 -07:00
rich cannings
97e7c59c5f Merge "Enable package verification" into jb-mr1-dev 2012-09-16 16:30:25 -07:00
Iliyan Malchev
6e7650719e am 86e85efe: Merge "Set backlight brightness in correct order." into jb-mr1-dev 
* commit '86e85efe9b10abb2dd60df7ab81db6fc71fdda34':
  Set backlight brightness in correct order.
 2012-09-16 16:29:08 -07:00
Iliyan Malchev
86e85efe9b Merge "Set backlight brightness in correct order." into jb-mr1-dev 2012-09-16 16:27:47 -07:00
Kenny Root
e15bdc2da4 Add test for failed dexopt 
Bug: 7010829
Change-Id: Ie0616ff2c3739ad73733857de6d04243b2be2fca
 2012-09-16 16:25:51 -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
rich cannings
36c67c236e Enable package verification 
Turn on package verification, if a verifier exists. Play app is a verifier.

Bug: 7064853
Change-Id: Id7d478a216d10b0a612678d6a9b0ee7f2037204a
 2012-09-16 16:20:23 -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
Jeff Brown
735f740fe8 Set backlight brightness in correct order. 
Disable backlight before turning off the screen.
Enable backlight after turning on the screen.

Bug: 7016215
Change-Id: Idb763f85f7a40e852483c57e0a0d1b27eb943f08
 2012-09-16 16:15:38 -07:00
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
Jim Miller
e23ab8b1ac Selectively enable back button in keyguard for security screens. 
This enables the back button on secure keyguard screens so the user can
get back to the initial screen.

Partial fix for bug 7094419

Change-Id: I4dc0ac8facfd2930ccb60710c36015ec1d2c8aa6
 2012-09-16 15:50:37 -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
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