Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
241,467 Commits 3 Branches 0 Tags
cceedf75c4c849638d65c21909f08d2f98728555
Commit Graph

63086 Commits

Author SHA1 Message Date
Yohei Yukawa
d423b1ad9c Merge "Make sure to call back reportFinish() on the desired Handler." into nyc-dev am: 2c8d528 
am: 8460701

* commit '8460701b3cebdc08139a62a256d6347dc8e05c7c':
  Make sure to call back reportFinish() on the desired Handler.
 2016-03-23 21:58:30 +00:00
Yohei Yukawa
8460701b3c Merge "Make sure to call back reportFinish() on the desired Handler." into nyc-dev 
am: 2c8d528

* commit '2c8d528188f2ac9e482fe29d06ca5eb683be9b87':
  Make sure to call back reportFinish() on the desired Handler.
 2016-03-23 21:53:50 +00:00
Yohei Yukawa
2c8d528188 Merge "Make sure to call back reportFinish() on the desired Handler." into nyc-dev 2016-03-23 21:48:51 +00:00
Abodunrinwa Toki
f386b49c00 Merge "FloatingToolbar: Make it more obvious that there are more items in the overflow." into nyc-dev am: 7c89170 
am: f227ca6

* commit 'f227ca6b8ed360d929f4b7b4e095653a8c17ffb5':
  FloatingToolbar: Make it more obvious that there are more items in the overflow.
 2016-03-23 19:15:05 +00:00
Abodunrinwa Toki
f227ca6b8e Merge "FloatingToolbar: Make it more obvious that there are more items in the overflow." into nyc-dev 
am: 7c89170

* commit '7c891700995276c9f6952d0e1f2a2c1882d66f3d':
  FloatingToolbar: Make it more obvious that there are more items in the overflow.
 2016-03-23 19:11:05 +00:00
Abodunrinwa Toki
7c89170099 Merge "FloatingToolbar: Make it more obvious that there are more items in the overflow." into nyc-dev 2016-03-23 19:03:51 +00:00
Abodunrinwa Toki
f0f4d73b5b FloatingToolbar: Make it more obvious that there are more items in the overflow. 
1. Make the overflow show part of the items hidden behind the scroll view
2. Increase the time the scrollbar is on screen so users are less likely to miss it

Bug: 27427333
Change-Id: Ia0bff5fa29cba3103263bc7d063176b0ba7ff7b9
 2016-03-23 19:02:32 +00:00
Jeremy Klein
ef2305d697 Merge "Add a null check for the OnStartTetheringCallback." 2016-03-23 18:52:16 +00:00
Yigit Boyar
45d2a615dd Merge "Fix generate layout params to preserve margins" into nyc-dev am: 8b88a85 
am: f99b25f

* commit 'f99b25fd67bb4e1518600fdc96087e3738b27f8d':
  Fix generate layout params to preserve margins
 2016-03-23 18:48:00 +00:00
Adrian Roos
710f829e6d Merge "Ensure notification color contrast" into nyc-dev am: 9b95f61 
am: e933de8

* commit 'e933de8e769fb78d8af8b965d329ab91bccdbd15':
  Ensure notification color contrast
 2016-03-23 18:47:54 +00:00
Yigit Boyar
f99b25fd67 Merge "Fix generate layout params to preserve margins" into nyc-dev 
am: 8b88a85

* commit '8b88a85032550dfd344e59dc419b0d9bb02c84b6':
  Fix generate layout params to preserve margins
 2016-03-23 18:44:05 +00:00
Adrian Roos
e933de8e76 Merge "Ensure notification color contrast" into nyc-dev 
am: 9b95f61

* commit '9b95f615c45b2dac053aa45d881f6a4b3c301342':
  Ensure notification color contrast
 2016-03-23 18:44:00 +00:00
Yigit Boyar
8b88a85032 Merge "Fix generate layout params to preserve margins" into nyc-dev 2016-03-23 18:22:58 +00:00
Adrian Roos
9b95f615c4 Merge "Ensure notification color contrast" into nyc-dev 2016-03-23 18:14:54 +00:00
Felipe Leme
8bd2c937c7 Merge "Allow Scoped Directory Access on whole volume." into nyc-dev am: 9eb5555 
am: b4fb50f

* commit 'b4fb50f8ccd8840c3f5179d8733a9cb0f002eebd':
  Allow Scoped Directory Access on whole volume.
 2016-03-23 18:07:22 +00:00
Felipe Leme
b4fb50f8cc Merge "Allow Scoped Directory Access on whole volume." into nyc-dev 
am: 9eb5555

* commit '9eb5555aa6788ec948e7af8666a9155792b684f8':
  Allow Scoped Directory Access on whole volume.
 2016-03-23 18:03:27 +00:00
Peng Xu
d707fa3d00 [Sensor] Add a constant to match native header 
am: 370985d

* commit '370985d00a04c0d6977929cd8daf05c932443b0d':
  [Sensor] Add a constant to match native header
 2016-03-23 18:03:25 +00:00
Felipe Leme
9eb5555aa6 Merge "Allow Scoped Directory Access on whole volume." into nyc-dev 2016-03-23 17:58:48 +00:00
Peng Xu
370985d00a [Sensor] Add a constant to match native header 
This CL add private sensor type base constant to java file to match
C header file.

It is defined that all vendor sensor types have to be >= 0x10000.
There is a constant in sensor.h for reference. However, there is
no such constant defined in Sensor.java before. This CL adds it.

Change-Id: Ia8f8c06583c62879e51779815051c346f1a9cd14
(cherry picked from commit 1795e14dab)
 2016-03-23 17:51:02 +00:00
Peng Xu
7366923927 Merge "[Sensor] Add a constant to match native header" 2016-03-23 17:50:24 +00:00
Adrian Roos
4ff3b120ff Ensure notification color contrast 
Ensure we have at least 3:1 contrast for the
action buttons. Also ensures that the inline
reply box background has 4.5:1 contrast to white.

Further modifies the color of the inline reply
background to satisfy a 4.5:1 contrast ratio for
the entered text.

Bug: 26831312
Change-Id: If42b1c99d1adee547d0a583c1a69c48ef7287c23
 2016-03-23 10:49:40 -07:00
Abhijith Shastry
869bdebc4d Merge "Document that re-inserting the same blocked number is permitted." into nyc-dev am: 6ec134d 
am: 196ca8e

* commit '196ca8ef2f28e9a677f06d83e5ec7a319e308c4b':
  Document that re-inserting the same blocked number is permitted.
 2016-03-23 17:43:59 +00:00
Abhijith Shastry
196ca8ef2f Merge "Document that re-inserting the same blocked number is permitted." into nyc-dev 
am: 6ec134d

* commit '6ec134dc0d6de2a4dd708dbecd27e5f667c9371c':
  Document that re-inserting the same blocked number is permitted.
 2016-03-23 17:40:07 +00:00
Abhijith Shastry
6ec134dc0d Merge "Document that re-inserting the same blocked number is permitted." into nyc-dev 2016-03-23 17:29:08 +00:00
Michal Karpinski
9e8ccbe43e Merge "Remove legacy DeviceLogging methods from DPM" into nyc-dev am: 8aa976b 
am: 4a6a538

* commit '4a6a538df979887ddf96e23d42681340c64014c8':
  Remove legacy DeviceLogging methods from DPM
 2016-03-23 17:04:29 +00:00
Michal Karpinski
4a6a538df9 Merge "Remove legacy DeviceLogging methods from DPM" into nyc-dev 
am: 8aa976b

* commit '8aa976b60b0b638a77f9007fa6d1a247815d4b09':
  Remove legacy DeviceLogging methods from DPM
 2016-03-23 17:00:44 +00:00
Michal Karpinski
8aa976b60b Merge "Remove legacy DeviceLogging methods from DPM" into nyc-dev 2016-03-23 16:51:55 +00:00
Pablo Ceballos
2c81e3d384 Merge "Java bindings for SurfaceControl::setFinalCrop" into nyc-dev am: 6266d8c 
am: 38f1868

* commit '38f18683b2950dc666d730b960d2fece3da7ebe4':
  Java bindings for SurfaceControl::setFinalCrop
 2016-03-23 16:45:52 +00:00
Pablo Ceballos
38f18683b2 Merge "Java bindings for SurfaceControl::setFinalCrop" into nyc-dev 
am: 6266d8c

* commit '6266d8c959806a359571b0833702fbe46e9748f9':
  Java bindings for SurfaceControl::setFinalCrop
 2016-03-23 16:42:12 +00:00
Chris Banes
4a250f33f7 Merge "Allow AlertDialog to be used in a DialogFragment" into nyc-dev am: a62a0f7 
am: d4534a3

* commit 'd4534a3d9df382c427b6b4799bd0504c526d669c':
  Allow AlertDialog to be used in a DialogFragment
 2016-03-23 16:38:26 +00:00
Chris Banes
d4534a3d9d Merge "Allow AlertDialog to be used in a DialogFragment" into nyc-dev 
am: a62a0f7

* commit 'a62a0f72864533f2de5d1cd311ed5030c293aa2d':
  Allow AlertDialog to be used in a DialogFragment
 2016-03-23 16:34:51 +00:00
Pablo Ceballos
6266d8c959 Merge "Java bindings for SurfaceControl::setFinalCrop" into nyc-dev 2016-03-23 16:30:54 +00:00
Chris Banes
a62a0f7286 Merge "Allow AlertDialog to be used in a DialogFragment" into nyc-dev 2016-03-23 16:25:53 +00:00
Chris Banes
ccf8e661c7 Allow AlertDialog to be used in a DialogFragment 
AlertController calls requestWindowFeature() too
later for DialogFragment. Fixed by moving it to the
constructor.

BUG: 27809055
Change-Id: Icef01316b4e857b41ccc29cc56bbcecd7f629342
 2016-03-23 16:20:00 +00:00
Abodunrinwa Toki
8c8d552b4e Merge "Replace Settings.ACTION_KEYBOARD_LAYOUT_SETTINGS with Settings.ACTION_HARD_KEYBOARD_SETTINGS" into nyc-dev am: ae64758 
am: f99cbc8

* commit 'f99cbc87358ac19b0a9a74e7763eff67455e44f7':
  Replace Settings.ACTION_KEYBOARD_LAYOUT_SETTINGS with Settings.ACTION_HARD_KEYBOARD_SETTINGS
 2016-03-23 16:14:46 +00:00
Abodunrinwa Toki
f99cbc8735 Merge "Replace Settings.ACTION_KEYBOARD_LAYOUT_SETTINGS with Settings.ACTION_HARD_KEYBOARD_SETTINGS" into nyc-dev 
am: ae64758

* commit 'ae64758eddecec9cb90b6c540fa4687c7f2b2078':
  Replace Settings.ACTION_KEYBOARD_LAYOUT_SETTINGS with Settings.ACTION_HARD_KEYBOARD_SETTINGS
 2016-03-23 16:11:05 +00:00
Abodunrinwa Toki
ae64758edd Merge "Replace Settings.ACTION_KEYBOARD_LAYOUT_SETTINGS with Settings.ACTION_HARD_KEYBOARD_SETTINGS" into nyc-dev 2016-03-23 16:02:36 +00:00
Michal Karpinski
3bce4bfa04 Remove legacy DeviceLogging methods from DPM 
Those methods were replaced with SecurityLogging ones.

Bug: 27532425
Change-Id: I6952251d9c15f932517e7cb39a7056f35c3a194f
 2016-03-23 13:14:33 +00:00
Chet Haase
68f8d405b1 Merge "Clarify docs around weak references to animator targets" into nyc-dev am: 5084bd6 
am: bdfe232

* commit 'bdfe23202d214d68112eda17bab796ebe068ce1e':
  Clarify docs around weak references to animator targets
 2016-03-23 12:58:48 +00:00
Chet Haase
bdfe23202d Merge "Clarify docs around weak references to animator targets" into nyc-dev 
am: 5084bd6

* commit '5084bd66dd39105f29bf495daabed9af2fdc6979':
  Clarify docs around weak references to animator targets
 2016-03-23 12:54:42 +00:00
Chet Haase
5084bd66dd Merge "Clarify docs around weak references to animator targets" into nyc-dev 2016-03-23 12:46:30 +00:00
Yohei Yukawa
abe1fc13db Merge "Remove redundant IMM#mServedInputConnection." into nyc-dev am: c1a72b6 
am: 06963ca

* commit '06963ca36928f6578116f96eef9fee0b11cd5488':
  Remove redundant IMM#mServedInputConnection.
 2016-03-23 05:55:00 +00:00
Yohei Yukawa
06963ca369 Merge "Remove redundant IMM#mServedInputConnection." into nyc-dev 
am: c1a72b6

* commit 'c1a72b6b74c08b0b304998838d1e792884a6354c':
  Remove redundant IMM#mServedInputConnection.
 2016-03-23 05:51:14 +00:00
Yohei Yukawa
c1a72b6b74 Merge "Remove redundant IMM#mServedInputConnection." into nyc-dev 2016-03-23 05:41:08 +00:00
Yohei Yukawa
16e2c7b59a Make sure to call back reportFinish() on the desired Handler. 
Before exposing #reportFinish() as a public API, we have to fix an
existing bug that my previous CL [1] for Bug 26945674 forgot to take care.

Currently BaseInputConnection#reportFinish() is always called by using
the root view's Handler.  We should move the logic to call
BaseInputConnection#reportFinishInputConnection() from ViewRootImpl to
IInputConnectionWrapper to make sure that the method in question can
always be called on the desired Handler.

To make things simple, instead of explicitly calling #reportFinish()
from IMM, this CL let ControlledInputConnectionWrapper#diactivate()
internally call #reportFinish() as needed.  This makes it easier to make
sure that #reportFinish() is called after all the queued method calls
are handled.

  [1]: Id9e579bb3e2966986cdcb1c34bc8cacfeca2e1a9
       612cce92ad

Bug: 25332806
Change-Id: Ibe94f115e607a198d12ecd3d4e4f91a7d9469c98
 2016-03-22 21:27:48 -07:00
Yohei Yukawa
afb6558c8f Remove redundant IMM#mServedInputConnection. 
Following two fields have basically the same lifetime.
 - InputMethodManager#mServedInputConnection
 - InputMethodManager#mServedInputConnectionWrapper
Hence we do not need to maintain both of them.

This is a preparation CL for Bug 25332806 and does not change any
user-visible behavior.

Bug: 25332806
Change-Id: I1181e067aa5bedbdf0c7ec1bcec479257aea511c
 2016-03-22 20:53:08 -07:00
Abhijith Shastry
91fa6c122d Document that re-inserting the same blocked number is permitted. 
BUG: 27779600
Change-Id: I2cb5cbf5f50ed3bf2183858eb332ea5e6df2a0c6
 2016-03-22 18:24:21 -07:00
Pierre Imai
b21e6adbd8 Merge "Improve NetworkCapabilities command chaining." into nyc-dev am: 82a3637 
am: 8704426

* commit '87044260bed79cd191c21081b2394271797d902f':
  Improve NetworkCapabilities command chaining.
 2016-03-23 01:22:19 +00:00
Pierre Imai
87044260be Merge "Improve NetworkCapabilities command chaining." into nyc-dev 
am: 82a3637

* commit '82a3637fcec8d81b25827d03bd178a83101de6ab':
  Improve NetworkCapabilities command chaining.
 2016-03-23 01:18:47 +00:00
Pierre Imai
82a3637fce Merge "Improve NetworkCapabilities command chaining." into nyc-dev 2016-03-23 01:11:15 +00:00