Commit Graph

3790 Commits

Author SHA1 Message Date
Craig Mautner
61cc1b632a Merge "Steady improvement to multi stack." 2013-04-17 22:35:02 +00:00
Adam Cohen
c283277551 am f4865efe: am be8bc839: Merge "DO NOT MERGE Stripping some new widget API that is yet unused" into jb-mr2-dev
* commit 'f4865efe603e795bc037f5df468556140165eea2':
  DO NOT MERGE Stripping some new widget API that is yet unused
2013-04-17 14:23:01 -07:00
Adam Cohen
be8bc8392e Merge "DO NOT MERGE Stripping some new widget API that is yet unused" into jb-mr2-dev 2013-04-17 21:03:43 +00:00
Craig Mautner
29219d963d Steady improvement to multi stack.
- Fix back button behavior with two stacks. Stopping activities were
held in that state indefinitely. This change causes IDLE_NOW_MSG to
be sent immediately for the last activity in a stack.

- Touch in non-focused stack was being ignored because of focus tests
in AbsListView.

- Change the focused stack when the activity focus changes. Renamed
mMainStack to mFocusedStack to reflect this.

- Resume all top stack activities when resuming.

- Assign intent task to ActivityRecord if it doesn't have a task.
Fixes bug 8433463.

Change-Id: I8d3c806234511697bc209ab99890730ffa514d20
2013-04-17 13:54:48 -07:00
Adam Cohen
33f3aab220 DO NOT MERGE Stripping some new widget API that is yet unused
Change-Id: I7a7156f30aa9105461908f66426950d13eb01408
2013-04-17 13:48:45 -07:00
Philip Milne
d05849e887 am a1ea8019: am 61527436: Merge "Fix for bug 8272673: GridLayout in battery details is cut off." into jb-mr2-dev
* commit 'a1ea801956c4727656ef25177b1bb4c5b788cde7':
  Fix for bug 8272673: GridLayout in battery details is cut off.
2013-04-16 18:02:28 -07:00
Philip Milne
61527436b7 Merge "Fix for bug 8272673: GridLayout in battery details is cut off." into jb-mr2-dev 2013-04-17 00:56:55 +00:00
Philip Milne
e0b85cd706 Fix for bug 8272673: GridLayout in battery details is cut off.
Change-Id: Iabcc2d2c486162cf88990eb1a25aca2e7558a57c
2013-04-16 16:33:44 -07:00
Fabrice Di Meglio
0c6d1ba9db am fa681f12: am 09d0ee26: Merge "Fix bug #8629386 FastScroller is on the wrong side when switching to Hebrew in a RTL enabled app" into jb-mr2-dev
* commit 'fa681f12ec645eaf2831e75abdd32c9987d6afa0':
  Fix bug #8629386 FastScroller is on the wrong side when switching to Hebrew in a RTL enabled app
2013-04-16 16:23:44 -07:00
Fabrice Di Meglio
3a1f1e5bea Fix bug #8629386 FastScroller is on the wrong side when switching to Hebrew in a RTL enabled app
- in AbsListView, force setScrollbarPosition() when RTL properties change
- in FastScroller, invalidate the correct rectangle when in RTL mode and in STATE_EXIT

Change-Id: Ie9fe4f826e179eb993e443d10e171b9dda3b6f3f
2013-04-16 15:40:18 -07:00
Chet Haase
1d9648df51 am d04215c4: am 0a41431d: Merge "API and doc cleanup, plus small animation/UI features" into jb-mr2-dev
* commit 'd04215c440e7b7f4bbfe8aaa9a47ccdf3a8dacf5':
  API and doc cleanup, plus small animation/UI features
2013-04-12 15:26:55 -07:00
Chet Haase
0a41431d69 Merge "API and doc cleanup, plus small animation/UI features" into jb-mr2-dev 2013-04-12 22:18:24 +00:00
Chet Haase
430742f090 API and doc cleanup, plus small animation/UI features
Adding features which round out the animation APIs (missing
getters, etc.). Also fix doc typos.

Issue #8350510 Add APIs needed for future animation capabilities

Change-Id: I063736848ba26e6d6c809b15fc3a103c74222f46
2013-04-12 13:44:22 -07:00
Raph Levien
c1f5756c23 am 1aa52487: am 6c072401: Merge "Fix for bug 8500202: Right-to-left text not showing in list view" into jb-mr2-dev
* commit '1aa524878591dce809000e7263378138ccd6a25a':
  Fix for bug 8500202: Right-to-left text not showing in list view
2013-04-12 13:15:37 -07:00
Raph Levien
6c0724010f Merge "Fix for bug 8500202: Right-to-left text not showing in list view" into jb-mr2-dev 2013-04-12 20:08:33 +00:00
Raph Levien
f5cf6c9d44 Fix for bug 8500202: Right-to-left text not showing in list view
In single line mode, changing the text from LTR to RTL (or vice versa)
affects the alignment, which in turn means that bringTextIntoView is
needed to update the scrolling. A registerForPredraw should be done to
make this happen, but it was missing. This patch tests explicitly for
direction changes in this case, and schedules a predraw if so.

Change-Id: I16e0e23141c244dc8adc00ea8306dfe4c9bf487d
2013-04-12 11:42:25 -07:00
Adam Powell
96694ee264 am 4348fcdd: am 8d06cc6d: Merge "Permit null adapters in Spinners" into jb-mr2-dev
* commit '4348fcdddac18b6833f04f8548573a1e033c05d1':
  Permit null adapters in Spinners
2013-04-10 15:27:02 -07:00
Adam Powell
72d574cbe0 Permit null adapters in Spinners
Bug 8538144

Change-Id: I83f0ae78ce15f46827fb721cd0df1972b7d9d198
2013-04-10 11:27:08 -07:00
Adam Powell
dc614479fe am a26ec11a: am 1e1ccfb8: Merge "Fix a monkey bug with AbsListView data set observers" into jb-mr2-dev
* commit 'a26ec11a1e5e95bd7704be59d75145ba48d1ee6d':
  Fix a monkey bug with AbsListView data set observers
2013-04-09 18:58:06 -07:00
Adam Powell
bd1dd0d51a Fix a monkey bug with AbsListView data set observers
Several conditions can cause an AbsListView's data set observer to be
removed and nulled out. If for some reason the view receives duplicate
onDetachedFromWindow events this could cause AbsListView to attempt to
unregister a null observer. Skip this unregister process if this
happens.

Bug 7088152

Change-Id: Ib0c630d1ee598640512023e4ef158f01e3ed474d
2013-04-09 17:46:15 -07:00
Michael Wright
f4bb4a2e7d am b74df06f: am 605994d6: Merge "Fix off by one in ListView\'s upward focus traversal" into jb-mr2-dev
* commit 'b74df06f9c8a7b691fae6e29c1e7c4486168ad8f':
  Fix off by one in ListView's upward focus traversal
2013-04-08 17:05:44 -07:00
Michael Wright
b482a001f1 Fix off by one in ListView's upward focus traversal
Bug: 7985315
Change-Id: Ic67c8e346d6b51a5cfb05cc7d0c2b145b591b2db
2013-04-08 14:40:12 -07:00
Nick Kralevich
9babf58c30 am c2fba075: am 8e181c56: Merge "AppSecurityPermissions: minor UI changes" into jb-mr2-dev
* commit 'c2fba0750df431bb44a6873f04aac2d3e8e75de3':
  AppSecurityPermissions: minor UI changes
2013-04-08 13:17:24 -07:00
Nick Kralevich
8e181c56b3 Merge "AppSecurityPermissions: minor UI changes" into jb-mr2-dev 2013-04-08 20:08:59 +00:00
Romain Guy
50dde857ed am 0899f11d: am dcaa9436: Merge "Always take padding and margins into account Bug #8565842" into jb-mr2-dev
* commit '0899f11db1f10b1ac664cb4bb62b829ea464cac8':
  Always take padding and margins into account Bug #8565842
2013-04-08 13:04:41 -07:00
Romain Guy
76d59a3b7b Always take padding and margins into account
Bug #8565842

Change-Id: I8ee398b5c36b3011950265eb7e22cc8338f1aeee
2013-04-08 12:56:15 -07:00
Nick Kralevich
98cbcf1b50 AppSecurityPermissions: minor UI changes
1) Make the box with the permission really go away when a
permission is revoked, not just invisible.
2) Change the order of the buttons, making the negative
button the "revoke" button, and the positive button "ok".

Change-Id: I73694583cbd014d3820f8df6c6b770caae299499
2013-04-08 10:02:08 -07:00
Nick Kralevich
1a0a2c8e77 am b21b2c38: am a56b78dc: fix build
* commit 'b21b2c38e54b655a06aeb2d810438c7bd2413637':
  fix build
2013-04-07 11:20:56 -07:00
Nick Kralevich
a56b78dcd1 fix build
Change-Id: I7f3b8a4df84630f40f5a3f19434df86b6287fb75
2013-04-07 11:13:16 -07:00
Nick Kralevich
e4037e4fa4 am 16843d84: am d7c4186a: Merge "AppSecurityPermissions: add support for revoking permissions" into jb-mr2-dev
* commit '16843d84889ec4904b3ddef5d2f131efebfc433c':
  AppSecurityPermissions: add support for revoking permissions
2013-04-07 11:02:32 -07:00
Nick Kralevich
ddfbe00b66 AppSecurityPermissions: add support for revoking permissions
Add UI support for revoking optional permissions. When the user
taps on an optional permission, two new boxes will appear:

  [Cancel] | [Revoke]

Selecting [Revoke] will revoke the permission from the app.

The [Cancel] / [Revoke] options are only shown for apps which support
optional permissions.

Bug: 8332307
Change-Id: I27e374773747737e3a6d7f48ea1448a0178e3393
2013-04-05 18:42:03 -07:00
kmccormick
c9728cfa2a am 22da6f04: am e10b600d: am 984f94ee: am f29ca256: am 57b73b4a: am 72da7af6: am b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs
* commit '22da6f04b33173be9e6aacabc29869998395d271':
  Doc update: unterminated code tags
2013-04-03 18:14:08 -07:00
kmccormick
e10b600d5d am 984f94ee: am f29ca256: am 57b73b4a: am 72da7af6: am b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs
* commit '984f94ee4c4ef0196d9b2c149d0a42f20b72bebf':
  Doc update: unterminated code tags
2013-04-03 18:06:40 -07:00
kmccormick
984f94ee4c am f29ca256: am 57b73b4a: am 72da7af6: am b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs
* commit 'f29ca256a4340a3d550d2c4a39a2e6a29a3ce850':
  Doc update: unterminated code tags
2013-04-03 18:03:00 -07:00
kmccormick
f29ca256a4 am 57b73b4a: am 72da7af6: am b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs
* commit '57b73b4a1d6ea84ae42c407ecb258829ab8dfa2c':
  Doc update: unterminated code tags
2013-04-03 18:00:11 -07:00
kmccormick
43d5abbf03 Doc update: unterminated code tags
"Bug: 7250069"

Change-Id: I4c3eca8eacad6d0aced9f38788726ba95b914d5d
2013-04-03 17:43:44 -07:00
Jeff Sharkey
5c1994eeff am 04e740a6: am 0f8e8b03: Merge "Warn when exposing file:// Uris beyond a process." into jb-mr2-dev
* commit '04e740a65e2399c4a4b211408bd84f2d545d9f4a':
  Warn when exposing file:// Uris beyond a process.
2013-04-03 16:33:52 -07:00
Jeff Sharkey
a14acd20b8 Warn when exposing file:// Uris beyond a process.
Check for file:// Uris inside Intents, ClipData, Notifications and
RemoteViews when StrictMode option is enabled.

Also introduces Intent.prepareToLeaveProcess() to uniformly handle
Intents about to leave an app process.

Bug: 8529070
Change-Id: I8efb43877cbc5f21eb029fc6492b3ee1415059ef
2013-04-03 11:45:44 -07:00
Nick Kralevich
1c63fd4a94 am 7306da90: am 4b254881: Merge "AppSecurityPermissions: Add isGranted to isDisplayablePermission" into jb-mr2-dev
* commit '7306da907563953dda5a032fc5c11ad3e1f1a9de':
  AppSecurityPermissions: Add isGranted to isDisplayablePermission
2013-03-27 09:24:33 -07:00
Nick Kralevich
4b2548815d Merge "AppSecurityPermissions: Add isGranted to isDisplayablePermission" into jb-mr2-dev 2013-03-27 16:20:26 +00:00
Fabrice Di Meglio
9a8c46f64e am fc7a1020: am a803b094: Merge "Fix bug #8480245 ViewGroup layout margins can be wrong in RTL mode" into jb-mr2-dev
* commit 'fc7a1020716d86204e7190b899a2e30fba4e9055':
  Fix bug #8480245 ViewGroup layout margins can be wrong in RTL mode
2013-03-26 17:51:06 -07:00
Fabrice Di Meglio
0072f64939 Fix bug #8480245 ViewGroup layout margins can be wrong in RTL mode
- fix resolution of MarginLayoutParams
- update related RelativeLayout code

Change-Id: I261f127a8897f60d316fed2a73e6e76020e542cc
2013-03-26 17:27:33 -07:00
Nick Kralevich
7a8c135177 AppSecurityPermissions: Add isGranted to isDisplayablePermission
Modify isDisplayablePermission to display a permission if the
app update will grant a new optional permission to the app.

Change-Id: Ic647826b0c48f9f7ec8e4f69b90197211f83278d
2013-03-26 17:18:32 -07:00
Fabrice Di Meglio
07eb51ece0 am 47479a55: am 04c710ad: Merge "Fix bug #8200928 ExpandableListView should be RTL-aware" into jb-mr2-dev
* commit '47479a55562bb3ffc8927ab4a62de73948b1bac1':
  Fix bug #8200928 ExpandableListView should be RTL-aware
2013-03-26 00:33:26 +00:00
Fabrice Di Meglio
04c710ad9d Merge "Fix bug #8200928 ExpandableListView should be RTL-aware" into jb-mr2-dev 2013-03-26 00:27:22 +00:00
Nick Kralevich
2e3ead4b8c am 2e53c2a8: am c1905339: Merge "AppSecurityPermissions: Modify isDisplayablePermission" into jb-mr2-dev
* commit '2e53c2a80bb9e059182a321367aad1d7ab0b19ae':
  AppSecurityPermissions: Modify isDisplayablePermission
2013-03-25 21:37:08 +00:00
Nick Kralevich
22139669ab am 1076e13d: am b07220c8: Merge "Remove dead code." into jb-mr2-dev
* commit '1076e13d8126aa349f68545b7d08a3de0c43c8ea':
  Remove dead code.
2013-03-25 21:32:38 +00:00
Nick Kralevich
a5043ed7ea AppSecurityPermissions: Modify isDisplayablePermission
Add optional permission support to isDisplayablePermission.

A permission is displayable if it's required, or was previously
granted to the app.

Currently, this change is a no-op. The package parser code
does not currently honor <uses-permission android:required="false"> in
the application's manifest, and assumes a permission is always required.

This change sets the ground for future optional permissions work.

Change-Id: I2ec4a49adbfab9980e116ed43354f16bdeaa301d
2013-03-25 14:28:30 -07:00
Nick Kralevich
d6182f993d Remove dead code.
This code is never called.

Change-Id: I2ed3fee93004e967bfb2a3080106c3950bf43ce2
2013-03-25 11:43:19 -07:00
Nick Kralevich
e1242f9980 am 7d2a4b41: am 754aa113: Merge "AppSecurityPermissions: minor code cleanup" into jb-mr2-dev
* commit '7d2a4b41393d3a774a403e29ebdd7eec92777f03':
  AppSecurityPermissions: minor code cleanup
2013-03-25 17:44:41 +00:00