Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
192,165 Commits 3 Branches 0 Tags
e0570201f59342ef02412ece2f179ef42441a032
Commit Graph

192165 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
e0570201f5 Lock top task if whitelisting arrives after start. 
If the DevicePolicyManagerService updates the whitelist after a task
in the whitelist has started then the task won't have started locked.

When the updated whitelist arrives this change automatically locks the
topmost task if it is in the whitelist.

Also more locktask debugging.

Fixes bug 21031298.

Change-Id: I2494af6f2819ca91bc01abc5decb3d1adc088226
 2015-05-14 12:54:23 -07:00
Yorke Lee
0125d76fa3 Merge "Make Conferenceable an abstract class" into mnc-dev 2015-05-14 17:32:45 +00:00
Andrei Stingaceanu
d674f2308a Merge "Editor: enable double tap for selection after cut/copy." into mnc-dev 2015-05-14 17:21:11 +00:00
Clara Bayarri
fdf9f40cb8 Merge "PhoneWindow ActionMode handling tests" into mnc-dev 2015-05-14 16:44:48 +00:00
Alan Viverette
8d0cf8bc45 Merge "Add example for detectResourceMismatches()" into mnc-dev 2015-05-14 16:39:20 +00:00
Daniel Sandler
9cb90cbbf8 Merge "Revert "Icon support comes to Notification."" into mnc-dev 2015-05-14 16:34:53 +00:00
Daniel Sandler
09e51a739f Revert "Icon support comes to Notification." 
This reverts commit 08a04c1524.
This also reverts commit 5bcbf857d1.

Change-Id: Ia0b0a5339d523581c877822a3a1feec97ae4b73d
 2015-05-14 12:23:24 -04:00
Joe Fernandez
dfdbc3a891 am a90cb675: am a0f0b5bf: am 574690b1: Merge "docs: Add weekly subscriptions and grace period information to IAB docs" into lmp-mr1-ub-docs 
* commit 'a90cb675a53ebf9a749bcaefc19ba00c8cbf7570':
  docs: Add weekly subscriptions and grace period information to IAB docs
 2015-05-14 16:05:33 +00:00
Paul McLean
f799491fb4 Merge "New policy for internal and wired device names." into mnc-dev 2015-05-14 15:59:38 +00:00
Paul McLean
fc56b88ac4 Merge "Add manufacturer-provided device name for AudioPort name field for BT devices. Change "a2dp-device" to empty string for EnumAPI." into mnc-dev 2015-05-14 15:59:20 +00:00
Joe Fernandez
a90cb675a5 am a0f0b5bf: am 574690b1: Merge "docs: Add weekly subscriptions and grace period information to IAB docs" into lmp-mr1-ub-docs 
* commit 'a0f0b5bfd8df9e0caa6848bc479f1ed3dc492efc':
  docs: Add weekly subscriptions and grace period information to IAB docs
 2015-05-14 15:53:44 +00:00
Chris Craik
30bc0b9ebb Merge "Add tracing for path texture upload" into mnc-dev 2015-05-14 15:53:18 +00:00
Alex Klyubin
a1fb2cf6a6 Merge "Move Android Keystore impl to android.security.keystore." into mnc-dev 2015-05-14 15:51:01 +00:00
Joe Fernandez
a0f0b5bfd8 am 574690b1: Merge "docs: Add weekly subscriptions and grace period information to IAB docs" into lmp-mr1-ub-docs 
* commit '574690b13c8f0d4835c6d86b8e26fc4c9b914037':
  docs: Add weekly subscriptions and grace period information to IAB docs
 2015-05-14 15:40:38 +00:00
Clara Bayarri
18cc17a28d PhoneWindow ActionMode handling tests 
Tests focusing on action mode creation, how the two types of
modes are handled together and how the lifecycle is handled.

Change-Id: I17fe7a83cba4651b295a8ce80bc449f2f2538048
 2015-05-14 16:32:32 +01:00
Michael Wright
1b2e5c11b6 Merge "Revert "Revert "Add new MotionEvent actions for button press and release.""" into mnc-dev 2015-05-14 15:31:14 +00:00
Joe Fernandez
574690b13c Merge "docs: Add weekly subscriptions and grace period information to IAB docs" into lmp-mr1-ub-docs 2015-05-14 15:26:37 +00:00
Zoltan Szatmary-Ban
39b8c69a23 Merge "Rename NetworkUsageStats -> NetworkStats" into mnc-dev 2015-05-14 15:13:34 +00:00
Andrei Stingaceanu
fae270c108 Editor: enable double tap for selection after cut/copy. 
* detect double tap in the TextView and pass it to Editor.
* add a timer (with getDoubleTapTimeout) for executing the
  single tap job in Editor.
* if double tap is detected then cancel the single tap job.

This way one tap shows the toolbar if within the timeframe
and two taps select the word and show the toolbar.

Bug: 20442587
Change-Id: I0a117939c896fcb13669346e30c9c48d319576dd
 2015-05-14 16:11:07 +01:00
Dan Sandler
5bcbf857d1 Merge "Fix icon-related crash." into mnc-dev 2015-05-14 15:10:03 +00:00
Lorenzo Colitti
9e2d14beb3 Merge "Don't display the "no Internet access" prompt on captive portals." into mnc-dev 2015-05-14 15:07:10 +00:00
Xiyuan Xia
09e8303fd8 Merge "Clear security message on user input" into mnc-dev 2015-05-14 15:05:54 +00:00
John Reck
a0f6b87bbb am 570b2052: (-s ours) DO NOT MERGE resolved conflicts for merge of 951f2347 to lmp-mr1-ub-dev 
* commit '570b2052bb8eec8c510941b0a6d77262df28b922':
  Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
 2015-05-14 14:51:06 +00:00
Lorenzo Colitti
d49159f4e9 Don't display the "no Internet access" prompt on captive portals. 
Bug: 20081183
Bug: 21066461
Change-Id: Idc71844a604f9ca655411c6916de256780ea4586
 2015-05-14 23:46:16 +09:00
John Reck
570b2052bb DO NOT MERGE resolved conflicts for merge of 951f2347 to lmp-mr1-ub-dev 
Change-Id: Ic392bf6f2cf9e9bf526b6ea63a3be7e50420e7d1
 2015-05-14 07:38:11 -07:00
Andrei Stingaceanu
fa660f79e9 Merge "Fix: text selection bubbles move along with the text" into mnc-dev 2015-05-14 14:27:18 +00:00
Rubin Xu
6e1c17a3df Merge "clear caller identify before sending system update notification" into mnc-dev 2015-05-14 14:00:18 +00:00
Dan Sandler
98b0290bbe Fix icon-related crash. 
Bug: 21144636
Change-Id: Ib686e9a9a18ac6b9f1e249bcde74be9212e0f53b
 2015-05-14 09:53:31 -04:00
Michael Wright
5bd69e6e61 Revert "Revert "Add new MotionEvent actions for button press and release."" 
This reverts commit 9623805162.
 2015-05-14 14:48:08 +01:00
Michael Wright
3d52869834 Merge "Revert "Add new MotionEvent actions for button press and release."" into mnc-dev 2015-05-14 13:47:10 +00:00
Michael Wright
9623805162 Revert "Add new MotionEvent actions for button press and release." 
This reverts commit ec0ce51b73.
 2015-05-14 14:46:25 +01:00
Michael Wright
07b83f1c9e Merge "Add new MotionEvent actions for button press and release." into mnc-dev 2015-05-14 13:31:29 +00:00
Andrei Stingaceanu
35c550c854 Fix: text selection bubbles move along with the text 
Always hide the selection cursor when showing the
insertion cursor.

Bug: 19857679
Change-Id: I549552fa5026e60f94900364b8194217e0de4b4a
 2015-05-14 14:30:18 +01:00
Michael Wright
ec0ce51b73 Add new MotionEvent actions for button press and release. 
Introduce ACTION_BUTTON_PRESS and ACTION_BUTTON_RELEASE as actions to
signal a button press or release. If these actions happen
simulanteously with a DOWN or UP event then they're explicitly
ordered to happen after the DOWN or preceding the UP in order to send
them to the most recently targeted view.

Also, introduce new stylus button constants that differ from the
constants we use for mouse buttons.

Bug: 20704355
Change-Id: I5b75e5c5e692171c1c117ee687dd185a0d9dd15c
 2015-05-14 14:18:05 +01:00
Rubin Xu
2c84cc2ea2 clear caller identify before sending system update notification 
Because DeviceAdminReceiver is protected by BIND_DEVICE_ADMIN permission,
in order to send broadcast to it, we need to clear the caller's identity
and call sendBroadcastAsUser() as system.

Bug: 20213644
Change-Id: Icc7b239b9005e286012ade6580ec92a0a57198e0
 2015-05-14 13:48:35 +01:00
Wojciech Staszkiewicz
be752b1f28 Merge "Pass charset to XmlPullParser.setInput instead of null" into mnc-dev 2015-05-14 10:27:24 +00:00
Andrei Stingaceanu
c398adf81c Merge "Fix floating toolbar popping frequently after Replace/Copy" into mnc-dev 2015-05-14 10:23:09 +00:00
Narayan Kamath
e738bb6722 Merge "Fix build." into mnc-dev 2015-05-14 09:34:10 +00:00
Andrei Stingaceanu
78e2f07e81 Merge "Fix: replace terminates extract mode (floating toolbar)" into mnc-dev 2015-05-14 09:33:58 +00:00
Chris Banes
18ee0524f0 Merge "Fix build; doc link in ImageView" into mnc-dev 2015-05-14 09:32:40 +00:00
Clara Bayarri
e094b2aff0 Merge "Tests for WindowDecorActionBar's startActionMode implementation" into mnc-dev 2015-05-14 09:28:46 +00:00
Narayan Kamath
4bbe01818c Fix build. 
Broken @link tag in javadoc.

Change-Id: I1452d858eb46c9184903a0110ae645e949db4230
 2015-05-14 10:27:41 +01:00
Clara Bayarri
2c7b461077 Tests for WindowDecorActionBar's startActionMode implementation 
Change-Id: Ib7a79f3987fd565aabf4c5b093186ec669131522
 2015-05-14 10:26:39 +01:00
Clara Bayarri
bff329b851 Merge "Tests for ActionBarContainer's startActionModeForChild" into mnc-dev 2015-05-14 09:25:27 +00:00
Clara Bayarri
e9b17ec0fd Tests for ActionBarContainer's startActionModeForChild 
Change-Id: Ida782cb72f26689ec49a6674dcaeee7d2fb196d3
 2015-05-14 10:24:41 +01:00
Wojciech Staszkiewicz
9e9e2e73c6 Pass charset to XmlPullParser.setInput instead of null 
Passing null to XmlPullParser.setInput forces it to do additional
work, which can be easily avoided if we know the charset beforehand.

bug: b/20849543

Change-Id: Iaff97be9df2d0f99d7af8f19f65934439c9658e2
 2015-05-14 10:24:34 +01:00
Chris Banes
e695bb8a28 Fix build; doc link in ImageView 
Change-Id: Ie3057fc2b920f71ff89eee0d3577d21d0e9930c3
 2015-05-14 10:12:20 +01:00
Geoff Mendal
e9db8f8fe7 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-14 08:58:51 +00:00
Geoff Mendal
b065a1365a Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-14 08:58:23 +00:00
Geoff Mendal
027d5126f2 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-14 08:57:56 +00:00