Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
156,218 Commits 3 Branches 0 Tags
6fefb49f267eb7bfb8a074e8ff28e98a8a9571bc
Commit Graph

58792 Commits

Author SHA1 Message Date
Robert Greenwalt
a70efa5036 am 8fcbaddd: am d0675e37: Merge "Add NetworkAgent event for ExplicitlySelected" into lmp-dev 
* commit '8fcbaddd331b2b87698bc61c3bef0cdf439c31da':
  Add NetworkAgent event for ExplicitlySelected
 2014-09-17 00:23:08 +00:00
Robert Greenwalt
42a69ffa04 am d0675e37: Merge "Add NetworkAgent event for ExplicitlySelected" into lmp-dev 
* commit 'd0675e37718d3223623e4fbf0f5e8e0e46c10d5f':
  Add NetworkAgent event for ExplicitlySelected
 2014-09-17 00:13:14 +00:00
Adrian Roos
571ca37d0f am 3c782941: am 8f4cafc2: Merge "Fix broken dispatch of onApplyWindowInsets" into lmp-dev 
* commit '3c782941ff6b684fe417c5c737e012342a778850':
  Fix broken dispatch of onApplyWindowInsets
 2014-09-17 00:06:21 +00:00
Robert Greenwalt
e7b26be378 Merge "Add NetworkAgent event for ExplicitlySelected" into lmp-dev 2014-09-17 00:06:03 +00:00
Robert Greenwalt
e73cc4646b Add NetworkAgent event for ExplicitlySelected 
Lets Wifi tell us when the user selected this AP vs auto-connected.

bug:17396168
Change-Id: I6e067ab62ed49040629aa31fe07ff880d3d542f0
 2014-09-16 17:03:59 -07:00
Brian Attwell
e3a742f5a0 am 942be889: am 56d143ae: Merge "Pass different dy into dispatchNestedSCroll" into lmp-dev 
* commit '942be889125d2530091f192a8872009580594313':
  Pass different dy into dispatchNestedSCroll
 2014-09-16 23:58:09 +00:00
Adrian Roos
aa52631f7c am 8f4cafc2: Merge "Fix broken dispatch of onApplyWindowInsets" into lmp-dev 
* commit '8f4cafc281eb2c40b409f86ad276b4337f5fd317':
  Fix broken dispatch of onApplyWindowInsets
 2014-09-16 23:58:06 +00:00
Brian Attwell
9958a3ad32 am 56d143ae: Merge "Pass different dy into dispatchNestedSCroll" into lmp-dev 
* commit '56d143ae20eb731d2826fe6efdf330f3c7c14071':
  Pass different dy into dispatchNestedSCroll
 2014-09-16 23:45:41 +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
ztenghui
7085d44c31 am 174d2fbd: am 0fed84e1: Merge "Update the progress bar to square instead of round lineCap" into lmp-dev 
* commit '174d2fbd82cd3550393400e16459e62e4680e6c0':
  Update the progress bar to square instead of round lineCap
 2014-09-16 23:42:46 +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
8058f9774f 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:15 +00:00
Alan Viverette
5a4b2bf9b2 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:10 +00:00
Alan Viverette
d82fa0d3c8 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:03 +00:00
ztenghui
d1df07897e am 0fed84e1: Merge "Update the progress bar to square instead of round lineCap" into lmp-dev 
* commit '0fed84e1e4674353892143103ba0ebdf36b0c71d':
  Update the progress bar to square instead of round lineCap
 2014-09-16 23:29:58 +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
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
ztenghui
f74879fb4d Merge "Update the progress bar to square instead of round lineCap" into lmp-dev 2014-09-16 23:18:37 +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
Alan Viverette
6a3276e05a am 53e29e82: am af3be19b: Merge "Increase clock and calendar haptic feedback durations" into lmp-dev 
* commit '53e29e820ad9eead4453a3959471edd6658f9f75':
  Increase clock and calendar haptic feedback durations
 2014-09-16 23:14:40 +00:00
Robert Greenwalt
b4e0593c22 am c8f6ad36: Merge "Report Network status to NetworkAgent." into lmp-dev 
* commit 'c8f6ad366accbe6bf90d30d4e2d4f924552d731a':
  Report Network status to NetworkAgent.
 2014-09-16 23:05:56 +00:00
Craig Mautner
f9f5f56488 am 880d88b3: Merge "Restore changes that were needed." into lmp-dev 
* commit '880d88b308c73a598578f39892a3f01c201d9314':
  Restore changes that were needed.
 2014-09-16 23:00:20 +00:00
Alan Viverette
f1482579ed am af3be19b: Merge "Increase clock and calendar haptic feedback durations" into lmp-dev 
* commit 'af3be19be22193bd8431cc5c65f119e4b651368a':
  Increase clock and calendar haptic feedback durations
 2014-09-16 23:00:15 +00:00
Robert Greenwalt
b4f601cb84 Merge "Report Network status to NetworkAgent." into lmp-dev 2014-09-16 22:59:33 +00:00
Craig Mautner
fb1bf84165 Merge "Restore changes that were needed." into lmp-dev 2014-09-16 22:53:34 +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
Alan Viverette
dc7df6497a Merge "Increase clock and calendar haptic feedback durations" into lmp-dev 2014-09-16 22:50:45 +00: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
Brian Attwell
e0e4217330 Pass different dy into dispatchNestedSCroll 
Bug: 16462679
Bug: 17529919
Change-Id: I328457a27507253cc7bfeab0e2daa4d4563aab17
 2014-09-16 22:48:27 +00:00
ztenghui
77a12e897e Update the progress bar to square instead of round lineCap 
b/17206751

Change-Id: I4125a1e677d2888ad1c3580dc44d5983e623cda7
 2014-09-16 15:41:42 -07: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
ef8bccd998 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:11 +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
Alan Viverette
82ed5df115 Increase clock and calendar haptic feedback durations 
Some devices don't handle sub-15ms vibration durations very well.

BUG: 17511995
Change-Id: I2212ed9f37f3446e6f4ac5985906294121d39a9d
 2014-09-16 15:08:10 -07: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
Craig Mautner
0760090e18 am 459b2ba5: Merge "Fix various bugs in DatePickerCalendarDelegate" into lmp-dev 
* commit '459b2ba58c771d67f8d119b241e8dc4f7958dd97':
  Fix various bugs in DatePickerCalendarDelegate
 2014-09-16 21:40:38 +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
Craig Mautner
9c26b54d3c Fix various bugs in DatePickerCalendarDelegate 
These bugs were exposed by cts DatePickerTest.

Fixes one item in 17459129.

Change-Id: Ifab52c6e6e760b75633aa4fe8ccf2d724f587e09
 2014-09-16 13:57:59 -07:00
Amit Mahajan
fa2beb4128 am c5429d6f: Merge "Use Op package name when creating toasts" into lmp-dev 
* commit 'c5429d6feab77ad1e426afb5bddc6fcfda06d37e':
  Use Op package name when creating toasts
 2014-09-16 20:57:09 +00:00
Amit Mahajan
915a666c21 Merge "Use Op package name when creating toasts" into lmp-dev 2014-09-16 20:47:24 +00:00
Alan Viverette
dcfe464fbf am ab9cbf1c: am 7194361c: Merge "Properly handle dispatchRestoreInstanceState for new-style DatePicker" into lmp-dev 
* commit 'ab9cbf1ca187453910ceca717e54843c7494cb98':
  Properly handle dispatchRestoreInstanceState for new-style DatePicker
 2014-09-16 18:13:53 +00:00