Andreas Gampe
aa268b773e
Merge "Frameworks/base: Refactor package manager" into nyc-dev am: a7f2bcc
...
am: 31e9eec
* commit '31e9eec4ea3a359d572d4eb843537484f18ceb84':
Frameworks/base: Refactor package manager
2016-03-24 02:11:50 +00:00
Andreas Gampe
31e9eec4ea
Merge "Frameworks/base: Refactor package manager" into nyc-dev
...
am: a7f2bcc
* commit 'a7f2bccca3f27a2ad12397ffb52d47fceea76018':
Frameworks/base: Refactor package manager
2016-03-24 02:08:01 +00:00
Andreas Gampe
a7f2bccca3
Merge "Frameworks/base: Refactor package manager" into nyc-dev
2016-03-24 01:59:24 +00:00
Andreas Gampe
bdd30d86ef
Frameworks/base: Refactor package manager
...
Introduce a mapping between dexopt reasons and compiler filters. Use
reasons in package manager and other classes, where possible.
Change PackageDexOptimizer to accept a compilation filter. Adapt for
the split-out profile merging. Pass compilation filter to installd.
Bug: 27689078
Change-Id: I8c0ea6f10fbfdbd096adecc52abfd2466d048fdc
2016-03-23 16:21:21 -07:00
Chad Brubaker
1cf689b0fd
Merge "Properly handle whitespace in domain entries" into nyc-dev am: 2e6aa19
...
am: 1b55d74
* commit '1b55d74981d13031528e001c35840fab35c71e98':
Properly handle whitespace in domain entries
2016-03-23 22:52:39 +00:00
Chad Brubaker
1b55d74981
Merge "Properly handle whitespace in domain entries" into nyc-dev
...
am: 2e6aa19
* commit '2e6aa196bc00c7b8f65a513f1dcf0712af500a10':
Properly handle whitespace in domain entries
2016-03-23 22:50:01 +00:00
Amith Yamasani
c731dd758d
Merge "Localize owner\'s name to current locale until changed" into nyc-dev am: df4c40d
...
am: 195ed1e
* commit '195ed1e61b52a1c0616846c61029b5db7c89928d':
Localize owner's name to current locale until changed
2016-03-23 22:45:35 +00:00
Adam Powell
2ce140df85
Merge "Fix bugs around restoring nested retained instance fragments" into nyc-dev am: 30ac43e
...
am: f26ebfc6
* commit 'f26ebfc6c2ac42ffca127f83615f503276fdc454':
Fix bugs around restoring nested retained instance fragments
2016-03-23 22:45:33 +00:00
Chad Brubaker
2e6aa196bc
Merge "Properly handle whitespace in domain entries" into nyc-dev
2016-03-23 22:44:11 +00:00
Amith Yamasani
195ed1e61b
Merge "Localize owner\'s name to current locale until changed" into nyc-dev
...
am: df4c40d
* commit 'df4c40df2f49ec4366dd2c549c0f30e5262af49b':
Localize owner's name to current locale until changed
2016-03-23 22:40:05 +00:00
Adam Powell
f26ebfc6c2
Merge "Fix bugs around restoring nested retained instance fragments" into nyc-dev
...
am: 30ac43e
* commit '30ac43e4acc4ed5673ea40d6643e36fadec5411c':
Fix bugs around restoring nested retained instance fragments
2016-03-23 22:40:03 +00:00
Amith Yamasani
df4c40df2f
Merge "Localize owner's name to current locale until changed" into nyc-dev
2016-03-23 22:33:17 +00:00
Chad Brubaker
7cc736da82
Properly handle whitespace in domain entries
...
Domain entries can contain whitespace (or newlines) which should be
ignored to avoid unexpectedly failing to match a domain.
Bug: 27816377
Change-Id: I3691aa4abd409e7be97ad0cf1eb0195725e1b0ab
2016-03-23 15:28:41 -07:00
Adam Powell
30ac43e4ac
Merge "Fix bugs around restoring nested retained instance fragments" into nyc-dev
2016-03-23 22:27:31 +00:00
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
Amith Yamasani
6f48d6ef35
Localize owner's name to current locale until changed
...
Don't set a name for the system user and always return a localized
name until the user explicitly sets a name.
Bug: 27814125
Change-Id: I7972a45d77c07d9efbd67d5b360bacee46247a66
2016-03-23 14:28:25 -07:00
Adam Powell
eacacb5989
Fix bugs around restoring nested retained instance fragments
...
Framework edition
In a few configurations the child fragment state of a
retained-instance fragment would not be preserved correctly, leading
to child fragments not being restored. Clean this up along with live
state management issues that were leading to logged warnings during
normal fragment operation.
Bug 27371492
Bug 27477824
Change-Id: I847ac05b1757392580e008dc20c50c3ef365ca68
2016-03-23 13:07:27 -07: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