Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
254,553 Commits 3 Branches 0 Tags
9ad9ff2d4ce9ca9ebe2f4fb9d969cb98d6847790
Commit Graph

65583 Commits

Author SHA1 Message Date
Alan Viverette
9ad9ff2d4c Merge "Maintain internal consistency for TimePickerClockDelegate hour" into nyc-dev am: 7544ac22e4 am: acddbbcb21 
am: 65f6b02623

* commit '65f6b026239eff382a5a2385f1b9fa9251269bf3':
  Maintain internal consistency for TimePickerClockDelegate hour

Change-Id: I10366582f980d2892ea5ffcfd23331653be8e023
 2016-04-29 15:29:42 +00:00
Lorenzo Colitti
2ac6a535dc Merge "The legacy DHCP client is gone. Delete the settings." into nyc-dev am: a4daf16b57 am: 52e5f2e5ec 
am: 5e64fb4e74

* commit '5e64fb4e7435edee75f8ae4f4021b2aa7941336b':
  The legacy DHCP client is gone. Delete the settings.

Change-Id: I479f1c696fc1d7a325090e3bde265e85bc63eabd
 2016-04-29 15:29:38 +00:00
Alan Viverette
acddbbcb21 Merge "Maintain internal consistency for TimePickerClockDelegate hour" into nyc-dev 
am: 7544ac22e4

* commit '7544ac22e474547a3cbeaff0dcaf163bbbd4fca7':
  Maintain internal consistency for TimePickerClockDelegate hour

Change-Id: I1b46f64e197303507c5b3cb3c402438e51e993c3
 2016-04-29 15:24:45 +00:00
Lorenzo Colitti
52e5f2e5ec Merge "The legacy DHCP client is gone. Delete the settings." into nyc-dev 
am: a4daf16b57

* commit 'a4daf16b578c456104f59f05ac374101426d1376':
  The legacy DHCP client is gone. Delete the settings.

Change-Id: Ib9f1352386ebe667ec5d3d110f64e080c04c103d
 2016-04-29 15:24:42 +00:00
Alan Viverette
7544ac22e4 Merge "Maintain internal consistency for TimePickerClockDelegate hour" into nyc-dev 2016-04-29 15:22:07 +00:00
TreeHugger Robot
a4daf16b57 Merge "The legacy DHCP client is gone. Delete the settings." into nyc-dev 2016-04-29 15:17:41 +00:00
Tim Volodine
34c85b1f66 Merge "[WebView] Add documentation regarding geolocation api on secure origins." into nyc-dev am: c750474fd1 am: 7e2e50cef4 
am: 7b569ebb38

* commit '7b569ebb38a7b42cb3b75298b2a0707bc8341d14':
  [WebView] Add documentation regarding geolocation api on secure origins.

Change-Id: Iaaae04397aa37f315ae9847745a5d417be984fc7
 2016-04-29 14:45:10 +00:00
Tim Volodine
7b569ebb38 Merge "[WebView] Add documentation regarding geolocation api on secure origins." into nyc-dev am: c750474fd1 
am: 7e2e50cef4

* commit '7e2e50cef41797752c3a4df4115e9c4cb55ded1c':
  [WebView] Add documentation regarding geolocation api on secure origins.

Change-Id: Iee4e1c660a32cccbc7df55986e952ae7d28cfd3e
 2016-04-29 14:42:43 +00:00
Tim Volodine
01a3ddd116 Merge "[WebView] Add documentation regarding geolocation api on secure origins." into nyc-dev 
am: c750474fd1

* commit 'c750474fd17e4cc9ccb536d76d83c16d5a521a3c':
  [WebView] Add documentation regarding geolocation api on secure origins.

Change-Id: I941ff4185ff90dc640f47c2ba9e32ce8a41dbb28
 2016-04-29 14:40:16 +00:00
TreeHugger Robot
c750474fd1 Merge "[WebView] Add documentation regarding geolocation api on secure origins." into nyc-dev 2016-04-29 14:34:20 +00:00
Abodunrinwa Toki
1aecebf2bf Merge "Ensure FloatingToolbar is not rendered at negative x, y coordinates." into nyc-dev am: d971a9d5f2 am: c2cd9cca86 
am: 8523c5983d

* commit '8523c5983dfb21cd4bdce94a90112a0090a1db54':
  Ensure FloatingToolbar is not rendered at negative x, y coordinates.

Change-Id: I1b5ecf758781ff32c269c8536791b78d23337f8a
 2016-04-29 14:14:24 +00:00
Abodunrinwa Toki
8523c5983d Merge "Ensure FloatingToolbar is not rendered at negative x, y coordinates." into nyc-dev am: d971a9d5f2 
am: c2cd9cca86

* commit 'c2cd9cca86c190994fd1c898e4bd57acd260eea5':
  Ensure FloatingToolbar is not rendered at negative x, y coordinates.

Change-Id: Iea6fb1f86e62d68dd16adaa9eb83a95ac4856b4e
 2016-04-29 14:11:42 +00:00
Abodunrinwa Toki
81abb66703 Merge "Ensure FloatingToolbar is not rendered at negative x, y coordinates." into nyc-dev 
am: d971a9d5f2

* commit 'd971a9d5f2f945d89728af7fffe1e692c1c91e3b':
  Ensure FloatingToolbar is not rendered at negative x, y coordinates.

Change-Id: Id07efe487b3fe01d9df7968afb66ec4b45ae2c6c
 2016-04-29 14:09:09 +00:00
Abodunrinwa Toki
d971a9d5f2 Merge "Ensure FloatingToolbar is not rendered at negative x, y coordinates." into nyc-dev 2016-04-29 14:04:06 +00:00
Lorenzo Colitti
fb628c078c The legacy DHCP client is gone. Delete the settings. 
Bug: 27192644
Change-Id: I5bc23f3e269e17d50fa2531a57fb0e2049ae18bf
 2016-04-29 22:19:23 +09:00
Tim Volodine
b0e9798e52 [WebView] Add documentation regarding geolocation api on secure origins. 
Update to javadoc comments saying that for apps targeting N and up
the geolocation api is only supported on secure origins.
On non-secure origins requests to geolocation api are automatically
denied without calling the corresponding
WebChromeClient#onGeolocationPermissionsShowPrompt method.

BUG: 28080869
Change-Id: I57726f7f3b3d38db0535f742b1f74c40c1f1ce8b
 2016-04-29 12:59:27 +00:00
Andreas Gampe
e105b0bed9 Merge "Frameworks/base: Use holder in FileUtils" into nyc-dev am: ecd73f48fe am: 289da55c68 
am: a4661cbbd1

* commit 'a4661cbbd12713266ab30f8e75db33aadc97a079':
  Frameworks/base: Use holder in FileUtils

Change-Id: I9e16512c1af9d67ef47291cc67df1764a42a7cd3
 2016-04-29 07:20:38 +00:00
Andreas Gampe
289da55c68 Merge "Frameworks/base: Use holder in FileUtils" into nyc-dev 
am: ecd73f48fe

* commit 'ecd73f48fe219cf238c4c2ec692c42855787bde0':
  Frameworks/base: Use holder in FileUtils

Change-Id: I5c46dc39de8c1a9fd3ddec59e1440b3a6e65d9e7
 2016-04-29 07:15:58 +00:00
Andreas Gampe
0693fd85f6 Frameworks/base: Use holder in FileUtils 
Use a holder for an uncommon Pattern instance in FileUtils.

Allows to compile-time initialize:
* android.os.FileUtils

Bug: 28174137
Change-Id: I4a7a388795a96678b4b26e4f2c02b1117d6a67f6
 2016-04-28 19:33:05 -07:00
Justin Klaassen
5daaed3713 Merge "Support view transformations when positioning floating CAB" into nyc-dev am: 1fe7ed557d am: 5efc1443be 
am: bc2bea558a

* commit 'bc2bea558a83066977bd6dcbac76fe824af73e3b':
  Support view transformations when positioning floating CAB

Change-Id: I749e0ad70054711e81417f48520e8c722d926633
 2016-04-28 20:59:46 +00:00
Justin Klaassen
5efc1443be Merge "Support view transformations when positioning floating CAB" into nyc-dev 
am: 1fe7ed557d

* commit '1fe7ed557de90c6992f6d36a485cd63b651a51dd':
  Support view transformations when positioning floating CAB

Change-Id: I988f50bfedf7c8a0de20eac2e50cf26e6ee422ea
 2016-04-28 20:53:12 +00:00
Justin Klaassen
1fe7ed557d Merge "Support view transformations when positioning floating CAB" into nyc-dev 2016-04-28 20:49:37 +00:00
Jorim Jaggi
3c45bc6fde Merge "Remove optimization to report config change" into nyc-dev am: df551dda12 am: 1ef9359662 
am: 54423e2947

* commit '54423e2947a8e0219aeb7cabb4c03111b56745b5':
  Remove optimization to report config change

Change-Id: I51cc7d3ce50bac4c46d12eefc74cfba798a14acc
 2016-04-28 20:38:32 +00:00
Jorim Jaggi
1ef9359662 Merge "Remove optimization to report config change" into nyc-dev 
am: df551dda12

* commit 'df551dda1289598c209d75f6b99322e82866e2c0':
  Remove optimization to report config change

Change-Id: Ida68bae850d55f3feb59c596bdef3e5d48e67b77
 2016-04-28 20:32:52 +00:00
Jorim Jaggi
df551dda12 Merge "Remove optimization to report config change" into nyc-dev 2016-04-28 20:28:38 +00:00
Joe LaPenna
68bc1cc30c Merge "Allow "disk reads" to sysfs in battery stats" 2016-04-28 20:23:50 +00:00
Makoto Onuki
5cc48412b2 Merge "ShortcutManager: When app\'s data is cleared, remove all shortcuts," into nyc-dev am: d1c30db548 am: 07f8d94c6e 
am: a1bca975ef

* commit 'a1bca975efce3830d3c97a98db785151daeda465':
  ShortcutManager: When app's data is cleared, remove all shortcuts,

Change-Id: Ib8af31efc5117528d2599fa03bd5ed74f6606fe7
 2016-04-28 20:20:53 +00:00
Makoto Onuki
a1bca975ef Merge "ShortcutManager: When app\'s data is cleared, remove all shortcuts," into nyc-dev am: d1c30db548 
am: 07f8d94c6e

* commit '07f8d94c6e53cfd7dd389027fc2471ce5ea07846':
  ShortcutManager: When app's data is cleared, remove all shortcuts,

Change-Id: Id5755e333af7552537ddf02c07f0ef12d998b427
 2016-04-28 20:18:34 +00:00
Makoto Onuki
16d4eadbd9 Merge "ShortcutManager: When app\'s data is cleared, remove all shortcuts," into nyc-dev 
am: d1c30db548

* commit 'd1c30db548da90d5bc092821c6fee4b4ef060bbb':
  ShortcutManager: When app's data is cleared, remove all shortcuts,

Change-Id: I798a064e17a628999568a3a68634318ff1126bf4
 2016-04-28 20:16:15 +00:00
Makoto Onuki
d1c30db548 Merge "ShortcutManager: When app's data is cleared, remove all shortcuts," into nyc-dev 2016-04-28 20:11:06 +00:00
Jeff Sharkey
23d8cb4a25 Merge "Introduce "unlocking" vs "unlocked" nuance." into nyc-dev am: 8c2fb9edae am: 35c6f6c70a 
am: c68126587a

* commit 'c68126587aab22d27cf6ad19a05cb58b5d1bad50':
  Introduce "unlocking" vs "unlocked" nuance.

Change-Id: I9a24147c091c7f370923e43148b78a855fcb43be
 2016-04-28 19:33:53 +00:00
Jeff Sharkey
c68126587a Merge "Introduce "unlocking" vs "unlocked" nuance." into nyc-dev am: 8c2fb9edae 
am: 35c6f6c70a

* commit '35c6f6c70a22987d0166500909f21d4d339dd1ae':
  Introduce "unlocking" vs "unlocked" nuance.

Change-Id: Ic288860b8edc814830fce958bbe2b0e93acecd78
 2016-04-28 19:25:31 +00:00
Jeff Sharkey
065be97490 Merge "Introduce "unlocking" vs "unlocked" nuance." into nyc-dev 
am: 8c2fb9edae

* commit '8c2fb9edae4413074186e3d84ccff0eba41b2cae':
  Introduce "unlocking" vs "unlocked" nuance.

Change-Id: Ibc26a4ee84531976e72cc30f2c2862be9a30d28b
 2016-04-28 19:24:58 +00:00
Kirill Grouchnikov
9df0846498 Aligning behavior of LinearLayout divider APIs 
Consistency for:
* Early return on calling setter with the current state
* Calling setWillNotDraw when divider is configured with drawable
and visible
* Calling requestLayout to trigger a relayout pass

Also fix a bug that wouldn't show end divider when all non-GONE
children have 0 width/height.

Bug: 28398719
Bug: 28404367
Change-Id: I16796c74a52ac4c3041390c75add2ec3c33bea8b
 2016-04-28 15:22:47 -04:00
TreeHugger Robot
8c2fb9edae Merge "Introduce "unlocking" vs "unlocked" nuance." into nyc-dev 2016-04-28 19:06:28 +00:00
Abodunrinwa Toki
51a8af680b Ensure FloatingToolbar is not rendered at negative x, y coordinates. 
Bug: 28343540
Change-Id: I550a1a2389a6f90525498962709f0c82e8e310ab
 2016-04-28 19:59:57 +01:00
Makoto Onuki
9ac59d0438 ShortcutManager: When app's data is cleared, remove all shortcuts, 
as if it's uninstalled.

Fixes 28196831

Change-Id: I1a410372f9e344a10567b00057fa0770eac9fd76
 2016-04-28 10:52:02 -07:00
Alan Viverette
2a993b4f6d Maintain internal consistency for TimePickerClockDelegate hour 
Hour was not updated correctly when a new hour was selected using the
radial picker or when AM/PM was changed, which prevented programmatic
calls from working.

Bug: 28398738
Change-Id: I0c1ffd9f9e569d980e72e74dc62568a56930afc4
 2016-04-28 12:56:09 -04:00
Jeff Sharkey
ce18c81677 Introduce "unlocking" vs "unlocked" nuance. 
There is a narrow window of time during user unlock where we're
reconciling user storage and dispatching the "unlock" status to
various internal system services.  While in this "unlocking" state,
apps need to be told that the user still isn't actually "unlocked"
so they don't try making calls to AccountManager, etc.

The majority of internal services are interested in merging together
both the "unlocking" and "unlocked" state, so update them.

Clarify naming in AccountManagerService to make it clear that a local
list is being used, which mirrors the naming in MountService.

To match UX/PM requested behavior, move PRE_BOOT_COMPLETED dispatch
after the user is unlocked, but block BOOT_COMPLETED dispatch until
after all PRE_BOOT receivers are finished to avoid ANRs.

Bug: 28040947, 28164677
Change-Id: I57af2351633d9159f4483f19657ce0b62118d1ce
 2016-04-28 10:51:39 -06:00
Jaewan Kim
ae78aede49 Merge "Merge "Prevent pinned stack from having extra elevation" into nyc-dev am: 0f01857 am: 6e6a6ee" into nyc-mr1-dev-plus-aosp 
am: c2be3ea

* commit 'c2be3ea7cdf0e4ae3f64bec94e937a53bd975094':
  Prevent pinned stack from having extra elevation

Change-Id: I33675b67b7d84eb23ffdec6c9a8e21cd19f3064c
 2016-04-28 15:21:24 +00:00
Jaewan Kim
6e6a6ee469 Merge "Prevent pinned stack from having extra elevation" into nyc-dev 
am: 0f01857

* commit '0f018570fff044bb68b8009815ae7e5c397d09fd':
  Prevent pinned stack from having extra elevation

Change-Id: If115698ec6168bfced727b7488cc38b833d4618a
 2016-04-28 15:13:14 +00:00
Michael Wright
98d75a2cb6 Merge "Properly parcel HdrCapabilities." into nyc-dev am: 5bddeaa am: b3324b4 
am: e5231fe

* commit 'e5231fed951f0ad24fe58604c56c4177d3d00902':
  Properly parcel HdrCapabilities.

Change-Id: I4b8cd07da559ce0ecef1ac48b6d2f4a58711a859
 2016-04-28 15:12:54 +00:00
Jaewan Kim
0f018570ff Merge "Prevent pinned stack from having extra elevation" into nyc-dev 2016-04-28 15:10:03 +00:00
Michael Wright
b3324b4a2e Merge "Properly parcel HdrCapabilities." into nyc-dev 
am: 5bddeaa

* commit '5bddeaa9bce6325c900eeabaa6a1cdfaf83910c6':
  Properly parcel HdrCapabilities.

Change-Id: I768887156c78cca859db6123a2bb184f12295ab0
 2016-04-28 15:05:44 +00:00
TreeHugger Robot
5bddeaa9bc Merge "Properly parcel HdrCapabilities." into nyc-dev 2016-04-28 15:01:31 +00:00
Chet Haase
5942619c00 Merge "Document behavior of object references in Animator classes" into nyc-dev am: faa5726 am: 5d9a186 
am: c66100f

* commit 'c66100fdc028b794bc47d136dddb451fad349cc3':
  Document behavior of object references in Animator classes

Change-Id: I6e2c252b837d20a1321b38d5012cbe66a690e73f
 2016-04-28 14:48:37 +00:00
Chet Haase
5d9a186435 Merge "Document behavior of object references in Animator classes" into nyc-dev 
am: faa5726

* commit 'faa572608c7d62b116d3b9c6f28bd7eaddf8dba2':
  Document behavior of object references in Animator classes

Change-Id: Ic57273c1be809c14a642993ac09e203c1fb7247b
 2016-04-28 14:41:43 +00:00
Chet Haase
faa572608c Merge "Document behavior of object references in Animator classes" into nyc-dev 2016-04-28 14:33:35 +00:00
Alex Hills
ffb555b039 Merge "Move allowGeneratedReplies to Action" into nyc-dev am: 9de0f87 am: 2a1a315 
am: 76a560c

* commit '76a560cab14a08beac287f2f02139f7c6dc962d2':
  Move allowGeneratedReplies to Action

Change-Id: I10055fa54d58f86bb186ff249de587e08d6d9d7f
 2016-04-28 13:54:08 +00:00
Alex Hills
2a1a315713 Merge "Move allowGeneratedReplies to Action" into nyc-dev 
am: 9de0f87

* commit '9de0f87e9708f86b46a3c38d4d091c2bc1ba9885':
  Move allowGeneratedReplies to Action

Change-Id: Ic391eb188644107aaa3401bf2a7d64f6ce867a76
 2016-04-28 13:46:34 +00:00