drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
143,339 Commits 1 Branch 0 Tags
Commit Graph

143339 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
fa0460a671 am bf5ecd02: Merge "Don\'t apply the ActionBar style to a Toolbar as a result of setActionBar" into lmp-dev 
* commit 'bf5ecd02937988beb93ee8c68032d7df4d27da20':
  Don't apply the ActionBar style to a Toolbar as a result of setActionBar
 2014-07-19 23:35:39 +00:00
Chelsea Derrick
a3c09275a6 am 53fd859f: Merge "Unhide WifiConfiguration.creatorUid. [DO NOT MERGE]" into lmp-dev 
* commit '53fd859ffabd8f2b843b907c66eb7e758b2808b3':
  Unhide WifiConfiguration.creatorUid. [DO NOT MERGE]
 2014-07-19 23:12:28 +00:00
Adam Powell
7ee6b63f00 am d073a935: Don\'t overlay the Material.Light theme\'s homeAsUpIndicator attribute 
* commit 'd073a9358bb1b48d361b1f5127cedb8f6b800f07':
  Don't overlay the Material.Light theme's homeAsUpIndicator attribute
 2014-07-19 23:00:22 +00:00
Adam Powell
5abc26e00a Don't overlay the Material.Light theme's homeAsUpIndicator attribute 
Current API expects the default ActionBar styles not to have the
homeAsUpIndicator defined, thereby inheriting it from the theme itself
when changed there. Remove the stray definition in the light material
action bar style that was blocking this from happening.

Bug 15458606

Change-Id: Ia7fdbde814582a1d3eb8743bf76bc019f6ac7488
 2014-07-19 15:56:32 -07:00
John Spurlock
653103d2cf am d2494fcc: Merge "Volume: No sound effects on the ringer toggle." into lmp-dev 
* commit 'd2494fccefc4d9477f2e5fea3462dd08e297cd7c':
  Volume: No sound effects on the ringer toggle.
 2014-07-19 22:56:12 +00:00
Evan Charlton
4d44af4bad am 07e3fccb: Migrate TelecommConstants to TelecommManager 
* commit '07e3fccbcc02a9882b1db1e4713caf500cde9643':
  Migrate TelecommConstants to TelecommManager
 2014-07-19 22:44:09 +00:00
Evan Charlton
1019719e46 Migrate TelecommConstants to TelecommManager 
Change-Id: Icdd7637ba1ae27ce7d1f13714257b4a946961037
 2014-07-19 15:33:59 -07:00
John Spurlock
c9bbb1cd5e am 16f6e259: Merge "Add audioAttributes to Notification." into lmp-dev 
* commit '16f6e2598536e15ed29b28732c03251a15834d25':
  Add audioAttributes to Notification.
 2014-07-19 22:01:06 +00:00
John Spurlock
eb140b6512 am 2f474cd3: Merge "Volume: restore vibration entering vibrate-mode from rocker." into lmp-dev 
* commit '2f474cd32a4e06aaa034e8c54531393c278c2e11':
  Volume: restore vibration entering vibrate-mode from rocker.
 2014-07-19 21:57:11 +00:00
Baligh Uddin
be7dfa1a28 am c5a06854: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'c5a06854bbb91e22c49bc6b2c88dab1677973abf':
  Import translations. DO NOT MERGE
 2014-07-19 21:51:19 +00:00
Baligh Uddin
2b0e844198 am 7d51820d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '7d51820d6ce5d087476bd868c8d3a3ba32d15051':
  Import translations. DO NOT MERGE
 2014-07-19 21:51:16 +00:00
Baligh Uddin
8090145233 am e03c9fe9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'e03c9fe9ad06f7d4b023d5fb6d6f623adf71403b':
  Import translations. DO NOT MERGE
 2014-07-19 21:51:12 +00:00
Baligh Uddin
5c0bfe09c0 am e73dab52: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'e73dab524b692919f9e36ea8c779c1053548e2ef':
  Import translations. DO NOT MERGE
 2014-07-19 21:51:09 +00:00
Baligh Uddin
735da2e9cf am af51f737: (-s ours) Import translations. DO NOT MERGE 
* commit 'af51f737a41783433db39309b54dffd283827f4e':
  Import translations. DO NOT MERGE
 2014-07-19 21:51:05 +00:00
Baligh Uddin
c6675a4dcb Import translations. DO NOT MERGE 
Change-Id: Iccd6de29591b724ac87fbd83638f5eb256daceb1
Auto-generated-cl: translation import
 2014-07-19 21:42:22 +00:00
Evan Charlton
9158f95f87 am 6eb05788: Add a notion of the subscription number 
* commit '6eb057881ea08d7b12050d8aa155f21e71ea9ae4':
  Add a notion of the subscription number
 2014-07-19 21:26:13 +00:00
Evan Charlton
222db525ed Add a notion of the subscription number 
Expose the actual subscription number so that it can be exposed when
necessary (such as during emergency calls, when it doesn't match the
line 1 number).

Bug: 13333595
Change-Id: I0d3b2cfcea08aeba760c392c116303f21beb70d3
 2014-07-19 21:22:31 +00:00
Santos Cordon
1c0e7a0e57 am 040acd45: Merge "InCallService to inherit directly from Service. (1/2)" into lmp-dev 
* commit '040acd45ab30bfa1be535940b62f9beee7c1b9ad':
  InCallService to inherit directly from Service. (1/2)
 2014-07-19 21:18:18 +00:00
Adam Powell
8002d7b914 am 69ebf2cf: Merge "Measure Toolbar titles last" into lmp-dev 
* commit '69ebf2cf81d700c70316ce5cf8a16ad9ace25e87':
  Measure Toolbar titles last
 2014-07-19 20:30:11 +00:00
John Spurlock
3a79becf2e am 59eee7e6: Merge "getMasterStreamType from MUSIC -> NOTIFICATION" into lmp-dev 
* commit '59eee7e6bc1b2e11063ccde25b6cabe592b257eb':
  getMasterStreamType from MUSIC -> NOTIFICATION
 2014-07-19 20:26:16 +00:00
Adam Powell
fc4ec6496c am 0505a3fe: Fix Toolbar title layout in RTL mode 
* commit '0505a3fed9136e29a4ea068b043e379cdac1d05d':
  Fix Toolbar title layout in RTL mode
 2014-07-19 20:11:05 +00:00
Adam Powell
c80f952285 Fix Toolbar title layout in RTL mode 
Welp, that one was embarrassing.

Bug 16192193

Change-Id: I4e94e71ef34b4b08b5dd4c7b7f0dfb22e834ca19
 2014-07-19 13:05:26 -07:00
Adam Powell
04f9efeaed am 7a5bca44: Merge "Adapt ActionBar.LayoutParams to Toolbar.LayoutParams on demand" into lmp-dev 
* commit '7a5bca446da01a0f83087c00fad211ee2d5f1e1d':
  Adapt ActionBar.LayoutParams to Toolbar.LayoutParams on demand
 2014-07-19 19:26:34 +00:00
John Spurlock
9efd2448bf am da9fd706: Merge "Non-voice-capable device default stream is now NOTIFICATION." into lmp-dev 
* commit 'da9fd706595ab4271951d13543e0dcf719d1aa4b':
  Non-voice-capable device default stream is now NOTIFICATION.
 2014-07-19 19:00:49 +00:00
Adam Powell
796a3d8c18 am b08dc693: Merge "Remove obsolete (and large) overscroll drawables" into lmp-dev 
* commit 'b08dc69396f68240442a5a3cb6ebcb5209d56ad1':
  Remove obsolete (and large) overscroll drawables
 2014-07-19 18:27:34 +00:00
John Spurlock
aec3f72aca am c297b9b3: Zen mode filtering should use new usage constants. 
* commit 'c297b9b32f2cd7e10b9a22d61ab6db63afa21ac2':
  Zen mode filtering should use new usage constants.
 2014-07-19 16:33:15 +00:00
John Spurlock
7b41467704 Zen mode filtering should use new usage constants. 
Refactor stream-based calls to usage-based calls.

Bug:15279516
Change-Id: I3f7757d8123c14670e2ad5f8e6aa4e9803efe7ec
 2014-07-19 11:57:51 -04:00
Yohei Yukawa
302ad73a88 am f5827ba0: Merge "Add FLAG_CURSOR_ANCHOR_INFO_IMMEDIATE support in TextView" into lmp-dev 
* commit 'f5827ba050b93d1080eec336c560e22aa4713678':
  Add FLAG_CURSOR_ANCHOR_INFO_IMMEDIATE support in TextView
 2014-07-19 13:45:24 +00:00
Wonsik Kim
9504c1a440 am 71e398b4: Merge "TIF: Reorder TvInputInfo types from old to new." into lmp-dev 
* commit '71e398b4c514af1364b01be2e839badde83f5be4':
  TIF: Reorder TvInputInfo types from old to new.
 2014-07-19 11:45:32 +00:00
Wonsik Kim
6a9bf8201a am b872b220: Merge "TIF: misc fix for TvInputHal" into lmp-dev 
* commit 'b872b220bb1ef88a62c7765b1156d1a1615e533f':
  TIF: misc fix for TvInputHal
 2014-07-19 11:39:28 +00:00
Lajos Molnar
25ec02be2f am 1717dea8: Extend MediaCodecInfo to describe usable codec limits and features 
* commit '1717dea892e10b9a5c4797c8fdd4e8d64838e556':
  Extend MediaCodecInfo to describe usable codec limits and features
 2014-07-19 11:39:24 +00:00
Jeff Brown
425fd5fb2d am 25892fe6: Merge "Allow dreams to wake up gently." into lmp-dev 
* commit '25892fe6ac568638b0420ca0e8cb388c133bc14e':
  Allow dreams to wake up gently.
 2014-07-19 11:39:14 +00:00
Dongwon Kang
5975edf0d7 am c292f54f: Merge "TIF: introduce TvInputPassthroughWrapperService class to support 2-way pairing use-case." into lmp-dev 
* commit 'c292f54f26b6be7e6652f44ac96e7ef59756abb2':
  TIF: introduce TvInputPassthroughWrapperService class to support 2-way pairing use-case.
 2014-07-19 11:39:10 +00:00
Jeff Brown
c669a94615 am 03fb5270: Add new Display.STATE_DOZE_SUSPEND power state. 
* commit '03fb52700991064432971f79c71cef336e2762df':
  Add new Display.STATE_DOZE_SUSPEND power state.
 2014-07-19 11:39:06 +00:00
Lajos Molnar
b58dc31322 Extend MediaCodecInfo to describe usable codec limits and features 
Bug: 11990470
Bug: 12065651
Bug: 16131974
Change-Id: I841b8507e823f1ddf14754e34029a9bed4f402d8
 2014-07-19 02:14:00 -07:00
Jeff Brown
5dc219142a Add new Display.STATE_DOZE_SUSPEND power state. 
Change-Id: Ia62f4f0d25234281dc600d0b7f08b3c6a312db7a
 2014-07-18 21:28:18 -07:00
Jae Seo
c73dad0e14 am 0c2b6c52: Merge "TIF: Add a way to notify whether the current program content is allowed" into lmp-dev 
* commit '0c2b6c52d626681b1ac32f79c246be4c5a82a991':
  TIF: Add a way to notify whether the current program content is allowed
 2014-07-19 03:27:01 +00:00
John Reck
4522fe26ae am b09a6670: Return Animator instead of ValueAnimator 
* commit 'b09a667056aa3fba5a05d29f7e073c3640888c26':
  Return Animator instead of ValueAnimator
 2014-07-19 02:03:05 +00:00
Fabrice Di Meglio
b906a36b5f am 3a4701fa: Revert "Fix LocalePicker background" 
* commit '3a4701fa23c9b726173deb0c0450ceed023da217':
  Revert "Fix LocalePicker background"
 2014-07-19 02:03:01 +00:00
John Reck
c01bd1167a Return Animator instead of ValueAnimator 
Change-Id: I29a7cfdc7ffbb3a4d33f9e64f9d7ca791f5c947c
 2014-07-19 02:00:15 +00:00
Fabrice Di Meglio
6eed108eeb Revert "Fix LocalePicker background" 
This reverts commit 6bbea8cf4252839d0c6f2a3152f506a7b2b2d753.

Change-Id: I430c725c8e5987fb643528594ef3a9a83827e7be
 2014-07-19 01:58:09 +00:00
Wei Wang
8d0f3233bb am 5cb5ae18: More API modification of BLE APIs (1/2). 
* commit '5cb5ae18a83c6e8d6e3b935ccd7e2e7e94eec721':
  More API modification of BLE APIs (1/2).
 2014-07-19 01:36:48 +00:00
Wei Wang
685c175890 More API modification of BLE APIs (1/2). 
Changed include:

1) Add serviceDataUuid to filter so it matches sanRecord and
AdvertiseData.
2) Add raw bytes to ScanRecord and make ScanResult take a ScanRecord
instead of raw bytes.
3) Change from setServiceUuid(List) to addServiceUuid(ParcelUuid).
4) Added include device name
5) Removed service not registered and added ADVERTISE_DATA_TOO_LARGE.
6) Fixed a few comments.

Change-Id: Ibbe07183b1293835c4a84728d1cd2d61e5d627d3
 2014-07-18 18:31:00 -07:00
Jean-Michel Trivi
f64558bb9e am fa198473: Merge "Add AudioAttributes to stream type conversion" into lmp-dev 
* commit 'fa19847302d7ecc5cf0e3342852ff40945acf309':
  Add AudioAttributes to stream type conversion
 2014-07-19 01:05:03 +00:00
Jean-Michel Trivi
540a32fe62 am 01e81000: Merge "Unhide AudioTrack constructor with AudioAttributes, AudioFormat" into lmp-dev 
* commit '01e810001dc6f73381aaa5499cfb3a3c92b60b1e':
  Unhide AudioTrack constructor with AudioAttributes, AudioFormat
 2014-07-19 00:54:59 +00:00
Quddus Chong
1807c9600e am a7112918: am 9fc983f5: am f0804df1: am 349e5760: docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463 
* commit 'a711291844dfba2c0452f35561192c62010d4fed':
  docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463
 2014-07-19 00:49:03 +00:00
Deepanshu Gupta
eb13dd2485 am 6b1ceb42: am 296459ff: am f4989910: am d32dd294: am b86675f1: am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'. 
* commit '6b1ceb4260ee8cfff84123b984142a361cd9a748':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-19 00:48:58 +00:00
Deepanshu Gupta
22d5f446de am 59987f2d: am 5d6322a5: (-s ours) am ad3ccc74: am 3f51ab0d: am 3c92b932: am 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-de 
* commit '59987f2dab94e6a832eee4a93577bdc5bc6f1a58':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-19 00:48:55 +00:00
Deepanshu Gupta
b6ed7a4ef2 am 78bbb2a1: am 90824671: (-s ours) am 98b24366: am c35afdfd: am cee55fc1: am 99286edc: (-s ours) am aa0c1c75: am e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '78bbb2a1a140d199753fd61bdad6140449d96e63':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-19 00:48:52 +00:00
Deepanshu Gupta
08aca3855e am fe48ca3e: am 4ff3c7f0: (-s ours) am 08840806: am 7f98066d: am 4c312f20: am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev 
* commit 'fe48ca3ec644635aa9267c97784f879bee1b984a':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-19 00:48:48 +00:00