Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
239,726 Commits 3 Branches 0 Tags
fdc8d14ce5ed411a3d0530d8084ae5fc8ac0ce09
Commit Graph

62597 Commits

Author SHA1 Message Date
Makoto Onuki
fdc8d14ce5 Merge "Fix launcher side callback" into nyc-dev am: ed1b89878b 
am: de40929c65

* commit 'de40929c65a28525629c962d859758ff5e61e412':
  Fix launcher side callback
 2016-03-15 21:15:33 +00:00
Makoto Onuki
de40929c65 Merge "Fix launcher side callback" into nyc-dev 
am: ed1b89878b

* commit 'ed1b89878bdf1fa9b5e4b2dfc766383d531d4315':
  Fix launcher side callback
 2016-03-15 21:11:56 +00:00
Makoto Onuki
ed1b89878b Merge "Fix launcher side callback" into nyc-dev 2016-03-15 21:02:48 +00:00
Mahaver Chopra
588ad4a563 Merge "Update DPM.reboot with new restriction" into nyc-dev am: 8a8e8ea19a 
am: 648c70a3b7

* commit '648c70a3b79264467512916ca7852c4147fd06d3':
  Update DPM.reboot with new restriction
 2016-03-15 20:00:54 +00:00
Mahaver Chopra
648c70a3b7 Merge "Update DPM.reboot with new restriction" into nyc-dev 
am: 8a8e8ea19a

* commit '8a8e8ea19a825dd45117909df2f0140ca20565e7':
  Update DPM.reboot with new restriction
 2016-03-15 19:56:48 +00:00
Mahaver Chopra
8a8e8ea19a Merge "Update DPM.reboot with new restriction" into nyc-dev 2016-03-15 19:48:33 +00:00
Mahaver Chopra
1216ae5d02 Update DPM.reboot with new restriction 
DPM.reboot() should not be called when there is an ongoing call on the
device.

Bug:27531799
Change-Id: Idc1fa4c7aa79b20ec9c2afcccf855455ee316787
 2016-03-15 19:46:05 +00:00
Makoto Onuki
4dbe0ded4a Fix launcher side callback 
- Fix crash in work profile case
- Calculate shortcuts for each caller
- Add tests

Bug 27548047

Change-Id: I1a5b6a96956abac75d01eb5cc1cec9a9e8e379a3
 2016-03-15 12:38:41 -07:00
Sudheer Shanka
35ad2d8231 Merge "Show admin support dialog if app is suspended." into nyc-dev am: b5a4d9605f 
am: 019a784c14

* commit '019a784c140af468544ba34622eaf9711199ef91':
  Show admin support dialog if app is suspended.
 2016-03-15 19:01:31 +00:00
Sudheer Shanka
019a784c14 Merge "Show admin support dialog if app is suspended." into nyc-dev 
am: b5a4d9605f

* commit 'b5a4d9605f6ee009984165f1c894b3949dc8417a':
  Show admin support dialog if app is suspended.
 2016-03-15 18:58:38 +00:00
Sudheer Shanka
b5a4d9605f Merge "Show admin support dialog if app is suspended." into nyc-dev 2016-03-15 18:50:01 +00:00
Felipe Leme
51e4305a58 Merge "Fixed typos." 2016-03-15 18:48:45 +00:00
Dimitry Ivanov
83e16c7314 Merge "Restore fix for native activity without a java-code" into nyc-dev am: 53ea5a2f07 
am: fd167d0572

* commit 'fd167d0572c845a0c6222a1bf534e6d2ba7c9ae2':
  Restore fix for native activity without a java-code
 2016-03-15 18:31:32 +00:00
Dimitry Ivanov
fd167d0572 Merge "Restore fix for native activity without a java-code" into nyc-dev 
am: 53ea5a2f07

* commit '53ea5a2f071909e10e21b53ca974d2016c400173':
  Restore fix for native activity without a java-code
 2016-03-15 18:29:15 +00:00
Andrii Kulian
6ba2aecb6e Merge "Update ActivityOptions#setLaunchBounds() docs" into nyc-dev am: 68b36ee07b 
am: 7db5f3b4c5

* commit '7db5f3b4c52620a5e37d2c47c364ce2deed3fd7d':
  Update ActivityOptions#setLaunchBounds() docs
 2016-03-15 18:24:45 +00:00
Dimitry Ivanov
53ea5a2f07 Merge "Restore fix for native activity without a java-code" into nyc-dev 2016-03-15 18:23:03 +00:00
Andrii Kulian
7db5f3b4c5 Merge "Update ActivityOptions#setLaunchBounds() docs" into nyc-dev 
am: 68b36ee07b

* commit '68b36ee07b6f8c184e0b9f297ae672b5685a978c':
  Update ActivityOptions#setLaunchBounds() docs
 2016-03-15 18:22:07 +00:00
Andrii Kulian
68b36ee07b Merge "Update ActivityOptions#setLaunchBounds() docs" into nyc-dev 2016-03-15 18:19:13 +00:00
Ronghua Wu
282873a3b0 Merge "core: add hdr capabilities to display" into nyc-dev am: a052cbda80 
am: dbbdb608c0

* commit 'dbbdb608c031e85a8b4f0c2475d4874b51c14bee':
  core: add hdr capabilities to display
 2016-03-15 17:50:27 +00:00
Ronghua Wu
dbbdb608c0 Merge "core: add hdr capabilities to display" into nyc-dev 
am: a052cbda80

* commit 'a052cbda8099d6665e77076ae86a3f1265306caa':
  core: add hdr capabilities to display
 2016-03-15 17:47:42 +00:00
Ronghua Wu
a052cbda80 Merge "core: add hdr capabilities to display" into nyc-dev 2016-03-15 17:40:14 +00:00
Sudheer Shanka
7a9c34bd7a Show admin support dialog if app is suspended. 
Bug: 26922950
Change-Id: I21f048873244df52d14910cc01a658af476d9149
 2016-03-15 10:40:04 -07:00
Ian Pedowitz
391b3f4596 Merge "Revert "Permissions: Get rid of GET_ACCOUNTS"" into nyc-dev am: 440ef18fe7 
am: 0f0fba787c

* commit '0f0fba787c69d3a53e6f40618e57d772ab317dee':
  Revert "Permissions: Get rid of GET_ACCOUNTS"
 2016-03-15 17:19:00 +00:00
Dimitry Ivanov
43b28b17d2 Restore fix for native activity without a java-code 
The regression was introduced by 39bfee5e36
which undid the fix to classloader construction.

This commit reapplies the fix from b9c9026bdd

Bug: http://b/27250344
Change-Id: I6c341d911ba0f311c63e380dd9dd064ba2faf391
 2016-03-15 10:17:35 -07:00
Ian Pedowitz
0f0fba787c Merge "Revert "Permissions: Get rid of GET_ACCOUNTS"" into nyc-dev 
am: 440ef18fe7

* commit '440ef18fe7dcfaff28fad0137f4abe4235381e05':
  Revert "Permissions: Get rid of GET_ACCOUNTS"
 2016-03-15 17:15:59 +00:00
Ian Pedowitz
440ef18fe7 Merge "Revert "Permissions: Get rid of GET_ACCOUNTS"" into nyc-dev 2016-03-15 17:09:53 +00:00
Ian Pedowitz
358e51f3d1 Revert "Permissions: Get rid of GET_ACCOUNTS" 
This reverts commit d39600585b.

Bug: 27665091
Change-Id: I7d017ba7062ac594225229436d2877c7d21fb065
 2016-03-15 17:08:27 +00:00
Adam Powell
03d3162112 Merge "Un-deprecate Activity#onRetainNonConfigurationInstance" into nyc-dev am: 421806380d 
am: d2f9090c16

* commit 'd2f9090c1639f9b7460cb92a294ff67685161c3d':
  Un-deprecate Activity#onRetainNonConfigurationInstance
 2016-03-15 16:59:50 +00:00
Adam Powell
d2f9090c16 Merge "Un-deprecate Activity#onRetainNonConfigurationInstance" into nyc-dev 
am: 421806380d

* commit '421806380dcb971755caf4e61756a38566469f6e':
  Un-deprecate Activity#onRetainNonConfigurationInstance
 2016-03-15 16:57:22 +00:00
Adam Powell
421806380d Merge "Un-deprecate Activity#onRetainNonConfigurationInstance" into nyc-dev 2016-03-15 16:51:03 +00:00
Kirill Grouchnikov
8e77eb9081 Merge "Remove tracking of all drawables in ViewOverlay.clear()" into nyc-dev am: a487ab1368 
am: c3aa518546

* commit 'c3aa5185462aeec9a847c9461bbbc6a4fea2c501':
  Remove tracking of all drawables in ViewOverlay.clear()
 2016-03-15 16:32:34 +00:00
Kirill Grouchnikov
c3aa518546 Merge "Remove tracking of all drawables in ViewOverlay.clear()" into nyc-dev 
am: a487ab1368

* commit 'a487ab13682d6e60c6ff41a5b9f708b752efc776':
  Remove tracking of all drawables in ViewOverlay.clear()
 2016-03-15 16:30:11 +00:00
Kirill Grouchnikov
a487ab1368 Merge "Remove tracking of all drawables in ViewOverlay.clear()" into nyc-dev 2016-03-15 16:25:50 +00:00
Alan Viverette
164bec75f3 Merge "Push flags from top-level TypedValue into ComplexColor changing configs" into nyc-dev am: f068cff176 
am: 0269baa345

* commit '0269baa34513964257f50ad9d598e7e63ff102a5':
  Push flags from top-level TypedValue into ComplexColor changing configs
 2016-03-15 14:46:01 +00:00
Alan Viverette
0269baa345 Merge "Push flags from top-level TypedValue into ComplexColor changing configs" into nyc-dev 
am: f068cff176

* commit 'f068cff1761a2876587caa7ca6978a848198439a':
  Push flags from top-level TypedValue into ComplexColor changing configs
 2016-03-15 14:41:52 +00:00
Alan Viverette
f068cff176 Merge "Push flags from top-level TypedValue into ComplexColor changing configs" into nyc-dev 2016-03-15 14:36:11 +00:00
Michal Karpinski
9a46e08d40 Merge "Addressing API council feedback for remote bugreports" into nyc-dev am: 57f8462f56 
am: 295a0bce25

* commit '295a0bce256bf5ce88a1e903786063c9f937e899':
  Addressing API council feedback for remote bugreports
 2016-03-15 14:16:17 +00:00
Michal Karpinski
295a0bce25 Merge "Addressing API council feedback for remote bugreports" into nyc-dev 
am: 57f8462f56

* commit '57f8462f56eb2311bb409fd09848117523d3b5aa':
  Addressing API council feedback for remote bugreports
 2016-03-15 14:13:56 +00:00
Michal Karpinski
37cfe71693 Addressing API council feedback for remote bugreports 
In DeviceAdminReceiver fixed a broken link in javadocs and improved
javadocs for bugreport error codes.

Bug: 27532425
Change-Id: I6cf90b4109065615778e69ea9d21b1869841593b
 2016-03-15 11:35:34 +00:00
Keisuke Kuroyanagi
2d5d06be16 Merge "Re-disable drag and drop in full screen extracted mode." into nyc-dev am: 531d8d2fae 
am: 5befed1900

* commit '5befed1900752f9071b1c4bde806112e69b3d055':
  Re-disable drag and drop in full screen extracted mode.
 2016-03-15 08:28:51 +00:00
Keisuke Kuroyanagi
5befed1900 Merge "Re-disable drag and drop in full screen extracted mode." into nyc-dev 
am: 531d8d2fae

* commit '531d8d2faee92f8ea173440b74761bd91add2dd8':
  Re-disable drag and drop in full screen extracted mode.
 2016-03-15 08:26:30 +00:00
Keisuke Kuroyanagi
531d8d2fae Merge "Re-disable drag and drop in full screen extracted mode." into nyc-dev 2016-03-15 08:21:11 +00:00
Keisuke Kuroyanagi
9327e67705 Merge "Stop automatically creating selection action mode." into nyc-dev am: 126fdf1082 
am: 6229859e06

* commit '6229859e0698738df30f284ec72c02aed101ec55':
  Stop automatically creating selection action mode.
 2016-03-15 07:49:36 +00:00
Keisuke Kuroyanagi
6229859e06 Merge "Stop automatically creating selection action mode." into nyc-dev 
am: 126fdf1082

* commit '126fdf108297bd66da85edbfe6d1af2cef64404d':
  Stop automatically creating selection action mode.
 2016-03-15 07:47:16 +00:00
Keisuke Kuroyanagi
126fdf1082 Merge "Stop automatically creating selection action mode." into nyc-dev 2016-03-15 07:41:07 +00:00
Andrii Kulian
8f1701d9dc Update ActivityOptions#setLaunchBounds() docs 
Update docs to provide more info about parameter format.

Bug: 27364884
Change-Id: I04dd2e868d64d3f023fcaa4891b40b60a2f549d6
 2016-03-15 00:02:59 -07:00
Keisuke Kuroyanagi
ee7ce3cc0a Merge "Add a check for misspelled span change." into nyc-dev am: 794f70f172 
am: f2fbb29304

* commit 'f2fbb29304d5b6d26c7dfb9cfaede2ce4a4a1782':
  Add a check for misspelled span change.
 2016-03-15 06:54:08 +00:00
Keisuke Kuroyanagi
f2fbb29304 Merge "Add a check for misspelled span change." into nyc-dev 
am: 794f70f172

* commit '794f70f1728123608a2bcbf2a508b31b79a931b2':
  Add a check for misspelled span change.
 2016-03-15 06:51:21 +00:00
Keisuke Kuroyanagi
794f70f172 Merge "Add a check for misspelled span change." into nyc-dev 2016-03-15 06:47:10 +00:00
Keisuke Kuroyanagi
6e0860d959 Add a check for misspelled span change. 
Previously, misspelled span is directly used in AddToDicitonary's
OnClickListener. It can crash because misspelled span can have been
updated since SuggestiosPopup is shown.
Also, AddToDictionary didn't work correctly in full screen extracted
mode. Use findEquivalentSuggestionSpan to resolve it.

Bug: 27557526
Change-Id: I51d713dbdd0c44ea2c553164b81b1123a2325aa1
 2016-03-15 15:40:43 +09:00