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

45309 Commits

Author SHA1 Message Date
Alan Viverette
3d5891998e am 668b84e3: am 17f9b8d6: am 07e867a0: Merge "Fix TimePicker.setCurrentHour() when argument is 0" into lmp-dev 
* commit '668b84e3b7d8de449d044860c6aa63b71440eb74':
  Fix TimePicker.setCurrentHour() when argument is 0
 2014-09-16 23:54:38 +00:00
Alan Viverette
53f35ed0fe am bc20edeb: am f335590a: am 37cbd74a: Merge "Ensure we always have valid colors in CaptionStyle" into lmp-dev 
* commit 'bc20edebdaf20eed839585808e39daa4750c6316':
  Ensure we always have valid colors in CaptionStyle
 2014-09-16 23:54:33 +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
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
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
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
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
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
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
915a666c21 Merge "Use Op package name when creating toasts" into lmp-dev 2014-09-16 20:47:24 +00:00
Alan Viverette
59be81c885 am 66e53f10: am ab9cbf1c: am 7194361c: Merge "Properly handle dispatchRestoreInstanceState for new-style DatePicker" into lmp-dev 
* commit '66e53f104dd6be534271331eb53eace92f641d73':
  Properly handle dispatchRestoreInstanceState for new-style DatePicker
 2014-09-16 18:30:37 +00:00
Jorim Jaggi
34ef9ec8d2 am 99e9b12f: am d2420d39: am ac980443: Merge "Use RenderThread for navigation bar ripples" into lmp-dev 
* commit '99e9b12fbe444414f7e4fd9a18aa40fee7bf2f1f':
  Use RenderThread for navigation bar ripples
 2014-09-16 18:30:32 +00:00
Martijn Coenen
91c394544c am a90f7071: am 351005d2: am 415ef692: Merge "Fix static AID prefix registration." into lmp-dev 
* commit 'a90f7071495e67ce270a61ca691b92435134af4e':
  Fix static AID prefix registration.
 2014-09-16 18:30:20 +00:00
Martijn Coenen
43b8ef27b4 am d58331eb: am a31aeb6d: am cd108cbe: Merge "AID prefix registration." into lmp-dev 
* commit 'd58331ebf0a637f517780eee36d8c2f4103cbda5':
  AID prefix registration.
 2014-09-16 18:15:43 +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
Jorim Jaggi
0768029b74 am d2420d39: am ac980443: Merge "Use RenderThread for navigation bar ripples" into lmp-dev 
* commit 'd2420d39c03c17ec62b283e5a99c33ff1360926f':
  Use RenderThread for navigation bar ripples
 2014-09-16 18:13:46 +00:00
Martijn Coenen
7937d50853 am 351005d2: am 415ef692: Merge "Fix static AID prefix registration." into lmp-dev 
* commit '351005d2eb4573de8aeeed79e97f5338e6f5c1f2':
  Fix static AID prefix registration.
 2014-09-16 18:13:36 +00:00
Martijn Coenen
1ab1452a35 am a31aeb6d: am cd108cbe: Merge "AID prefix registration." into lmp-dev 
* commit 'a31aeb6da916e1bc22b25d9ec6940b7cde24ec2f':
  AID prefix registration.
 2014-09-16 18:02:43 +00:00
Alan Viverette
328c630ab6 Merge "Properly handle dispatchRestoreInstanceState for new-style DatePicker" into lmp-dev 2014-09-16 17:55:31 +00:00
Jorim Jaggi
072707dfad Use RenderThread for navigation bar ripples 
Bug: 17506181
Change-Id: Icf3b80f8c4bc29fe85313381d4019dda3ef85ea9
 2014-09-16 17:51:55 +00:00
Martijn Coenen
9ed2d5f746 Merge "Fix static AID prefix registration." into lmp-dev 2014-09-16 17:40:30 +00:00
Tony Hill
929442d509 Use Op package name when creating toasts 
Some components may be running in processes other than their
base package using android:process directives. The op package
name must therefore be used otherwise the AppOps check will fail
due to a mismatch between the base package name and the UID.

Bug: 17431423
Change-Id: I429aa46066935b964151a2ec0854f0e14c117c4e
 2014-09-16 10:16:43 -07:00
Martijn Coenen
0985fb6c42 Fix static AID prefix registration. 
Bug: 16517161
Change-Id: Ibaddf8720907f1d28d44231d927f538628bbf9d0
 2014-09-16 10:09:12 -07:00
Martijn Coenen
7e25a504d4 Merge "AID prefix registration." into lmp-dev 2014-09-16 14:55:04 +00:00
Edward Jee
f067f8fb16 am 84d05ed5: am 8a20c56f: am c172b209: Merge "Adds APIs for Bluetooth PBAP and MAP access permission." into lmp-dev 
* commit '84d05ed5a229186c7859013327887f6af7ef4a29':
  Adds APIs for Bluetooth PBAP and MAP access permission.
 2014-09-16 09:12:33 +00:00
Igor Murashkin
86c2964cb9 am a9da866c: am da839237: am 6d2cca33: Merge "camera2-legacy: Fix jpeg thumbnail quality not being set" into lmp-dev 
* commit 'a9da866c38b54d5c63fff0f3daec2f1fe42ec9dd':
  camera2-legacy: Fix jpeg thumbnail quality not being set
 2014-09-16 09:12:28 +00:00
Adam Lesinski
6f1b1a410e am e6eafce4: am 3b36b8c7: am 1416621b: Merge "Show the lockscreen when more than 1 user is present" into lmp-dev 
* commit 'e6eafce4dcbb658f7e139b1430bd00b9258fb5d5':
  Show the lockscreen when more than 1 user is present
 2014-09-16 09:12:23 +00:00
Eino-Ville Talvala
39dca501a4 am 03597aea: am c142ac27: am 3703cae1: Merge "Camera2: Check for sequence complete sooner." into lmp-dev 
* commit '03597aeab4a8c79d96fdf3c487c73e9034d3ee55':
  Camera2: Check for sequence complete sooner.
 2014-09-16 09:12:18 +00:00
Alan Viverette
def05dd180 am 408c61a1: am 56fbc575: am 1375db70: Merge "Always apply ImageView\'s tint attribute using SRC_ATOP by default" into lmp-dev 
* commit '408c61a12efae5c69c27fae058b0fbe83bfebc37':
  Always apply ImageView's tint attribute using SRC_ATOP by default
 2014-09-16 09:12:13 +00:00
Yohei Yukawa
bb5118edbf am 382b6e5e: am 5a2efd42: am 8219934a: Merge "Minimize the number of default enabled IMEs part 3" into lmp-dev 
* commit '382b6e5e87a537bf35ae4b7a36ef3e3e92f7300b':
  Minimize the number of default enabled IMEs part 3
 2014-09-16 09:12:03 +00:00
Ang Li
4797fb0b39 am b2dc8ba3: am 94325a15: am 36fdf64f: Merge "Fix a typo in comment." into lmp-dev 
* commit 'b2dc8ba327a582799c803934c965ea7f903c4e8e':
  Fix a typo in comment.
 2014-09-16 09:11:58 +00:00
Adam Powell
938c00bfed am 55c08aa6: am 9965e970: am 3b2dfa7a: Merge "Treat empty string as title-set in ToolbarWidgetWrapper" into lmp-dev 
* commit '55c08aa6db4cf73b2bdeef59d008cc026a737a16':
  Treat empty string as title-set in ToolbarWidgetWrapper
 2014-09-16 09:11:53 +00:00
Adam Powell
8a0be0e3b0 am 751fb558: am acec24c1: am 17ec7920: Merge "Finish materializing dialogs" into lmp-dev 
* commit '751fb558fd0e81a7c4f41b55973900183160c372':
  Finish materializing dialogs
 2014-09-16 09:11:42 +00:00
Chet Haase
3ec7a4c8a6 am bb8d6776: am bae5621a: am 4b20b031: Merge "Avoid invalidating view during some outline invalidations" into lmp-dev 
* commit 'bb8d67768806662f59bb14b918134c547434ac86':
  Avoid invalidating view during some outline invalidations
 2014-09-16 09:11:22 +00:00
Edward Jee
cbf76135e0 am 8a20c56f: am c172b209: Merge "Adds APIs for Bluetooth PBAP and MAP access permission." into lmp-dev 
* commit '8a20c56fe0011b8a5ba11e39e734679f89be3f3d':
  Adds APIs for Bluetooth PBAP and MAP access permission.
 2014-09-16 08:59:40 +00:00
Igor Murashkin
4280c893bf am da839237: am 6d2cca33: Merge "camera2-legacy: Fix jpeg thumbnail quality not being set" into lmp-dev 
* commit 'da839237d71b97dcd789e54031497da39361698a':
  camera2-legacy: Fix jpeg thumbnail quality not being set
 2014-09-16 08:59:34 +00:00