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

144354 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
1966be7033 am b59caea4: am eebe1ea4: am 2f474cd3: Merge "Volume: restore vibration entering vibrate-mode from rocker." into lmp-dev 
* commit 'b59caea490051ecc167afa39d603d16f12a6845c':
  Volume: restore vibration entering vibrate-mode from rocker.
 2014-07-21 18:26:25 +00:00
Baligh Uddin
ed93743a95 am 29297801: (-s ours) am 0338db63: (-s ours) am c5a06854: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '29297801e7b9cb246c5033cfdac08ac0ccd3b4c0':
  Import translations. DO NOT MERGE
 2014-07-21 18:26:17 +00:00
Baligh Uddin
8339eb337e am 6a990e09: (-s ours) am b9604928: (-s ours) am 7d51820d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '6a990e095cacba684a2ca74b8511c7c941741d3e':
  Import translations. DO NOT MERGE
 2014-07-21 18:26:12 +00:00
Baligh Uddin
a9c6111196 am 17d8b652: (-s ours) am a28477fa: (-s ours) am e03c9fe9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '17d8b65217b671d2a163341a5ef74a4248740765':
  Import translations. DO NOT MERGE
 2014-07-21 18:25:59 +00:00
Baligh Uddin
c731ba13b6 am 8b8c2ea9: (-s ours) am 81c4448b: (-s ours) am e73dab52: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '8b8c2ea9830090efd994a427667d4a7f9db49f12':
  Import translations. DO NOT MERGE
 2014-07-21 18:25:55 +00:00
Baligh Uddin
034d39e9d2 am e6062418: (-s ours) am ec0b6061: (-s ours) am af51f737: (-s ours) Import translations. DO NOT MERGE 
* commit 'e60624185925460fe72a7866a8c252b8ceec2dcf':
  Import translations. DO NOT MERGE
 2014-07-21 18:25:50 +00:00
Evan Charlton
83c1d4c900 am b2d91c72: am 9b19eb14: am 6eb05788: Add a notion of the subscription number 
* commit 'b2d91c72c6730e1ba1673f6e408bd67c14fb02d8':
  Add a notion of the subscription number
 2014-07-21 18:25:45 +00:00
Santos Cordon
9ad5811211 am 476fff7f: am 01ab1ea4: am 040acd45: Merge "InCallService to inherit directly from Service. (1/2)" into lmp-dev 
* commit '476fff7f482a74b026c83d33df4f11c0f42e8ae9':
  InCallService to inherit directly from Service. (1/2)
 2014-07-21 18:25:30 +00:00
Adam Powell
657e7b4c6e am 10dc0299: am ca355c16: am 69ebf2cf: Merge "Measure Toolbar titles last" into lmp-dev 
* commit '10dc0299a40b2808b5a6489452df339e2eafe397':
  Measure Toolbar titles last
 2014-07-21 18:25:25 +00:00
John Spurlock
bf92ac723d am 904ee70a: am 241a2345: am 59eee7e6: Merge "getMasterStreamType from MUSIC -> NOTIFICATION" into lmp-dev 
* commit '904ee70a695a76d54bd899e073eec75b1b18dbfe':
  getMasterStreamType from MUSIC -> NOTIFICATION
 2014-07-21 18:25:21 +00:00
Adam Powell
088746bf55 am 31db0307: am 71ff46d2: am 0505a3fe: Fix Toolbar title layout in RTL mode 
* commit '31db0307c95e7b1bbbd6eca37eca20b12247e23f':
  Fix Toolbar title layout in RTL mode
 2014-07-21 18:25:16 +00:00
Adam Powell
898484e5ff am 52cd54f5: am 00061ce1: am 7a5bca44: Merge "Adapt ActionBar.LayoutParams to Toolbar.LayoutParams on demand" into lmp-dev 
* commit '52cd54f524adb1f33883d4e79a0c310ee6115bf9':
  Adapt ActionBar.LayoutParams to Toolbar.LayoutParams on demand
 2014-07-21 18:25:12 +00:00
John Spurlock
467fb4e57e am a4c015d2: am acb0d3d9: am da9fd706: Merge "Non-voice-capable device default stream is now NOTIFICATION." into lmp-dev 
* commit 'a4c015d2dbaf6e5336d89c3faeb90a55649026e5':
  Non-voice-capable device default stream is now NOTIFICATION.
 2014-07-21 18:25:07 +00:00
Adam Powell
8054a2c950 am 63281caf: am bc7340e0: am b08dc693: Merge "Remove obsolete (and large) overscroll drawables" into lmp-dev 
* commit '63281caf0f076b79f8a3c48480f2b45d26a51e33':
  Remove obsolete (and large) overscroll drawables
 2014-07-21 18:25:02 +00:00
John Spurlock
999b83af8b am 4704c806: am 3897183d: am c297b9b3: Zen mode filtering should use new usage constants. 
* commit '4704c8067743f36df6fc9622090f422e6bdec2c5':
  Zen mode filtering should use new usage constants.
 2014-07-21 18:24:58 +00:00
Yohei Yukawa
883baab06b am f0ec8f06: am eb5eb5c8: am f5827ba0: Merge "Add FLAG_CURSOR_ANCHOR_INFO_IMMEDIATE support in TextView" into lmp-dev 
* commit 'f0ec8f065eb286e5910b3eaeb2bd0fa5e6f7fec5':
  Add FLAG_CURSOR_ANCHOR_INFO_IMMEDIATE support in TextView
 2014-07-21 18:24:53 +00:00
Wonsik Kim
5bf37c2276 am cbb951f6: am a7279448: am 71e398b4: Merge "TIF: Reorder TvInputInfo types from old to new." into lmp-dev 
* commit 'cbb951f6bb4435c2cfca260ac3aef34876986013':
  TIF: Reorder TvInputInfo types from old to new.
 2014-07-21 18:24:48 +00:00
Wonsik Kim
0c585845fe am afa87298: am 1042ee6b: am b872b220: Merge "TIF: misc fix for TvInputHal" into lmp-dev 
* commit 'afa8729857c54b746d23804e077aa6034b47cce3':
  TIF: misc fix for TvInputHal
 2014-07-21 18:24:43 +00:00
Lajos Molnar
c2c127f841 am ea788337: am cebc7989: am 1717dea8: Extend MediaCodecInfo to describe usable codec limits and features 
* commit 'ea788337e49ffac2a7ff3f3826ffdd77b83cd525':
  Extend MediaCodecInfo to describe usable codec limits and features
 2014-07-21 18:24:38 +00:00
Jeff Brown
e53b1eb276 am 5fbc6cae: am 958361e9: am 25892fe6: Merge "Allow dreams to wake up gently." into lmp-dev 
* commit '5fbc6cae0c643be46de3c7c720c8e26a182514fa':
  Allow dreams to wake up gently.
 2014-07-21 18:24:33 +00:00
Dongwon Kang
a06aba8f47 am 3dff1c6d: am c90b613c: am c292f54f: Merge "TIF: introduce TvInputPassthroughWrapperService class to support 2-way pairing use-case." into lmp-dev 
* commit '3dff1c6dc2e73e99437bccdb47d10eb5155ed03c':
  TIF: introduce TvInputPassthroughWrapperService class to support 2-way pairing use-case.
 2014-07-21 18:24:27 +00:00
Jeff Brown
1d95978423 am 22193893: am 610014e6: am 03fb5270: Add new Display.STATE_DOZE_SUSPEND power state. 
* commit '22193893f7a79f1351caf157a8d6932e7ec3c825':
  Add new Display.STATE_DOZE_SUSPEND power state.
 2014-07-21 18:24:21 +00:00
Jae Seo
dbff278e83 am e3576308: am c936967b: am 0c2b6c52: Merge "TIF: Add a way to notify whether the current program content is allowed" into lmp-dev 
* commit 'e3576308987b508384c8689940ec71fbfb39b580':
  TIF: Add a way to notify whether the current program content is allowed
 2014-07-21 18:24:15 +00:00
John Reck
f206ef5a58 am e5469d04: am 761e298b: am b09a6670: Return Animator instead of ValueAnimator 
* commit 'e5469d0478c4319b05f569c24e21c2f0821390e4':
  Return Animator instead of ValueAnimator
 2014-07-21 18:24:07 +00:00
Fabrice Di Meglio
504d44bc41 am 17b4d928: am 6b64ac48: am 3a4701fa: Revert "Fix LocalePicker background" 
* commit '17b4d92850ea036577ab71e17909d7a14e7f6042':
  Revert "Fix LocalePicker background"
 2014-07-21 18:24:00 +00:00
Wei Wang
399212445e am 9d2698b3: am 6e065374: am 5cb5ae18: More API modification of BLE APIs (1/2). 
* commit '9d2698b3a34618852bd88a30a54f6e608b18f14d':
  More API modification of BLE APIs (1/2).
 2014-07-21 18:23:56 +00:00
Jean-Michel Trivi
a28bfb5b55 am bf99d8c3: am 895de04e: am fa198473: Merge "Add AudioAttributes to stream type conversion" into lmp-dev 
* commit 'bf99d8c31160cf61a25371759068592461cbc71a':
  Add AudioAttributes to stream type conversion
 2014-07-21 18:23:51 +00:00
Jean-Michel Trivi
9f54221372 am 11724dc5: am bece8116: am 01e81000: Merge "Unhide AudioTrack constructor with AudioAttributes, AudioFormat" into lmp-dev 
* commit '11724dc595bb0550de376212d27909409a112cbb':
  Unhide AudioTrack constructor with AudioAttributes, AudioFormat
 2014-07-21 18:23:46 +00:00
Quddus Chong
7bde416fb6 am fc91979d: am 92f7993e: am a7112918: am 9fc983f5: am f0804df1: am 349e5760: docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463 
* commit 'fc91979d1dddcd0df677e4b1e1a51d29ad7e75d5':
  docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463
 2014-07-21 18:23:42 +00:00
Deepanshu Gupta
1c43d1faa0 am 6d989248: 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 reso 
* commit '6d9892480be9f7deb8dbb94dbf3ad18b89fb65b3':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-21 18:23:37 +00:00
Deepanshu Gupta
42bfaa9d28 am f861385f: 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 NO 
* commit 'f861385fa987545b21bbd94eacebc86f626db63b':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-21 18:23:33 +00:00
Deepanshu Gupta
2191234c3c am b053d188: (-s ours) 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 'b053d188833e5ed106e67cf336f7cf3b656128c3':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-21 18:23:29 +00:00
Deepanshu Gupta
dc67ecef52 am 32c2b20c: (-s ours) 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 '32c2b20cb78258b995cecf8cbb5e38fe44895944':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-21 18:23:25 +00:00
Deepanshu Gupta
f67347b809 am 3ed46147: (-s ours) 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 '3ed4614798855cf135625c98b6a247a263981e2c':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-21 18:23:20 +00:00
Deepanshu Gupta
c5fde2ce9c am 9b907157: (-s ours) 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 '9b90715728ee06300c1a8729c553563388301734':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-21 18:23:16 +00:00
Deepanshu Gupta
23a2f5bc43 am 25d0097f: (-s ours) am 03b8f56a: am 1ab77f96: am d7f2bf06: (-s ours) am f75489f2: am c425c438: am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '25d0097f2bf43f5748a36e074d1a68b5bc14a403':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-21 18:23:12 +00:00
Guang Zhu
e065ee93e5 am f7ab7f0a: am 1931c1c3: am 5a0f7e41: am f59ce468: am b477fc6c: Merge "add command to enable bt snoop log" into klp-modular-dev 
* commit 'f7ab7f0affdae345d0a162002aabfda4742536a8':
  add command to enable bt snoop log
 2014-07-21 18:23:08 +00:00
Jean-Michel Trivi
7e8bcc07b2 am c9476fe0: am abc7f117: am 981fcf46: Merge "Hide AudioManager.startBluetoothScoVirtualCall()" into lmp-dev 
* commit 'c9476fe02e66ae121c0994637a62ea0b6b546c52':
  Hide AudioManager.startBluetoothScoVirtualCall()
 2014-07-21 18:23:03 +00:00
Santos Cordon
5a9bb606a4 am 28003199: am 52cfd31e: am db2f81b0: Fixing ADD_CALL (1/3) 
* commit '280031995f0770e84073a894253b936e4af23566':
  Fixing ADD_CALL (1/3)
 2014-07-21 18:22:59 +00:00
Chris Craik
d5a3e217bd am 0a3bcdcc: am 7339d993: am e25d7792: Merge "Tweaks to outline API" into lmp-dev 
* commit '0a3bcdccb14aa7247463aa91de1cc7e3e1ea148f':
  Tweaks to outline API
 2014-07-21 18:22:53 +00:00
Adam Powell
91d67f9c7d am bd90f0ce: am 186802ac: am d0cb5fd8: Merge "Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER" into lmp-dev 
* commit 'bd90f0ce2d052d2e0d753e0cc7b10a1f658b496e':
  Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER
 2014-07-21 18:22:48 +00:00
Yorke Lee
c1a7bec766 am d4c489a8: am c5989521: am c5a8e2f1: Rename voicemail permissions 
* commit 'd4c489a867b95431fbab388bbc4cd4da57165e84':
  Rename voicemail permissions
 2014-07-21 18:22:44 +00:00
Shishir Agrawal
f05423f492 am 0924a642: am b8addfa0: am 47bbd460: Merge "Adding the ability for carrier app to override SPN and carrier name." into lmp-dev 
* commit '0924a6422b3dad4bad0701c1f834cc6b5451ca44':
  Adding the ability for carrier app to override SPN and carrier name.
 2014-07-21 18:22:38 +00:00
Christopher Tate
24f448d7b3 am 0eebcfd7: am 32523262: am 12e9b896: Fix which index goes where 
* commit '0eebcfd7582d576110a42acb799b8a8c639f693f':
  Fix which index goes where
 2014-07-21 18:22:33 +00:00
Sreeram Ramachandran
5854dfed88 am 35de9295: am 5e23de19: am 4000b01f: Merge "Allow VPN interfaces to be put into blocking mode." into lmp-dev 
* commit '35de92955536b6f050e4657ece2028fab67d7f7e':
  Allow VPN interfaces to be put into blocking mode.
 2014-07-21 18:22:28 +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