Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
158,565 Commits 3 Branches 0 Tags
2135d189e37ef599faa464cab6f3e253bb7c2004
Commit Graph

44770 Commits

Author SHA1 Message Date
Yigit Boyar
97e853d00c am 28d73a51: am 98171686: am bb837c51: am 7fa36f26: Merge "Handle action mode changes properly for actionbar tabs" into lmp-dev 
* commit '28d73a5176225216f1105a6a0910c04383db44cd':
  Handle action mode changes properly for actionbar tabs
 2014-09-17 21:42:21 +00:00
Yigit Boyar
27abd85f5c am 7fa36f26: Merge "Handle action mode changes properly for actionbar tabs" into lmp-dev 
* commit '7fa36f26c6705346e41f81f6d3f2f8a22dd3b42c':
  Handle action mode changes properly for actionbar tabs
 2014-09-17 21:08:23 +00:00
Yigit Boyar
fd20f196b1 Merge "Handle action mode changes properly for actionbar tabs" into lmp-dev 2014-09-17 21:00:40 +00:00
Sandeep Siddhartha
b1a7ddfe54 am 2ee987c0: am fd719cfd: am aea51189: am e80c6f17: Merge "Fix issues with multiple languages and multi-users" into lmp-dev 
* commit '2ee987c02239e6ebe1232505e3b9f9bd72d39a8a':
  Fix issues with multiple languages and multi-users
 2014-09-17 20:51:01 +00:00
Sandeep Siddhartha
329489abdd am e80c6f17: Merge "Fix issues with multiple languages and multi-users" into lmp-dev 
* commit 'e80c6f17079155855aa11eae47b619af0ebb591c':
  Fix issues with multiple languages and multi-users
 2014-09-17 20:21:05 +00:00
Sandeep Siddhartha
80ea66b102 Merge "Fix issues with multiple languages and multi-users" into lmp-dev 2014-09-17 20:06:43 +00:00
Jeff Sharkey
2c1f97e1a7 am d4a9f511: am eec860ae: am a7b20bba: am bfd9a30f: Merge "NetworkStats always needs arrays." into lmp-dev 
* commit 'd4a9f511ba4e960836d951efeaa1a672d8869a32':
  NetworkStats always needs arrays.
 2014-09-17 19:48:17 +00:00
Jeff Sharkey
9213ab323b am bfd9a30f: Merge "NetworkStats always needs arrays." into lmp-dev 
* commit 'bfd9a30f528dff00ae925a0e1f0ec18f669b3f1b':
  NetworkStats always needs arrays.
 2014-09-17 19:12:05 +00:00
Jeff Sharkey
9d375ecbe6 Merge "NetworkStats always needs arrays." into lmp-dev 2014-09-17 19:01:13 +00:00
Jeff Sharkey
7a8f1a32dc NetworkStats always needs arrays. 
Internal logic relies on Arrays.copyOf(), so always give ourselves
valid arrays, using shared empty objects to save overhead.

Bug: 17502649
Change-Id: I5dbb00545bdfe45bbd48144ab505ea08cc92cbcd
 2014-09-17 09:26:31 -07:00
Robert Greenwalt
dde45a4cf3 am e6068c9b: am 82c8eb07: am 061ac1be: am d0675e37: Merge "Add NetworkAgent event for ExplicitlySelected" into lmp-dev 
* commit 'e6068c9bf5675d02cc2aefff011c06542362fe74':
  Add NetworkAgent event for ExplicitlySelected
 2014-09-17 14:14:49 +00:00
Adrian Roos
7a05448801 am 8eaf99a9: am 81171856: am bf665282: am 8f4cafc2: Merge "Fix broken dispatch of onApplyWindowInsets" into lmp-dev 
* commit '8eaf99a9a5a3062e928ee9c3025c12c31c57b7d8':
  Fix broken dispatch of onApplyWindowInsets
 2014-09-17 14:14:26 +00:00
Brian Attwell
d0b62be2b7 am 827cb4a2: am 579aff33: am 9c943a94: am 56d143ae: Merge "Pass different dy into dispatchNestedSCroll" into lmp-dev 
* commit '827cb4a224028e8b05ec5e864ce94abd81e23e82':
  Pass different dy into dispatchNestedSCroll
 2014-09-17 14:14:21 +00:00
Alan Viverette
fb632571f4 am a19e77b2: am a6b5de59: am b22bd84e: am 67798394: Merge "Preserve NPE behavior of removed TextView.getTextColors() API" into lmp-dev 
* commit 'a19e77b242c326129509b7fc442d5e54204c90f4':
  Preserve NPE behavior of removed TextView.getTextColors() API
 2014-09-17 14:13:58 +00:00
Alan Viverette
e6ac6e1559 am e58f16ec: am ab1770df: am 86633337: am 07e867a0: Merge "Fix TimePicker.setCurrentHour() when argument is 0" into lmp-dev 
* commit 'e58f16ecb903eb4ca280d427a77a4c3c49a6926f':
  Fix TimePicker.setCurrentHour() when argument is 0
 2014-09-17 14:13:54 +00:00
Alan Viverette
14ce2dded0 am 084a8ea4: am b3a5b02a: am 27cf6cec: am 37cbd74a: Merge "Ensure we always have valid colors in CaptionStyle" into lmp-dev 
* commit '084a8ea4729c13f791015adb6c284bc3111f2796':
  Ensure we always have valid colors in CaptionStyle
 2014-09-17 14:13:49 +00:00
Robert Greenwalt
1fd891b8b6 am 4b975101: am 46d6a418: am 3a68c1e8: am c8f6ad36: Merge "Report Network status to NetworkAgent." into lmp-dev 
* commit '4b9751019ff25b61b84e2a8c6955f38d727efb73':
  Report Network status to NetworkAgent.
 2014-09-17 14:13:31 +00:00
Craig Mautner
b4475e4d65 am fa26c157: am 0fb3fdab: am bfff2d63: am 880d88b3: Merge "Restore changes that were needed." into lmp-dev 
* commit 'fa26c15724693e90c6c32486cb0f4ec6f3fcc0a6':
  Restore changes that were needed.
 2014-09-17 14:13:27 +00:00
Craig Mautner
04f83f6577 am 05216ac8: am 675a6e4d: am 3d94fdac: am b53e4c4a: Merge "Revert "Fix various bugs in DatePickerCalendarDelegate"" into lmp-dev 
* commit '05216ac82ab73b3b0db3804516036d7902bbe380':
  Revert "Fix various bugs in DatePickerCalendarDelegate"
 2014-09-17 14:13:10 +00:00
Craig Mautner
57377f37ec am 16600a52: am 73ccaa21: am af31daa1: am 459b2ba5: Merge "Fix various bugs in DatePickerCalendarDelegate" into lmp-dev 
* commit '16600a52c33168c83208d5227996c4a553e343dd':
  Fix various bugs in DatePickerCalendarDelegate
 2014-09-17 14:12:40 +00:00
Amit Mahajan
259d00f4a8 am 56a22fcf: am b2697356: am d425fd52: am c5429d6f: Merge "Use Op package name when creating toasts" into lmp-dev 
* commit '56a22fcfaf55f726e4dbb6cc4de7d4b74c6db745':
  Use Op package name when creating toasts
 2014-09-17 14:12:22 +00:00
Alan Viverette
ed65432aa3 am 8823d2cc: am f01a39bf: am 5191c40b: am 7194361c: Merge "Properly handle dispatchRestoreInstanceState for new-style DatePicker" into lmp-dev 
* commit '8823d2cc48d52d6aea3f3233d9bf44d302757763':
  Properly handle dispatchRestoreInstanceState for new-style DatePicker
 2014-09-17 05:14:55 +00:00
Jorim Jaggi
027eb7c874 am fb2fa955: am 185055cb: am dc29e524: am ac980443: Merge "Use RenderThread for navigation bar ripples" into lmp-dev 
* commit 'fb2fa955e92e6066e21badebf16259acdcebae12':
  Use RenderThread for navigation bar ripples
 2014-09-17 05:14:49 +00:00
Martijn Coenen
181e1cab56 am 6d1b1735: am 616273b6: am 0268b22d: am 415ef692: Merge "Fix static AID prefix registration." into lmp-dev 
* commit '6d1b17352ede80eb46f2c79afd267d5d6460f0d4':
  Fix static AID prefix registration.
 2014-09-17 05:14:32 +00:00
Yigit Boyar
2bbad0cddc Handle action mode changes properly for actionbar tabs 
Bug: 17513613
Change-Id: I4ebcadc618558153b72bf577232adc3e616adb6b
 2014-09-16 18:28:03 -07:00
Robert Greenwalt
9e1d9f0fb2 am d0675e37: Merge "Add NetworkAgent event for ExplicitlySelected" into lmp-dev 
* commit 'd0675e37718d3223623e4fbf0f5e8e0e46c10d5f':
  Add NetworkAgent event for ExplicitlySelected
 2014-09-17 00:13:54 +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
Adrian Roos
d804482660 am 8f4cafc2: Merge "Fix broken dispatch of onApplyWindowInsets" into lmp-dev 
* commit '8f4cafc281eb2c40b409f86ad276b4337f5fd317':
  Fix broken dispatch of onApplyWindowInsets
 2014-09-16 23:58:07 +00:00
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
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
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
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
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
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
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
Craig Mautner
f6b4254bef Merge "Fix various bugs in DatePickerCalendarDelegate" into lmp-dev 2014-09-16 21:30:29 +00:00