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

143838 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
633bf73908 am 237b2100: am 5f6ea4bf: Merge "Volume: Design followup." into lmp-dev 
* commit '237b21006be014f3d5e95a7e8dba6ee2c83e8c4a':
  Volume: Design followup.
 2014-07-20 18:09:22 +00:00
David Friedman
535cbbb77c am ceb9bbf0: am 380677d6: am 119716f4: am 0d5af3f6: am 5d59d371: Merge "Minor typos, consistency things, one grammatical error." into klp-modular-docs 
* commit 'ceb9bbf0a515938823732fd60053f6d4b87fc3ee':
  Minor typos, consistency things, one grammatical error.
 2014-07-20 18:09:16 +00:00
Wonsik Kim
52d820ab29 am e2d65e08: am 9b44c8b6: Merge "TIF: revise API names" into lmp-dev 
* commit 'e2d65e08ad9533ab5d94b52dd61d40cd6643a61f':
  TIF: revise API names
 2014-07-20 18:09:10 +00:00
John Spurlock
cd83c86f7e am 36a86f03: am e4b360e7: Volume: new coat of paint. 
* commit '36a86f03f05ea3a50342e9f324c3453e6e6d6beb':
  Volume: new coat of paint.
 2014-07-20 18:09:06 +00:00
Baligh Uddin
8dd8207293 am 7a9b1324: am 4aa0295b: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev 
* commit '7a9b13241ee64106d9f466c35f43bf76ea446401':
  Remove deprecated locales - DO NOT MERGE
 2014-07-20 18:08:16 +00:00
Adam Powell
facd9fa786 am cc19d68a: am bf5ecd02: Merge "Don\'t apply the ActionBar style to a Toolbar as a result of setActionBar" into lmp-dev 
* commit 'cc19d68a90486ace893ad381911e9f675f1cf3d0':
  Don't apply the ActionBar style to a Toolbar as a result of setActionBar
 2014-07-20 18:07:54 +00:00
Chelsea Derrick
e14315882a am 82b01b2b: am 53fd859f: Merge "Unhide WifiConfiguration.creatorUid. [DO NOT MERGE]" into lmp-dev 
* commit '82b01b2bf4752a03ee64d8a9a53038bf02c115d1':
  Unhide WifiConfiguration.creatorUid. [DO NOT MERGE]
 2014-07-20 18:07:50 +00:00
Adam Powell
582a8cdd6e am b2038ab7: am d073a935: Don\'t overlay the Material.Light theme\'s homeAsUpIndicator attribute 
* commit 'b2038ab70a867e6d6d0500730784d63f87913c5d':
  Don't overlay the Material.Light theme's homeAsUpIndicator attribute
 2014-07-20 18:07:46 +00:00
John Spurlock
829a941c45 am 21827163: am d2494fcc: Merge "Volume: No sound effects on the ringer toggle." into lmp-dev 
* commit '218271635378418c51bf6343f6adfd9e22156b05':
  Volume: No sound effects on the ringer toggle.
 2014-07-20 18:07:41 +00:00
Evan Charlton
576fc003d0 am b7e7e448: am 07e3fccb: Migrate TelecommConstants to TelecommManager 
* commit 'b7e7e4484824dfba837c58a037addfa10ff67879':
  Migrate TelecommConstants to TelecommManager
 2014-07-20 18:07:35 +00:00
John Spurlock
a7aaa227ef am 1fab88a4: am 16f6e259: Merge "Add audioAttributes to Notification." into lmp-dev 
* commit '1fab88a4d5e79b516a382474d777a212c5989f68':
  Add audioAttributes to Notification.
 2014-07-20 18:07:23 +00:00
John Spurlock
16049ddbb2 am eebe1ea4: am 2f474cd3: Merge "Volume: restore vibration entering vibrate-mode from rocker." into lmp-dev 
* commit 'eebe1ea48b26150e550af37101487e5b82df868f':
  Volume: restore vibration entering vibrate-mode from rocker.
 2014-07-20 18:07:19 +00:00
Baligh Uddin
f46ada636d am 0338db63: (-s ours) am c5a06854: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '0338db63db0514913e997c4a4cfc05d5b3fcfb89':
  Import translations. DO NOT MERGE
 2014-07-20 18:07:11 +00:00
Baligh Uddin
cd7b58e330 am b9604928: (-s ours) am 7d51820d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'b9604928cda038efe7badf687a2de93d8e643756':
  Import translations. DO NOT MERGE
 2014-07-20 18:07:07 +00:00
Baligh Uddin
98d5be3ff3 am a28477fa: (-s ours) am e03c9fe9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'a28477fa1ee1dcf863a32eedbd866cf2ab8bbb0e':
  Import translations. DO NOT MERGE
 2014-07-20 18:07:02 +00:00
Baligh Uddin
96acd9b973 am 81c4448b: (-s ours) am e73dab52: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '81c4448b147f1e1e9168358741648e3289ce3266':
  Import translations. DO NOT MERGE
 2014-07-20 18:06:58 +00:00
Baligh Uddin
1734f75c87 am ec0b6061: (-s ours) am af51f737: (-s ours) Import translations. DO NOT MERGE 
* commit 'ec0b6061763daa8d50658a4579e393a48eae1300':
  Import translations. DO NOT MERGE
 2014-07-20 18:06:54 +00:00
Evan Charlton
c1a14ef1e6 am 9b19eb14: am 6eb05788: Add a notion of the subscription number 
* commit '9b19eb14fdd56427f26a3489cb07778694060835':
  Add a notion of the subscription number
 2014-07-20 18:04:51 +00:00
Santos Cordon
ef76f60088 am 01ab1ea4: am 040acd45: Merge "InCallService to inherit directly from Service. (1/2)" into lmp-dev 
* commit '01ab1ea4dd4a99badc320bc758b7a1c4008a91f9':
  InCallService to inherit directly from Service. (1/2)
 2014-07-20 18:04:45 +00:00
Adam Powell
c29868765c am ca355c16: am 69ebf2cf: Merge "Measure Toolbar titles last" into lmp-dev 
* commit 'ca355c16f188d847b55cd0efa25c86db44dcc36c':
  Measure Toolbar titles last
 2014-07-20 18:04:38 +00:00
John Spurlock
f038df5866 am 241a2345: am 59eee7e6: Merge "getMasterStreamType from MUSIC -> NOTIFICATION" into lmp-dev 
* commit '241a23453fbe55e2b36ea6ff43da71e765283dd3':
  getMasterStreamType from MUSIC -> NOTIFICATION
 2014-07-20 18:04:34 +00:00
Adam Powell
79412ffe60 am 71ff46d2: am 0505a3fe: Fix Toolbar title layout in RTL mode 
* commit '71ff46d2f67fb90d6b959adb0f162b889a57be17':
  Fix Toolbar title layout in RTL mode
 2014-07-20 18:04:30 +00:00
Adam Powell
c12148d084 am 00061ce1: am 7a5bca44: Merge "Adapt ActionBar.LayoutParams to Toolbar.LayoutParams on demand" into lmp-dev 
* commit '00061ce1363d6ffa8e94f15048db5a61bb5088cf':
  Adapt ActionBar.LayoutParams to Toolbar.LayoutParams on demand
 2014-07-20 18:04:23 +00:00
John Spurlock
4957a053ec am acb0d3d9: am da9fd706: Merge "Non-voice-capable device default stream is now NOTIFICATION." into lmp-dev 
* commit 'acb0d3d98a116585de4fb460daf11c2bd6f95913':
  Non-voice-capable device default stream is now NOTIFICATION.
 2014-07-20 18:04:18 +00:00
Adam Powell
9120dff7ec am bc7340e0: am b08dc693: Merge "Remove obsolete (and large) overscroll drawables" into lmp-dev 
* commit 'bc7340e006da8eac639e4fae7dca9c3006ee607d':
  Remove obsolete (and large) overscroll drawables
 2014-07-20 18:04:12 +00:00
John Spurlock
eaeac08489 am 3897183d: am c297b9b3: Zen mode filtering should use new usage constants. 
* commit '3897183d7bd884c4a01b22dccce75df48e93ab4a':
  Zen mode filtering should use new usage constants.
 2014-07-20 18:04:06 +00:00
Yohei Yukawa
6437d7559a am eb5eb5c8: am f5827ba0: Merge "Add FLAG_CURSOR_ANCHOR_INFO_IMMEDIATE support in TextView" into lmp-dev 
* commit 'eb5eb5c81d25e20cfdbf77494913576dcb974e13':
  Add FLAG_CURSOR_ANCHOR_INFO_IMMEDIATE support in TextView
 2014-07-20 18:03:59 +00:00
Wonsik Kim
ab6b3695fa am a7279448: am 71e398b4: Merge "TIF: Reorder TvInputInfo types from old to new." into lmp-dev 
* commit 'a7279448befb62f36534d7a788b0c87db7af2e5e':
  TIF: Reorder TvInputInfo types from old to new.
 2014-07-20 18:03:54 +00:00
Wonsik Kim
8f199a44fd am 1042ee6b: am b872b220: Merge "TIF: misc fix for TvInputHal" into lmp-dev 
* commit '1042ee6be6294ad07ccda31571641996abc88bde':
  TIF: misc fix for TvInputHal
 2014-07-20 18:03:49 +00:00
Lajos Molnar
a6275d295a am cebc7989: am 1717dea8: Extend MediaCodecInfo to describe usable codec limits and features 
* commit 'cebc7989d7a4fa16396ed4b3be6d1922cefaea24':
  Extend MediaCodecInfo to describe usable codec limits and features
 2014-07-20 18:03:40 +00:00
Jeff Brown
3ab509a29b am 958361e9: am 25892fe6: Merge "Allow dreams to wake up gently." into lmp-dev 
* commit '958361e92371fd7d3b40fbbd91077ec4d7abe374':
  Allow dreams to wake up gently.
 2014-07-20 18:03:35 +00:00
Dongwon Kang
a2dc1378c6 am c90b613c: am c292f54f: Merge "TIF: introduce TvInputPassthroughWrapperService class to support 2-way pairing use-case." into lmp-dev 
* commit 'c90b613ca3cbe21c871c0b98ed3ceabe2a7a3a09':
  TIF: introduce TvInputPassthroughWrapperService class to support 2-way pairing use-case.
 2014-07-20 18:03:30 +00:00
Jeff Brown
253aa5d458 am 610014e6: am 03fb5270: Add new Display.STATE_DOZE_SUSPEND power state. 
* commit '610014e6501d3543f33aedcc7f302288afcc4df4':
  Add new Display.STATE_DOZE_SUSPEND power state.
 2014-07-20 18:03:26 +00:00
Jae Seo
aa75604f2c am c936967b: am 0c2b6c52: Merge "TIF: Add a way to notify whether the current program content is allowed" into lmp-dev 
* commit 'c936967b84ef7ba70f948bcd99b8355fbdd3c9a4':
  TIF: Add a way to notify whether the current program content is allowed
 2014-07-20 18:03:09 +00:00
John Reck
4369443e44 am 761e298b: am b09a6670: Return Animator instead of ValueAnimator 
* commit '761e298b11b31233067daf215ab788bb7042dc33':
  Return Animator instead of ValueAnimator
 2014-07-20 18:02:59 +00:00
Fabrice Di Meglio
da81175c3f am 6b64ac48: am 3a4701fa: Revert "Fix LocalePicker background" 
* commit '6b64ac48e0479b84859138907a0ebae88393130b':
  Revert "Fix LocalePicker background"
 2014-07-20 18:02:54 +00:00
Wei Wang
a1f99aec44 am 6e065374: am 5cb5ae18: More API modification of BLE APIs (1/2). 
* commit '6e065374f53801f4c90c73cadd33157a7c22f900':
  More API modification of BLE APIs (1/2).
 2014-07-20 18:02:30 +00:00
Jean-Michel Trivi
6736f716fe am 895de04e: am fa198473: Merge "Add AudioAttributes to stream type conversion" into lmp-dev 
* commit '895de04e7ca22494e46f20064e2133fc1f915d56':
  Add AudioAttributes to stream type conversion
 2014-07-20 18:01:58 +00:00
Jean-Michel Trivi
c0911d54e9 am bece8116: am 01e81000: Merge "Unhide AudioTrack constructor with AudioAttributes, AudioFormat" into lmp-dev 
* commit 'bece8116fa302b1ea770d7580941c0ce6a500833':
  Unhide AudioTrack constructor with AudioAttributes, AudioFormat
 2014-07-20 18:01:51 +00:00
Quddus Chong
92748b8661 am 92f7993e: am a7112918: am 9fc983f5: am f0804df1: am 349e5760: docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463 
* commit '92f7993e56759dc06c9149654f40bcbffd9b281b':
  docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463
 2014-07-20 18:01:38 +00:00
Deepanshu Gupta
0f374837d0 am 2895133f: 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 st 
* commit '2895133f602caff7a8f610c001a546c19c60c67b':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-20 18:01:34 +00:00
Deepanshu Gupta
35748d4c8d am 4ed3d208: 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]" int 
* commit '4ed3d2089f3f2f45da9c4103a0ebbcb6595b060c':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-20 18:01:29 +00:00
Deepanshu Gupta
36397210ba am 05900237: 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 '059002370db91392218ad3250a112438cf7a5038':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-20 18:01:25 +00:00
Deepanshu Gupta
51e2786b7c am 583b6898: 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 '583b68980fd0e1ffac3afe2caf62d7b62dbc3890':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-20 18:01:21 +00:00
Deepanshu Gupta
76fbe3863e am 13ebecfe: am d0eed243: am 276ae4ee: (-s ours) am 8613f826: am efd29681: am 964591a6: am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '13ebecfe89e35724736303e677256a7eeee4b3b4':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-20 18:01:16 +00:00
Deepanshu Gupta
c06345918c am d2966fce: am 2e11bba3: am 0804e0ad: (-s ours) am a9e488a6: am d8d3e87c: am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev 
* commit 'd2966fce19e04ffc23eb7ecfb65a305c6a22c044':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-20 18:01:12 +00:00
Deepanshu Gupta
37455c624c am 03b8f56a: am 1ab77f96: am d7f2bf06: (-s ours) am f75489f2: am c425c438: am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '03b8f56a781a231ec11906ea479d8d5490108f24':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-20 18:01:08 +00:00
Guang Zhu
06953e2bc8 am 1931c1c3: am 5a0f7e41: am f59ce468: am b477fc6c: Merge "add command to enable bt snoop log" into klp-modular-dev 
* commit '1931c1c324908620dc1a875934afea68db0b6d1d':
  add command to enable bt snoop log
 2014-07-20 18:00:51 +00:00
Jean-Michel Trivi
2c3386c8a5 am abc7f117: am 981fcf46: Merge "Hide AudioManager.startBluetoothScoVirtualCall()" into lmp-dev 
* commit 'abc7f117bf1f8717bc9c62c4762f9c38e15b0fc6':
  Hide AudioManager.startBluetoothScoVirtualCall()
 2014-07-20 18:00:37 +00:00
Santos Cordon
472969a6a5 am 52cfd31e: am db2f81b0: Fixing ADD_CALL (1/3) 
* commit '52cfd31ed48fdacc0ed11d1f2db7eea7f3a17fef':
  Fixing ADD_CALL (1/3)
 2014-07-20 18:00:22 +00:00