Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,605 Commits 3 Branches 0 Tags
38b5d057f08a1a05df44f94de1053f74739c6677
Commit Graph

48524 Commits

Author SHA1 Message Date
Brian Attwell
598c4f9329 am 56d143ae: Merge "Pass different dy into dispatchNestedSCroll" into lmp-dev 
* commit '56d143ae20eb731d2826fe6efdf330f3c7c14071':
  Pass different dy into dispatchNestedSCroll
 2014-09-16 23:45:03 +00:00
Alan Viverette
1ebc3fb56b am 36c132a8: am 67798394: Merge "Preserve NPE behavior of removed TextView.getTextColors() API" into lmp-dev 
* commit '36c132a84be88e395e567c66ccc897c6fe628c62':
  Preserve NPE behavior of removed TextView.getTextColors() API
 2014-09-16 23:43:02 +00:00
Alan Viverette
03b51f427f am 17f9b8d6: am 07e867a0: Merge "Fix TimePicker.setCurrentHour() when argument is 0" into lmp-dev 
* commit '17f9b8d6f921dd2c8ce5f265645e63919d9dd474':
  Fix TimePicker.setCurrentHour() when argument is 0
 2014-09-16 23:42:57 +00:00
Alan Viverette
ae1bd20274 am f335590a: am 37cbd74a: Merge "Ensure we always have valid colors in CaptionStyle" into lmp-dev 
* commit 'f335590ac08e1bfa9f38e21c1157c8fc1799a5d9':
  Ensure we always have valid colors in CaptionStyle
 2014-09-16 23:42:51 +00:00
Adrian Roos
543f21da46 Merge "Fix broken dispatch of onApplyWindowInsets" into lmp-dev 2014-09-16 23:42:40 +00:00
Brian Attwell
5665c0f265 Merge "Pass different dy into dispatchNestedSCroll" into lmp-dev 2014-09-16 23:33:24 +00:00
Alan Viverette
56debf9a14 am 67798394: Merge "Preserve NPE behavior of removed TextView.getTextColors() API" into lmp-dev 
* commit '67798394819f1b8af9afb8f35fda0d0f0552f027':
  Preserve NPE behavior of removed TextView.getTextColors() API
 2014-09-16 23:30:54 +00:00
Alan Viverette
e748ca5dc9 am 07e867a0: Merge "Fix TimePicker.setCurrentHour() when argument is 0" into lmp-dev 
* commit '07e867a059a6bef19fb92663d02a03a90cd356e8':
  Fix TimePicker.setCurrentHour() when argument is 0
 2014-09-16 23:30:50 +00:00
Alan Viverette
6acb495af2 am 37cbd74a: Merge "Ensure we always have valid colors in CaptionStyle" into lmp-dev 
* commit '37cbd74ad6dc3c7639e2ce8200ca40a2acc275ef':
  Ensure we always have valid colors in CaptionStyle
 2014-09-16 23:30:46 +00:00
Alan Viverette
af8e823d99 Merge "Preserve NPE behavior of removed TextView.getTextColors() API" into lmp-dev 2014-09-16 23:25:07 +00:00
Robert Greenwalt
e005484686 am 9cf27ca7: am ee48c9ef: am c8f6ad36: Merge "Report Network status to NetworkAgent." into lmp-dev 
* commit '9cf27ca78c65ceb87f17b7f731880a0530400400':
  Report Network status to NetworkAgent.
 2014-09-16 23:23:38 +00:00
Craig Mautner
0a6a8c2c30 am 38cdb78a: am b23fec37: am 880d88b3: Merge "Restore changes that were needed." into lmp-dev 
* commit '38cdb78a5cc2eacbb09bf7da1cbd956d78cd0f3e':
  Restore changes that were needed.
 2014-09-16 23:23:31 +00:00
Alan Viverette
4813482324 Merge "Fix TimePicker.setCurrentHour() when argument is 0" into lmp-dev 2014-09-16 23:23:23 +00:00
Alan Viverette
96f26b8039 Merge "Ensure we always have valid colors in CaptionStyle" into lmp-dev 2014-09-16 23:20:28 +00:00
Robert Greenwalt
390a961720 am ee48c9ef: am c8f6ad36: Merge "Report Network status to NetworkAgent." into lmp-dev 
* commit 'ee48c9ef54a884cd7f2162163252c1bf156a0a2d':
  Report Network status to NetworkAgent.
 2014-09-16 23:14:50 +00:00
Craig Mautner
6e85aada76 am b23fec37: am 880d88b3: Merge "Restore changes that were needed." into lmp-dev 
* commit 'b23fec371a22975abfb5a2951b4cf05d4b7238f2':
  Restore changes that were needed.
 2014-09-16 23:14:46 +00:00
Martijn Coenen
5e991a129c Upper-case incoming AIDs. 
This fixes scenarios where different services
register the same AID in a different case, and
we don't see any conflict.

Bug: 16517161
Change-Id: I610b585ce7d57b4e32c21004a1d4c50e1133986a
 2014-09-16 16:06:45 -07:00
Robert Greenwalt
9d1723558b am c8f6ad36: Merge "Report Network status to NetworkAgent." into lmp-dev 
* commit 'c8f6ad366accbe6bf90d30d4e2d4f924552d731a':
  Report Network status to NetworkAgent.
 2014-09-16 23:05:35 +00:00
Craig Mautner
ea0dbf3fa2 am 880d88b3: Merge "Restore changes that were needed." into lmp-dev 
* commit '880d88b308c73a598578f39892a3f01c201d9314':
  Restore changes that were needed.
 2014-09-16 23:00:11 +00:00
Robert Greenwalt
b4f601cb84 Merge "Report Network status to NetworkAgent." into lmp-dev 2014-09-16 22:59:33 +00:00
Alan Viverette
f1820064d9 Ensure we always have valid colors in CaptionStyle 
BUG: 17521623
Change-Id: I861aa189970fc14dd3e4426e5487a14f373d3a2e
 2014-09-16 15:53:33 -07:00
Craig Mautner
a67d9095b7 Restore changes that were needed. 
Reverting the changes in ag/548487 also reverted alanv's changes
in ag/547793. This restores alanv's changes.

Fixes build.

Change-Id: Ifa2aa928a3ad29fe49e52dbec4e4833538dfe7e9
 2014-09-16 15:50:32 -07:00
Craig Mautner
74f640acc8 am b2f4f5e0: am e80f40c5: am b53e4c4a: Merge "Revert "Fix various bugs in DatePickerCalendarDelegate"" into lmp-dev 
* commit 'b2f4f5e02c4471e5154c239c866713e4939c9b59':
  Revert "Fix various bugs in DatePickerCalendarDelegate"
 2014-09-16 22:48:57 +00:00
Brian Attwell
e0e4217330 Pass different dy into dispatchNestedSCroll 
Bug: 16462679
Bug: 17529919
Change-Id: I328457a27507253cc7bfeab0e2daa4d4563aab17
 2014-09-16 22:48:27 +00:00
Alan Viverette
fe16787bd4 Preserve NPE behavior of removed TextView.getTextColors() API 
BUG: 17511449
Change-Id: Iea7e9aed69c21b230e3c474d4c1378a8663cfcb1
 2014-09-16 15:41:27 -07:00
Craig Mautner
884d31943c am e80f40c5: am b53e4c4a: Merge "Revert "Fix various bugs in DatePickerCalendarDelegate"" into lmp-dev 
* commit 'e80f40c5e86fff5ce075082b8ecbf23ea429f1dd':
  Revert "Fix various bugs in DatePickerCalendarDelegate"
 2014-09-16 22:39:06 +00:00
Craig Mautner
a0610d425f am b53e4c4a: Merge "Revert "Fix various bugs in DatePickerCalendarDelegate"" into lmp-dev 
* commit 'b53e4c4a3879b0a3e649e62a07734643ee3122ae':
  Revert "Fix various bugs in DatePickerCalendarDelegate"
 2014-09-16 22:24:10 +00:00
Craig Mautner
704991224d Merge "Revert "Fix various bugs in DatePickerCalendarDelegate"" into lmp-dev 2014-09-16 22:16:29 +00:00
Craig Mautner
706b3547f8 Revert "Fix various bugs in DatePickerCalendarDelegate" 
alanv@ fixed this yesterday.

This reverts commit 82537efa4c5f4aad12b9aa249fb27eda21647f39.

Change-Id: If2b91ee36f8b24f695200ac1a87a306246ee5e44
 2014-09-16 22:13:39 +00:00
Craig Mautner
e538dee34b am 0e61d238: am 48ae7ee3: am 459b2ba5: Merge "Fix various bugs in DatePickerCalendarDelegate" into lmp-dev 
* commit '0e61d23833c42448311b12808adb313d5e2b599d':
  Fix various bugs in DatePickerCalendarDelegate
 2014-09-16 22:08:50 +00:00
Craig Mautner
3cb639d471 am 48ae7ee3: am 459b2ba5: Merge "Fix various bugs in DatePickerCalendarDelegate" into lmp-dev 
* commit '48ae7ee3f980c811bf0ff8fc9e9797133d9bc3a5':
  Fix various bugs in DatePickerCalendarDelegate
 2014-09-16 21:51:50 +00:00
Amit Mahajan
f52c5d2551 am c270edd8: am 5807817d: am c5429d6f: Merge "Use Op package name when creating toasts" into lmp-dev 
* commit 'c270edd80be9643d3928c97600334df227642e62':
  Use Op package name when creating toasts
 2014-09-16 21:46:28 +00:00
Craig Mautner
f5c84c8622 am 459b2ba5: Merge "Fix various bugs in DatePickerCalendarDelegate" into lmp-dev 
* commit '459b2ba58c771d67f8d119b241e8dc4f7958dd97':
  Fix various bugs in DatePickerCalendarDelegate
 2014-09-16 21:40:31 +00:00
Amit Mahajan
7c511fee3f am 5807817d: am c5429d6f: Merge "Use Op package name when creating toasts" into lmp-dev 
* commit '5807817d293e705c23fa062db22345323da8d372':
  Use Op package name when creating toasts
 2014-09-16 21:34:59 +00:00
Craig Mautner
f6b4254bef Merge "Fix various bugs in DatePickerCalendarDelegate" into lmp-dev 2014-09-16 21:30:29 +00:00
Adrian Roos
39381948b9 Fix broken dispatch of onApplyWindowInsets 
Fixes an issue where window insets were not further dispatched
if all happen to be zero. To prevent further dispatch, the
insets must now be consumed explicitly.

Bug: 17522145
Change-Id: Ia8f6c10c8369b58db7a7cf49f8bcc2cab8e304f1
 2014-09-16 23:09:33 +02:00
Martijn Coenen
93c08d9dba am b2a1f834: am 31c99f2a: am 648281cf: am cd108cbe: Merge "AID prefix registration." into lmp-dev 
* commit 'b2a1f834ab415d8d781ebae0e001dba5f4ad466a':
  AID prefix registration.
 2014-09-16 21:09:12 +00:00
Edward Jee
7f06e76389 am 61cde9ec: am cbb8f574: am f8c4ffa3: am c172b209: Merge "Adds APIs for Bluetooth PBAP and MAP access permission." into lmp-dev 
* commit '61cde9ec5b964a1041685a0c1ae0e225f4b2707c':
  Adds APIs for Bluetooth PBAP and MAP access permission.
 2014-09-16 21:08:33 +00:00
Igor Murashkin
573eede22f am 2747a375: am d510de9f: am 3615cb06: am 6d2cca33: Merge "camera2-legacy: Fix jpeg thumbnail quality not being set" into lmp-dev 
* commit '2747a375aefba5ede12a7c321c2d0ea4aacbc78a':
  camera2-legacy: Fix jpeg thumbnail quality not being set
 2014-09-16 21:08:29 +00:00
Adam Lesinski
30b9e90a12 am 221544f9: am 4f1f2dc4: am 17e0218d: am 1416621b: Merge "Show the lockscreen when more than 1 user is present" into lmp-dev 
* commit '221544f9a673ec4f157a1c760cf5a47cb9c336f1':
  Show the lockscreen when more than 1 user is present
 2014-09-16 21:08:24 +00:00
Eino-Ville Talvala
b32ab8491f am 6ac529d2: am 5467f4f1: am b18fdbb1: am 3703cae1: Merge "Camera2: Check for sequence complete sooner." into lmp-dev 
* commit '6ac529d2aff9b16d2effc2c6e9db8a842c057495':
  Camera2: Check for sequence complete sooner.
 2014-09-16 21:08:20 +00:00
Alan Viverette
ac765b0097 am 31ae7352: am 99d0dbb3: am e656192b: am 1375db70: Merge "Always apply ImageView\'s tint attribute using SRC_ATOP by default" into lmp-dev 
* commit '31ae7352cc5ae8f9d46c76384bde1586283bee70':
  Always apply ImageView's tint attribute using SRC_ATOP by default
 2014-09-16 21:08:15 +00:00
Yohei Yukawa
f4bc3ba7f8 am ea4cc661: am 9c0fe70f: am 5d36afad: am 8219934a: Merge "Minimize the number of default enabled IMEs part 3" into lmp-dev 
* commit 'ea4cc66116f9ae5873c63214d7751294333e965c':
  Minimize the number of default enabled IMEs part 3
 2014-09-16 21:08:06 +00:00
Ang Li
e61b8a094a am 07892ce9: am 1bac39de: am f24f708c: am 36fdf64f: Merge "Fix a typo in comment." into lmp-dev 
* commit '07892ce97078b28ae38063d458bc0af6f5e72f4c':
  Fix a typo in comment.
 2014-09-16 21:08:01 +00:00
Adam Powell
8312978af7 am e4abf3f9: am d2b93415: am 752021f9: am 3b2dfa7a: Merge "Treat empty string as title-set in ToolbarWidgetWrapper" into lmp-dev 
* commit 'e4abf3f9628fd34c7d4f98951ab7b1fb7e6bc63c':
  Treat empty string as title-set in ToolbarWidgetWrapper
 2014-09-16 21:07:57 +00:00
Adam Powell
d16d3ad715 am 28ac06fe: am 2ac58db5: am e608ab91: am 17ec7920: Merge "Finish materializing dialogs" into lmp-dev 
* commit '28ac06fe0b355ba4efff5d94c1f74a07e176c735':
  Finish materializing dialogs
 2014-09-16 21:07:49 +00:00
Chet Haase
235ee2d80a am 5d550b24: am fc75e5c9: am da8b72c4: am 4b20b031: Merge "Avoid invalidating view during some outline invalidations" into lmp-dev 
* commit '5d550b2473351dc17f40627f6c02a979a5ec6003':
  Avoid invalidating view during some outline invalidations
 2014-09-16 21:07:32 +00:00
Jeff Sharkey
cc3ba950cc am 3de2d914: am 5ec46e9e: am 30a8045d: am 1d98fbf2: Merge "Update API naming to follow style guide." into lmp-dev 
* commit '3de2d9144e7f88a20e62c07999aa94789f4ad2e6':
  Update API naming to follow style guide.
 2014-09-16 21:07:22 +00:00
Chris Craik
29b964db7b am 64d546f2: am 52f7afb1: am 30d4b396: am 447f8cd8: Merge "Enable shadow for GhostView" into lmp-dev 
* commit '64d546f2ec55cd7bc8de47272e80bdb9f5526b1a':
  Enable shadow for GhostView
 2014-09-16 21:07:12 +00:00
Ihab Awad
751b766747 am 5a2462c2: am d03f89c6: am d61d9150: am 336c84c3: Merge "Add system feature for ConnectionService API support (1/3)" into lmp-dev 
* commit '5a2462c2fa163b426e6016804ffc7d40022048b7':
  Add system feature for ConnectionService API support (1/3)
 2014-09-16 21:07:02 +00:00