Craig Mautner
5851c6e638
Merge "Convert resized() method to new parameters." into jb-mr1-dev
2012-09-06 15:07:46 -07:00
Chris Craik
a6b5eca796
Merge "Don't trigger log for empty views" into jb-mr1-dev
2012-09-06 15:07:46 -07:00
Craig Mautner
656e3af444
Convert resized() method to new parameters.
...
When the BaseIWindow.resized method got switched from taking (int x,
int y, ...) to taking (Rect, ...) the SurfaceView.MyWindow override
never got updated.
Fixes bug 6992324.
Change-Id: Id0b9625559ae0100336f4573f09d313138c8a6e7
2012-09-06 15:04:22 -07:00
Chris Craik
3667aa364f
Don't trigger log for empty views
...
Change-Id: Idb2193d6dd064e5c4af1f02d0df2a83a7db0e0f8
2012-09-06 14:59:15 -07:00
rich cannings
c862d0fc05
Merge "Add secure setting for package verification" into jb-mr1-dev
2012-09-06 14:55:55 -07:00
Chris Craik
776dafa8fe
Merge "Log if a view fails to fit in the drawing cache" into jb-mr1-dev
2012-09-06 14:49:18 -07:00
Chris Craik
10e9d1d7ad
Log if a view fails to fit in the drawing cache
...
Large software layers won't draw if they're larger than the size of the drawing
cache, in which case this log will be triggered.
bug:7078391
Change-Id: Ib42a060b8e3b3642417df9243a086aa15b2989b1
2012-09-06 14:45:45 -07:00
rich cannings
16e119e798
Add secure setting for package verification
...
Framework changes to store and read a secure setting for package verification.
Default is on/true.
This setting will be turned on/off via the Settings app.
Bug: 7082362
Change-Id: I6f93d3136add8af0dbbdc664f0473c5f5b7e3fee
2012-09-06 14:37:44 -07:00
Adam Cohen
66b9fb1662
Iintial stab at multi-user switcher on Keyguard
...
Change-Id: I604a769ef43c354a8eeadb415e413c19ca02571d
2012-09-06 14:35:56 -07:00
Baligh Uddin
49a7387418
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-09-06 11:47:29 -07:00
Dianne Hackborn
fae0d66275
Merge "Nested fragments." into jb-mr1-dev
2012-09-06 11:41:48 -07:00
Dianne Hackborn
62bea2f171
Nested fragments.
...
Change-Id: I79acc19b391352c16b06afee2ca543223c38e364
2012-09-06 11:05:53 -07:00
Martijn Coenen
32ac1e142c
Fix NPE in NdefRecord parser.
...
Malformed Uri tags could cause this crash.
Bug: 7116323
Change-Id: I979d1512058f351df32dbd972b6ec5c108202da5
2012-09-06 17:13:38 +02:00
Jim Miller
5830cb2882
Cosmetic code changes to face unlock after review.
...
Change-Id: I6e4face14c1585ed7123ae9c055b5ac3ccc86395
2012-09-05 18:54:18 -07:00
Jim Miller
e7376e2c2c
Merge "Initial pass at re-enabling face unlock in new keyguard." into jb-mr1-dev
2012-09-05 16:53:12 -07:00
Jim Miller
000464ac01
Initial pass at re-enabling face unlock in new keyguard.
...
Change-Id: I187629f9c4bfd810f11c73416db6e41b56f09a45
2012-09-05 16:12:26 -07:00
Selim Gurun
18e8768067
Merge "remove defunct javascript interface" into jb-mr1-dev
2012-09-05 15:04:07 -07:00
Jim Miller
27230f076a
Merge "Better flow for SIM PIN/ SIM PUK screens in keyguard." into jb-mr1-dev
2012-09-05 13:45:30 -07:00
Jean-Baptiste Queru
f389f2820c
resolved conflicts for merge of 7749a1c5 to jb-mr1-dev
...
Change-Id: If30a6a4ded996749b34f6a975481a97006cbcf97
2012-09-05 12:21:50 -07:00
Baligh Uddin
18621bd682
Import translations. DO NOT MERGE
...
Change-Id: I49e9d1c98c3f72140527cb978e7ef341f2532ce4
Auto-generated-cl: translation import
2012-09-05 12:17:50 -07:00
Jean-Baptiste Queru
7749a1c5ec
am b4ac801c: am 1ca2fee9: Merge "Make default value of auto-sync in SyncStorageEngine configurable"
...
* commit 'b4ac801c477c0a0de18da89744d9a78e79d2ff51':
Make default value of auto-sync in SyncStorageEngine configurable
2012-09-05 12:12:52 -07:00
Jean-Baptiste Queru
b4ac801c47
am 1ca2fee9: Merge "Make default value of auto-sync in SyncStorageEngine configurable"
...
* commit '1ca2fee9547dbdd7008211ac318b1f8f40ce1e35':
Make default value of auto-sync in SyncStorageEngine configurable
2012-09-05 12:10:44 -07:00
Fabrice Di Meglio
5575e97cea
Merge "Fix bug #7023040 android.widget.cts.TextViewTest#testResetTextAlignment failures" into jb-mr1-dev
2012-09-05 12:03:32 -07:00
Selim Gurun
d773ca8ff2
remove defunct javascript interface
...
Bug: 7073422
The feature that is using search box implementation was removed from
browser after Honeycomb. This is to remove the js interface that
is added for this feature.
Change-Id: I9441d461caf189467e4ad45de958c13b81f4ff17
2012-09-05 11:53:44 -07:00
Jean-Baptiste Queru
1ca2fee954
Merge "Make default value of auto-sync in SyncStorageEngine configurable"
2012-09-05 11:03:13 -07:00
Daniel Sandler
256a1b4dac
Merge "The default notification LED color is now white." into jb-mr1-dev
2012-09-05 05:45:51 -07:00
Brian Muramatsu
580e9f72e0
Merge "Make battery shutdown temperature configurable" into jb-mr1-dev
2012-09-04 22:48:36 -07:00
Mathias Agopian
f87633f38c
Merge "update to new SurfaceComposerClient API" into jb-mr1-dev
2012-09-04 20:30:02 -07:00
Satoshi Kataoka
0d727c714b
Merge "Add subtypeId for keeping enabled "InputMethodSubtype"s even if subtype parameters are changed" into jb-mr1-dev
2012-09-04 20:27:50 -07:00
Mathias Agopian
63f1c43fbe
update to new SurfaceComposerClient API
...
Change-Id: I8f2c96df56fe3a851b8ec03bb8734db0b6bea3d5
2012-09-04 20:23:23 -07:00
Adam Powell
4289b49dd5
am 9f3b0bfd: DO NOT MERGE - Make WebView track focal points more accurately
...
* commit '9f3b0bfd0b1d8876c96036a303b3ff72df0e8ad0':
DO NOT MERGE - Make WebView track focal points more accurately
2012-09-04 19:49:13 -07:00
Adam Powell
52da9fa7b5
am c4ce0da2: DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold
...
* commit 'c4ce0da255df07e3d8a799aa4e9af2f1949ef4f4':
DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold
2012-09-04 19:49:07 -07:00
Fabrice Di Meglio
fa1babd221
Fix bug #7023040 android.widget.cts.TextViewTest#testResetTextAlignment failures
...
- cache the text aligment as we cannot resolve the text alignment during reset of the text direction
Change-Id: I79de625e517bf8bad6313fd5e349f1181b1eaa30
2012-09-04 19:11:25 -07:00
Adam Powell
9f3b0bfd0b
DO NOT MERGE - Make WebView track focal points more accurately
...
Change-Id: I6683edee6933b1dd026453935d72119320ab3c81
2012-09-04 18:33:56 -07:00
Adam Powell
c4ce0da255
DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold
...
Change-Id: I13132ce1d912b54e251f7afed5143c72a2ec2e78
2012-09-04 18:33:42 -07:00
Adam Powell
deeade34cb
Merge "Make WebView track focal points more accurately" into jb-mr1-dev
2012-09-04 18:19:30 -07:00
Adam Powell
adb93889ae
Merge "Delay starting scale gesture events until a touch slop threshold" into jb-mr1-dev
2012-09-04 18:17:10 -07:00
Jim Miller
4b09dd31fb
Better flow for SIM PIN/ SIM PUK screens in keyguard.
...
We now fade between security screens when not coming from selection view.
In the case of SIM PIN/PUK screens, this means we show the user's security
screen without going back to the selector view.
This change also adds a fade animation for when we go between security screens
without going back to the selector view.
This also fixes a bug where we were invoking two checks for the SIM
state - one for ACTION_DOWN and another for ACTION_UP.
Change-Id: I260f9a2e0316cbf26ec7621f774bfdf9956ca488
2012-09-04 16:16:17 -07:00
Jim Miller
175ae55c0d
Merge "Update DevicePolicyManager with ability to disable keyguard widgets" into jb-mr1-dev
2012-09-04 15:20:42 -07:00
Fabrice Di Meglio
035ce2ca92
Merge "Add support for "-rtl" in resources" into jb-mr1-dev
2012-09-04 15:01:03 -07:00
Adam Powell
1027ed2aca
Make WebView track focal points more accurately
...
Change-Id: I6683edee6933b1dd026453935d72119320ab3c81
2012-09-04 14:42:11 -07:00
Adam Powell
47ec2fb370
Delay starting scale gesture events until a touch slop threshold
...
Change-Id: I13132ce1d912b54e251f7afed5143c72a2ec2e78
2012-09-04 14:42:11 -07:00
Brian Muramatsu
f3c74f3499
Make battery shutdown temperature configurable
...
Bug 7079455
Change-Id: I448f21231bf0548ef975f99482576acb24a1a70e
2012-09-04 14:29:15 -07:00
Jim Miller
167611811d
Merge "Keyguard bug fixes" into jb-mr1-dev
2012-09-04 14:16:48 -07:00
Jim Miller
b8ec470617
Update DevicePolicyManager with ability to disable keyguard widgets
...
Change-Id: I5876e9e180b2a995aaa355fbbb2b67cebb86104d
2012-09-04 13:52:36 -07:00
Jean-Baptiste Queru
b788556bfd
am ad17717e: am d3b74b91: am b307ceb4: Merge "SearchWidget: passing APP_DATA to voice intent"
...
* commit 'ad17717e52576a05dffd1b99c06c46a80c149722':
SearchWidget: passing APP_DATA to voice intent
2012-09-04 11:44:00 -07:00
Jean-Baptiste Queru
ad17717e52
am d3b74b91: am b307ceb4: Merge "SearchWidget: passing APP_DATA to voice intent"
...
* commit 'd3b74b9124e713e291053652839a7d725ffb64d9':
SearchWidget: passing APP_DATA to voice intent
2012-09-04 11:41:32 -07:00
Jean-Baptiste Queru
d3b74b9124
am b307ceb4: Merge "SearchWidget: passing APP_DATA to voice intent"
...
* commit 'b307ceb43fa96e8d54851c20278a4344469c9269':
SearchWidget: passing APP_DATA to voice intent
2012-09-04 11:38:28 -07:00
Dianne Hackborn
7d69e8bd21
Merge "Add registering for explicit users." into jb-mr1-dev
2012-09-04 10:40:07 -07:00
Dianne Hackborn
20e809870d
Add registering for explicit users.
...
New API to register as an explicit user, which allows you to
also select ALL to see broadcasts for all users.
New BroadcastReceiver API to find out which user the broadcast
was sent to.
Use this in app widget service to handle per-user package broadcasts
and boot completed broadcasts correctly.
Change-Id: Ibbe28993bd4aa93900c79e412026c27863019eb8
2012-09-04 10:39:21 -07:00