Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
155,009 Commits 3 Branches 0 Tags
103fc6da2ae97d0ea2d16b314cdede8b459120d8
Commit Graph

44314 Commits

Author SHA1 Message Date
Dake Gu
103fc6da2a am a9d6e6e3: am e3842811: am a45b03f8: Merge "ActivityTransition: fix activity not finished on back" into lmp-dev 
* commit 'a9d6e6e3088e36ba731a801e676045bf65e557a8':
  ActivityTransition: fix activity not finished on back
 2014-09-03 18:04:32 +00:00
Brian Carlstrom
9844fdbd9e am 4421aaf7: am 66ce8faf: am ef3d85a5: Merge "Fix DevicePolicyManager javadoc" into lmp-dev 
* commit '4421aaf7558be72d83d453817f93741f267d5516':
  Fix DevicePolicyManager javadoc
 2014-09-03 17:55:29 +00:00
Chet Haase
0ec25ec781 am a37305ff: am c26fbab0: am c22d9103: Merge "Fix TransitionManager.go() to allow null transitions" into lmp-dev 
* commit 'a37305ff54fe18c2dd43bf407407e061f8c791a9':
  Fix TransitionManager.go() to allow null transitions
 2014-09-03 17:42:55 +00:00
George Mount
613a5f8805 am 3f1f97f9: am 12b7c53c: am 10e15c3a: Merge "Make Fragment Transitions match Acitivty Transitions API" into lmp-dev 
* commit '3f1f97f9cff3ffa28ad00bbeeada7ec70ae5c6bd':
  Make Fragment Transitions match Acitivty Transitions API
 2014-09-03 17:42:12 +00:00
Dake Gu
fa28163129 am e3842811: am a45b03f8: Merge "ActivityTransition: fix activity not finished on back" into lmp-dev 
* commit 'e384281179ad3a71fcb16e071fa4a575b3e7926c':
  ActivityTransition: fix activity not finished on back
 2014-09-03 17:26:00 +00:00
Dake Gu
dd725ec4a7 Merge "ActivityTransition: fix activity not finished on back" into lmp-dev 2014-09-03 17:07:09 +00:00
Brian Carlstrom
a27a0b379d am 66ce8faf: am ef3d85a5: Merge "Fix DevicePolicyManager javadoc" into lmp-dev 
* commit '66ce8faf4cefa5bc9b240c748b60f5eb287f0852':
  Fix DevicePolicyManager javadoc
 2014-09-03 16:28:40 +00:00
Brian Carlstrom
f1fe51b914 Fix DevicePolicyManager javadoc 
Bug: 17126717
Change-Id: Ib1d83a0e2003296ec1e17fa7c43e32c55b044df3
 2014-09-03 09:00:06 -07:00
Chet Haase
688f9161d0 am c26fbab0: am c22d9103: Merge "Fix TransitionManager.go() to allow null transitions" into lmp-dev 
* commit 'c26fbab03aa7a38ce6310ca01d6f880df62dd0bf':
  Fix TransitionManager.go() to allow null transitions
 2014-09-03 15:43:03 +00:00
Christoph Studer
eaae6de994 am a8c199d8: am 5df1917f: am 342ece75: Merge "NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT" into lmp-dev 
* commit 'a8c199d8fa51d431d047be231a650e8142239ee1':
  NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT
 2014-09-03 15:35:54 +00:00
Sander Alewijnse
e3a406ee1e am b41ea75b: am a0e6069c: am 727738ad: Merge "Add the provisioning extra admin extras bundle." into lmp-dev 
* commit 'b41ea75b7dff212e89682e07ee80224ea831e499':
  Add the provisioning extra admin extras bundle.
 2014-09-03 15:35:49 +00:00
Yohei Yukawa
e86e1bcd65 am 1831e14c: am d88a1f97: am ebb6b422: Merge "API Review: InputConnection" into lmp-dev 
* commit '1831e14ce41e911d32328a87400a90b42ecd3238':
  API Review: InputConnection
 2014-09-03 15:35:43 +00:00
Lorenzo Colitti
160e7e25b9 am 967c87e6: am 703c2eb9: am 1ae4e750: Merge "Kill the NetworkInfo(int type) constructor. IT\'S A TRAP!" into lmp-dev 
* commit '967c87e6e38a673d57e9dd293201f4a1ba1f3b46':
  Kill the NetworkInfo(int type) constructor. IT'S A TRAP!
 2014-09-03 15:35:27 +00:00
Svetoslav
d3fd195a02 am 14aa5b1a: am a7a98dc6: am 551335a3: Merge "Fix AccessibilityNode\'s isVisibleToUser behavior." into lmp-dev 
* commit '14aa5b1a651ebf9b824b8f1614d72cb581f91af1':
  Fix AccessibilityNode's isVisibleToUser behavior.
 2014-09-03 15:35:18 +00:00
George Mount
8021261c89 am 12b7c53c: am 10e15c3a: Merge "Make Fragment Transitions match Acitivty Transitions API" into lmp-dev 
* commit '12b7c53c52c450a0717749ca464805ddfa4277f3':
  Make Fragment Transitions match Acitivty Transitions API
 2014-09-03 15:34:23 +00:00
Chet Haase
95f3bcdce0 Merge "Fix TransitionManager.go() to allow null transitions" into lmp-dev 2014-09-03 15:19:29 +00:00
Christoph Studer
8f4b3a9119 am 5df1917f: am 342ece75: Merge "NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT" into lmp-dev 
* commit '5df1917f8349b842812a5af430862d167a5b0ed6':
  NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT
 2014-09-03 14:56:39 +00:00
Chet Haase
5a7cf3eeeb Fix TransitionManager.go() to allow null transitions 
The doc'd behavior of go() is that a null transition is equivalent
to just switching to a scene with no transition. The actual behavior
was an NPE crash.

Issue #17342291 TransitionManager.go() with null Transition parameter throws NPE unlike documentation

Change-Id: I9416aa6e307f80eefc201ca3264fd64f8587ac2f
 2014-09-03 07:53:15 -07:00
Sander Alewijnse
75dd22c135 am a0e6069c: am 727738ad: Merge "Add the provisioning extra admin extras bundle." into lmp-dev 
* commit 'a0e6069c54b3e505199df50108bf0a38bee17170':
  Add the provisioning extra admin extras bundle.
 2014-09-03 14:35:45 +00:00
Yohei Yukawa
8bb3b4331c am d88a1f97: am ebb6b422: Merge "API Review: InputConnection" into lmp-dev 
* commit 'd88a1f9790bfaaa6540f65d76827274d716a2539':
  API Review: InputConnection
 2014-09-03 14:35:32 +00:00
Lorenzo Colitti
0c2c72295c am 703c2eb9: am 1ae4e750: Merge "Kill the NetworkInfo(int type) constructor. IT\'S A TRAP!" into lmp-dev 
* commit '703c2eb9924220110d37a386f4783208c7da90bf':
  Kill the NetworkInfo(int type) constructor. IT'S A TRAP!
 2014-09-03 14:35:20 +00:00
Svetoslav
e09626e454 am a7a98dc6: am 551335a3: Merge "Fix AccessibilityNode\'s isVisibleToUser behavior." into lmp-dev 
* commit 'a7a98dc6b88aa757f48f626d6a49ffad22626058':
  Fix AccessibilityNode's isVisibleToUser behavior.
 2014-09-03 14:34:47 +00:00
George Mount
a2327aacac Merge "Make Fragment Transitions match Acitivty Transitions API" into lmp-dev 2014-09-03 14:21:47 +00:00
Alan Viverette
7b9b90e9f5 am f1db0fca: am 0fd03d91: am b975fe87: Merge "Fix accessibility events emitted from TwoStatePreference" into lmp-dev 
* commit 'f1db0fcaafb7faf5437415e35bbc3c74bd626684':
  Fix accessibility events emitted from TwoStatePreference
 2014-09-03 13:49:31 +00:00
Adam Powell
b1e7fab278 am 0e55581c: am 9f7a5fae: am 1b17f939: Merge "Automatically supply a content description for ToolbarActionBar nav" into lmp-dev 
* commit '0e55581c1bb7f707653e2df99fe1336331e12a6e':
  Automatically supply a content description for ToolbarActionBar nav
 2014-09-03 13:49:16 +00:00
Yohei Yukawa
a86977f12a am 6a1a0ada: am 449ee1aa: am 667b31d2: Merge "API Review: CursorAnchorInfo" into lmp-dev 
* commit '6a1a0ada78bd31cfa5e9632d955501ab8bc28a38':
  API Review: CursorAnchorInfo
 2014-09-03 13:49:05 +00:00
Christoph Studer
1097b15569 Merge "NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT" into lmp-dev 2014-09-03 12:28:29 +00:00
Sander Alewijnse
52c0f04cbc Merge "Add the provisioning extra admin extras bundle." into lmp-dev 2014-09-03 11:43:42 +00:00
Sander Alewijnse
90f14bf53e Add the provisioning extra admin extras bundle. 
Enables the MDM app running (as a regular app) in the primary user to pass
through a bundle of data with which to bootstrap the instance of itself
running as profile owner in the managed profile.

Bug:17126717
Change-Id: I28a368d13e33990b16dcd68436902e0a077d5f5d
 2014-09-03 12:26:08 +01:00
Yohei Yukawa
851377f90c Merge "API Review: InputConnection" into lmp-dev 2014-09-03 09:41:48 +00:00
Lorenzo Colitti
868ec4fdb8 am 91c22552: am a04d244b: am 910113a9: Merge "Use per-Network connection pools for openConnection." into lmp-dev 
* commit '91c22552e8541ae17429d097ca79b83b94e4d6e7':
  Use per-Network connection pools for openConnection.
 2014-09-03 09:13:49 +00:00
Lorenzo Colitti
14f084c1d9 am a4695da9: am 4c172753: am 2c0a5509: Merge "Pass the socket mark for DNS queries to dnsmasq." into lmp-dev 
* commit 'a4695da9035d17a9d7f58b8eaaac1b4d8f8020d3':
  Pass the socket mark for DNS queries to dnsmasq.
 2014-09-03 09:13:43 +00:00
Alan Viverette
873a2dde58 am 3b955779: am 69a2f2b6: am 489e207d: Merge "Update pointer hotspots to scale for DPI" into lmp-dev 
* commit '3b9557795420c3ddae9fd4cf172c7f05313e1d6a':
  Update pointer hotspots to scale for DPI
 2014-09-03 09:13:34 +00:00
Dianne Hackborn
07297cd527 am 2d55b767: am 1f9c4f45: am 8070053f: Merge "Add public constant for usage stats app op." into lmp-dev 
* commit '2d55b7674690fa566f927b33f7309dd68645b20a':
  Add public constant for usage stats app op.
 2014-09-03 09:13:29 +00:00
Raph Levien
adecb3f832 am 67d8925f: am 83f28d57: am 2e97ac0c: Merge "Ensure layout in getExtendedPadding calls" into lmp-dev 
* commit '67d8925ff3e866e35f7bb5345355100ec6b70300':
  Ensure layout in getExtendedPadding calls
 2014-09-03 09:13:24 +00:00
Lorenzo Colitti
e21b564168 Merge "Kill the NetworkInfo(int type) constructor. IT'S A TRAP!" into lmp-dev 2014-09-03 06:27:12 +00:00
Alan Viverette
9cca0b4a12 am 0fd03d91: am b975fe87: Merge "Fix accessibility events emitted from TwoStatePreference" into lmp-dev 
* commit '0fd03d91fe4ca61ce62844d59f8c3a3481a1b627':
  Fix accessibility events emitted from TwoStatePreference
 2014-09-03 06:13:24 +00:00
Adam Powell
0c0702da64 am 9f7a5fae: am 1b17f939: Merge "Automatically supply a content description for ToolbarActionBar nav" into lmp-dev 
* commit '9f7a5fae89057644244f0821f75954100ff6deaa':
  Automatically supply a content description for ToolbarActionBar nav
 2014-09-03 06:13:06 +00:00
Yohei Yukawa
ce8244ac71 am 449ee1aa: am 667b31d2: Merge "API Review: CursorAnchorInfo" into lmp-dev 
* commit '449ee1aa7aad49def82bff3c09754a0ad8bc3e2a':
  API Review: CursorAnchorInfo
 2014-09-03 06:12:56 +00:00
Lorenzo Colitti
b448f7a6ef am a04d244b: am 910113a9: Merge "Use per-Network connection pools for openConnection." into lmp-dev 
* commit 'a04d244bf06dbd5845e5129275c30f631b1d0013':
  Use per-Network connection pools for openConnection.
 2014-09-03 05:49:27 +00:00
Lorenzo Colitti
e7cd2f5515 am 4c172753: am 2c0a5509: Merge "Pass the socket mark for DNS queries to dnsmasq." into lmp-dev 
* commit '4c172753f892557175ecb4c3cf4ed6fd76227049':
  Pass the socket mark for DNS queries to dnsmasq.
 2014-09-03 05:49:22 +00:00
Alan Viverette
1834ecdef4 am 69a2f2b6: am 489e207d: Merge "Update pointer hotspots to scale for DPI" into lmp-dev 
* commit '69a2f2b6059dc87cbee142d1f710d92521ef4389':
  Update pointer hotspots to scale for DPI
 2014-09-03 05:49:05 +00:00
Dianne Hackborn
c7535364b6 am 1f9c4f45: am 8070053f: Merge "Add public constant for usage stats app op." into lmp-dev 
* commit '1f9c4f452d976ad54538ef4ff6484d354ba18212':
  Add public constant for usage stats app op.
 2014-09-03 05:48:53 +00:00
Raph Levien
82ea4ee7f4 am 83f28d57: am 2e97ac0c: Merge "Ensure layout in getExtendedPadding calls" into lmp-dev 
* commit '83f28d5710b9ffca5ab8876e12458a515e694645':
  Ensure layout in getExtendedPadding calls
 2014-09-03 05:48:48 +00:00
Yohei Yukawa
d8636ea7ca API Review: InputConnection 
This CL does nothing but rename some L API candidates
in InputConnection class, as per requested.

- requestUpdateCursorAnchorInfo()
  -> requestCursorUpdates()
- REQUEST_UPDATE_CURSOR_ANCHOR_INFO_IMMEDIATE
  -> CURSOR_UPDATE_IMMEDIATE
- REQUEST_UPDATE_CURSOR_ANCHOR_INFO_MONITOR
  -> CURSOR_UPDATE_MONITOR

BUG: 17320996
Change-Id: I772c48ff18918e48a81e807b48ff907614485c09
 2014-09-02 22:39:08 -07:00
Svetoslav
f0e57e10ed Merge "Fix AccessibilityNode's isVisibleToUser behavior." into lmp-dev 2014-09-03 03:14:12 +00:00
Alan Viverette
f6f7b0c569 Merge "Fix accessibility events emitted from TwoStatePreference" into lmp-dev 2014-09-03 00:38:59 +00:00
Adam Powell
d400ca2f8d Merge "Automatically supply a content description for ToolbarActionBar nav" into lmp-dev 2014-09-03 00:11:00 +00:00
Svetoslav
9ae9ed24aa Fix AccessibilityNode's isVisibleToUser behavior. 
The isVisibleToUser property of an AccessibilityNodeInfo specifies
whether the user can see the source view. It is used by accessibility
services to figure out whether to focus on a view. This property
was giving a wrong value if the view is covered by another window
such as the keyboard. As a result the user hears one thing but when
double taps interacts with the overlaid window which is another thing.

bug:15938254

Change-Id: Ib9feb20ea422a24a512c47ed1234961ae0386a7f
 2014-09-02 16:46:23 -07:00
Yohei Yukawa
d780ce1920 Merge "API Review: CursorAnchorInfo" into lmp-dev 2014-09-02 23:45:36 +00:00