Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
154,618 Commits 3 Branches 0 Tags
a23fc5877b3d4fc2eb2d57fd4803d2e9f44dab09
Commit Graph

154618 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
a23fc5877b am 70cf8fba: am c9071002: Merge "Fix tessellation bounds computation" into lmp-dev 
* commit '70cf8fba276269c6d162819bf4cbcdf06f6d22ea':
  Fix tessellation bounds computation
 2014-09-09 18:47:43 +00:00
Winson Chung
72e6144823 am e5ef0872: am 3d0581d0: Merge "Fixing issue with screen pinning not working. (Bug 17436123)" into lmp-dev 
* commit 'e5ef08721892e08b0aa035a4610897b49d78e289':
  Fixing issue with screen pinning not working. (Bug 17436123)
 2014-09-09 18:47:38 +00:00
Winson Chung
9b5de18d3c am 79768b15: am 2d6118a1: Merge "Separating the notion of transposed search vs nav bar. (Bug 17402331)" into lmp-dev 
* commit '79768b1542aaf2fa1f259e754de3c8c2d07b1058':
  Separating the notion of transposed search vs nav bar. (Bug 17402331)
 2014-09-09 18:47:34 +00:00
Griff Hazen
1d67649c61 am accb122d: am c06b7a78: Copy visibility docs from support version to base Notification. 
* commit 'accb122dcd7b45914b508299af0b44376745bed3':
  Copy visibility docs from support version to base Notification.
 2014-09-09 18:47:29 +00:00
Chris Craik
2c4cf3f5b0 am c9071002: Merge "Fix tessellation bounds computation" into lmp-dev 
* commit 'c907100262b423e28dfd7258cb86c515c421a5d0':
  Fix tessellation bounds computation
 2014-09-09 18:36:36 +00:00
Winson Chung
44455d492d am 3d0581d0: Merge "Fixing issue with screen pinning not working. (Bug 17436123)" into lmp-dev 
* commit '3d0581d0c3a88b95760bec6fbbf4df033b6f239f':
  Fixing issue with screen pinning not working. (Bug 17436123)
 2014-09-09 18:36:32 +00:00
Winson Chung
ea33169e82 am 2d6118a1: Merge "Separating the notion of transposed search vs nav bar. (Bug 17402331)" into lmp-dev 
* commit '2d6118a1821a882cfad600d78ef3de34800148ba':
  Separating the notion of transposed search vs nav bar. (Bug 17402331)
 2014-09-09 18:36:27 +00:00
Griff Hazen
380c394987 am c06b7a78: Copy visibility docs from support version to base Notification. 
* commit 'c06b7a78433830308ac62be25b3a13d6415e3699':
  Copy visibility docs from support version to base Notification.
 2014-09-09 18:36:23 +00:00
Chris Craik
69fb8a2399 Merge "Fix tessellation bounds computation" into lmp-dev 2014-09-09 18:34:08 +00:00
Winson Chung
69550456e3 Merge "Fixing issue with screen pinning not working. (Bug 17436123)" into lmp-dev 2014-09-09 18:33:18 +00:00
Winson Chung
31e8d7602c Merge "Separating the notion of transposed search vs nav bar. (Bug 17402331)" into lmp-dev 2014-09-09 18:33:08 +00:00
Jason Monk
4fefc7d7bd am a03fb8a1: am 76779dbc: Merge "Add user-specific playSoundEffect and use in NavBar" into lmp-dev 
* commit 'a03fb8a19e055ae9d1d56fc21d304da9e11c5510':
  Add user-specific playSoundEffect and use in NavBar
 2014-09-09 18:19:59 +00:00
Vineeta Srivastava
1db0d8ff67 am 04454473: am a66c2cd1: Merge "Set MTU size to 1410 for Telus." into lmp-dev 
* commit '04454473a0cf58fc42f71d93ceb742c7927682ed':
  Set MTU size to 1410 for Telus.
 2014-09-09 18:19:54 +00:00
Jason Monk
b34b8e9376 am 76779dbc: Merge "Add user-specific playSoundEffect and use in NavBar" into lmp-dev 
* commit '76779dbc3f743aada5c1f0c545dbf90722249511':
  Add user-specific playSoundEffect and use in NavBar
 2014-09-09 18:09:09 +00:00
Vineeta Srivastava
d3773b2914 am a66c2cd1: Merge "Set MTU size to 1410 for Telus." into lmp-dev 
* commit 'a66c2cd18b668b8c692b2c632ec260e4b7fdb46f':
  Set MTU size to 1410 for Telus.
 2014-09-09 18:09:04 +00:00
Griff Hazen
fc3922d49b Copy visibility docs from support version to base Notification. 
(Noticed the difference in a javadoc diff between Notification and
NotificationCompat)

Bug: 17424399

Change-Id: I639a46c429ffebf8ca47118b2ea80f40ccdc1286
 2014-09-09 18:03:40 +00:00
Jason Monk
9580f6c6cb Merge "Add user-specific playSoundEffect and use in NavBar" into lmp-dev 2014-09-09 18:03:14 +00:00
Vineeta Srivastava
1f14863871 Merge "Set MTU size to 1410 for Telus." into lmp-dev 2014-09-09 18:02:57 +00:00
Alexandra Gherghina
ed225682c5 am f695833a: am c3b392d0: Merge "Removing the NO_CROSS_PROFILE flag for intent forwarding" into lmp-dev 
* commit 'f695833ab5764c7b031f43f78a288eec2e162dcc':
  Removing the NO_CROSS_PROFILE flag for intent forwarding
 2014-09-09 17:57:56 +00:00
Wink Saville
d601edd52e am 94804242: am 5dac65ad: Change suffix UsingSubId to ForSubscriber. 
* commit '948042422975e4c445e73213cb4c4a49b48d108d':
  Change suffix UsingSubId to ForSubscriber.
 2014-09-09 17:57:51 +00:00
Alexandra Gherghina
17f3cdc820 am c3b392d0: Merge "Removing the NO_CROSS_PROFILE flag for intent forwarding" into lmp-dev 
* commit 'c3b392d02693f8236fdc6ebc90412e3c4aaa5843':
  Removing the NO_CROSS_PROFILE flag for intent forwarding
 2014-09-09 17:52:46 +00:00
Wink Saville
5c1659045d am 5dac65ad: Change suffix UsingSubId to ForSubscriber. 
* commit '5dac65ad043ee9d0535813ef5dba06dd80c11f82':
  Change suffix UsingSubId to ForSubscriber.
 2014-09-09 17:46:53 +00:00
Alexandra Gherghina
7677694320 Merge "Removing the NO_CROSS_PROFILE flag for intent forwarding" into lmp-dev 2014-09-09 17:45:36 +00:00
Griff Hazen
7341db9a2e am 40c1a0f1: am b0e0f2f6: Merge "Add support for a circular bitmap overlay for round android wear emulator." into lmp-dev 
* commit '40c1a0f157c581bdd88e3c55c625d2b438389bd6':
  Add support for a circular bitmap overlay for round android wear emulator.
 2014-09-09 17:42:09 +00:00
Jae Seo
8e036f3a83 am c83c5596: am e188fc30: Merge "Add Japanese content ratings" into lmp-dev 
* commit 'c83c5596bf4f2e463ca54d12e566f4c04b9c55aa':
  Add Japanese content ratings
 2014-09-09 17:42:04 +00:00
Wink Saville
bc0272754d Change suffix UsingSubId to ForSubscriber. 
Bug: 17255752
Change-Id: Ifd522888b5aaae111f642d1e35bd1bb939e539d4
 2014-09-09 17:38:19 +00:00
Griff Hazen
3eeb09605d am b0e0f2f6: Merge "Add support for a circular bitmap overlay for round android wear emulator." into lmp-dev 
* commit 'b0e0f2f6185fc42842ff3fccedcc608c5a8f8d27':
  Add support for a circular bitmap overlay for round android wear emulator.
 2014-09-09 17:31:02 +00:00
Jae Seo
2c42ed0b41 am e188fc30: Merge "Add Japanese content ratings" into lmp-dev 
* commit 'e188fc30686135b6d96ced7acf4afdf5ecdf641d':
  Add Japanese content ratings
 2014-09-09 17:30:57 +00:00
Griff Hazen
8fd30e4486 Merge "Add support for a circular bitmap overlay for round android wear emulator." into lmp-dev 2014-09-09 17:25:47 +00:00
Jae Seo
a45fe78110 Merge "Add Japanese content ratings" into lmp-dev 2014-09-09 17:21:59 +00:00
Craig Mautner
c8cc92f852 am 2297d88d: am 77e1dc74: Merge "Remove deprecated (and now unused) API method." into lmp-dev 
* commit '2297d88d163daafde81d41e13d2207fc64865a72':
  Remove deprecated (and now unused) API method.
 2014-09-09 17:21:35 +00:00
Craig Mautner
4e59ecf211 am 77e1dc74: Merge "Remove deprecated (and now unused) API method." into lmp-dev 
* commit '77e1dc741bfce75f3e3f5446674d1545a74eae2b':
  Remove deprecated (and now unused) API method.
 2014-09-09 17:11:05 +00:00
Jae Seo
fe5998b5ad Add Japanese content ratings 
Bug: 17434802
Change-Id: I4be1ff9e5621f0a973c38f1abb377b1c92131a02
 2014-09-09 10:06:52 -07:00
Craig Mautner
345d4f4f14 Merge "Remove deprecated (and now unused) API method." into lmp-dev 2014-09-09 17:05:04 +00:00
Dianne Hackborn
aadc76edb1 am 2146dc79: am 0ad9e247: Merge "Add new wallpaper features for insets and offsets." into lmp-dev 
* commit '2146dc791c53895b60161d8819b25b4277290c4b':
  Add new wallpaper features for insets and offsets.
 2014-09-09 16:55:06 +00:00
Adrian Roos
0db7284f56 am 5187e3e4: am 08b3499c: Merge "Initilize LockPatternUtils with the current user" into lmp-dev 
* commit '5187e3e4af4a19873cbe7a60e49059b33ef835c4':
  Initilize LockPatternUtils with the current user
 2014-09-09 16:55:02 +00:00
Adrian Roos
27d0ecd7f3 am 1b4b32f2: am c60d7426: Merge "Show confirmation dialog when adding user from QS" into lmp-dev 
* commit '1b4b32f2609f8206513e914ca1f1026194bed040':
  Show confirmation dialog when adding user from QS
 2014-09-09 16:54:57 +00:00
Adrian Roos
a10c029500 am b1d938ac: am dda9415e: Merge "Don\'t draw system bar backgrounds if FLAG_FULLSCREEN is set" into lmp-dev 
* commit 'b1d938acd2e8383b17e8ae1043a5a059d77ca237':
  Don't draw system bar backgrounds if FLAG_FULLSCREEN is set
 2014-09-09 16:54:52 +00:00
Adrian Roos
ae95b461c1 am 3707131b: am eb578566: Merge "Don\'t crash if there\'s no QS panel" into lmp-dev 
* commit '3707131b22a683d10788247db0868bf96bd28ddf':
  Don't crash if there's no QS panel
 2014-09-09 16:54:44 +00:00
Dan Albert
6800165351 resolved conflicts for merge of 1d99636f to lmp-dev-plus-aosp 
Change-Id: Ic5f808de7d9722056112c6a73c718892e00bc9df
 2014-09-09 09:51:01 -07:00
Dianne Hackborn
3046cbd8ef am 0ad9e247: Merge "Add new wallpaper features for insets and offsets." into lmp-dev 
* commit '0ad9e247c3b553baee5b42599536d9b0bfbbba31':
  Add new wallpaper features for insets and offsets.
 2014-09-09 16:45:33 +00:00
Adrian Roos
87ba3f6a27 am 08b3499c: Merge "Initilize LockPatternUtils with the current user" into lmp-dev 
* commit '08b3499cae764590755d5d3ad380e5169cdf2924':
  Initilize LockPatternUtils with the current user
 2014-09-09 16:45:28 +00:00
Adrian Roos
f6c6e6c0c9 am c60d7426: Merge "Show confirmation dialog when adding user from QS" into lmp-dev 
* commit 'c60d74266933b7799f0ce7b3f0a75c2b7c0ed0e0':
  Show confirmation dialog when adding user from QS
 2014-09-09 16:45:24 +00:00
Adrian Roos
213a44751a am dda9415e: Merge "Don\'t draw system bar backgrounds if FLAG_FULLSCREEN is set" into lmp-dev 
* commit 'dda9415e45de566ddbb72ebc9d2088f80f3b74a2':
  Don't draw system bar backgrounds if FLAG_FULLSCREEN is set
 2014-09-09 16:45:19 +00:00
Adrian Roos
6381ca82ac am eb578566: Merge "Don\'t crash if there\'s no QS panel" into lmp-dev 
* commit 'eb57856678dfae14137c7960a96a5f5b428a70a3':
  Don't crash if there's no QS panel
 2014-09-09 16:45:12 +00:00
New Author Steven Liu
82468851b5 Set MTU size to 1410 for Telus. 
Bug: 17391167
Change-Id: I38c0d2a311624db66113b5eda2a5eceb6fec2a69
 2014-09-09 16:44:44 +00:00
Dianne Hackborn
bb8c483461 Merge "Add new wallpaper features for insets and offsets." into lmp-dev 2014-09-09 16:41:44 +00:00
Adrian Roos
84e4e62d3b Merge "Initilize LockPatternUtils with the current user" into lmp-dev 2014-09-09 16:37:40 +00:00
Adrian Roos
e5322f47bf Merge "Show confirmation dialog when adding user from QS" into lmp-dev 2014-09-09 16:37:09 +00:00
Adrian Roos
bb9637bb58 Merge "Don't draw system bar backgrounds if FLAG_FULLSCREEN is set" into lmp-dev 2014-09-09 16:36:39 +00:00