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

156951 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philip Milne
e4fe75aa60 Merge "Fix for b/16400888 - API Review: GridLayout attributes" 2014-09-09 17:53:11 +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
Philip Milne
1af024c9c8 Fix for b/16400888 - API Review: GridLayout attributes 
Column weights specify the relative proportions of space distribution 
within a *row*. With that in mind, I flipped the vertical and horizontal 
axes in the docs - but that was a mistake. This CL flips the docs back. 
The code works the right way around so doesn't need to be modified.

Change-Id: I1a36882eee8d1b9bd7b8ef10e03cbf66de0ac261
 2014-09-09 17:49:35 +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
0b95125d99 am 1420cfbf: am 2146dc79: am 0ad9e247: Merge "Add new wallpaper features for insets and offsets." into lmp-dev 
* commit '1420cfbf788fa9272f43231c15be29f7febdcde3':
  Add new wallpaper features for insets and offsets.
 2014-09-09 17:00:07 +00:00
Adrian Roos
a60a1bf9d3 am 6f60ac9e: am 5187e3e4: am 08b3499c: Merge "Initilize LockPatternUtils with the current user" into lmp-dev 
* commit '6f60ac9e5b9f349011ee02984283270170ccefb0':
  Initilize LockPatternUtils with the current user
 2014-09-09 17:00:01 +00:00
Adrian Roos
27b5d57b43 am 2de0cd60: am 1b4b32f2: am c60d7426: Merge "Show confirmation dialog when adding user from QS" into lmp-dev 
* commit '2de0cd602a0a4b1d46a410e1e4174ee0951dc46a':
  Show confirmation dialog when adding user from QS
 2014-09-09 16:59:56 +00:00
Adrian Roos
ea9ae1f846 am 8145fa57: am b1d938ac: am dda9415e: Merge "Don\'t draw system bar backgrounds if FLAG_FULLSCREEN is set" into lmp-dev 
* commit '8145fa57f39396ac58fe7465a5e96631e1c56e25':
  Don't draw system bar backgrounds if FLAG_FULLSCREEN is set
 2014-09-09 16:59:51 +00:00
Adrian Roos
3e7129e069 am 70ed8199: am 3707131b: am eb578566: Merge "Don\'t crash if there\'s no QS panel" into lmp-dev 
* commit '70ed81996aa967eb4dcb98ba347883913a570d0a':
  Don't crash if there's no QS panel
 2014-09-09 16:59:46 +00:00
Dan Albert
729b49e12f am f8631178: resolved conflicts for merge of 1d99636f to lmp-dev-plus-aosp 
* commit 'f8631178ea8d1dab768873b82d6ace96d01f23a7':
  Don't check for null references.
 2014-09-09 16:59:42 +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
Adrian Roos
e60d6ed7cb Merge "Don't crash if there's no QS panel" into lmp-dev 2014-09-09 16:35:09 +00:00
Dan Albert
1d99636fcc am 8085477f: Merge "Don\'t check for null references." 
* commit '8085477fb98eab36bbc8c3e9add76f398235b469':
  Don't check for null references.
 2014-09-09 16:35:02 +00:00
Dan Albert
8085477fb9 Merge "Don't check for null references." 2014-09-09 16:25:41 +00:00
Jorim Jaggi
d6accbcaff am cb7cb2e1: am c6fed35c: am bc6542cc: Merge "Remove a few unnecessary withLayer() calls" into lmp-dev 
* commit 'cb7cb2e1809031a716d2e24b1efffe5f6f55effd':
  Remove a few unnecessary withLayer() calls
 2014-09-09 16:18:56 +00:00
Jorim Jaggi
3d18c486b7 am 3cc9fd8c: am c02c525d: am 71d150d2: Merge "Fix padding between R and wifi icon" into lmp-dev 
* commit '3cc9fd8cc66edb173a4138e6b5ad07a7a0c96021':
  Fix padding between R and wifi icon
 2014-09-09 16:18:51 +00:00
Jorim Jaggi
08dceea7d3 am c6fed35c: am bc6542cc: Merge "Remove a few unnecessary withLayer() calls" into lmp-dev 
* commit 'c6fed35cf4c2f260025c03b26f8be785afad42ee':
  Remove a few unnecessary withLayer() calls
 2014-09-09 16:07:58 +00:00
Jorim Jaggi
540e3d6f46 am c02c525d: am 71d150d2: Merge "Fix padding between R and wifi icon" into lmp-dev 
* commit 'c02c525d90f298dcd8cadc29f88f99ee8afa97d7':
  Fix padding between R and wifi icon
 2014-09-09 16:07:53 +00:00
Selim Cinek
4ebc8d8669 am 9a77ef1e: am 20dd36fe: am edf8bc9b: Merge "Fixed a bug that the icon was not animating anymore when updating." into lmp-dev 
* commit '9a77ef1eca8b8f322d78d730ebc7bf9920aa348d':
  Fixed a bug that the icon was not animating anymore when updating.
 2014-09-09 16:02:21 +00:00
Selim Cinek
5cf38d9566 am 8de0b20c: am 30dcddf1: am 9e58d85f: Merge "Properly announcing HUN state for talkback" into lmp-dev 
* commit '8de0b20ca87c72b827b64bcc99a9ed52831baf36':
  Properly announcing HUN state for talkback
 2014-09-09 16:02:17 +00:00
Selim Cinek
d5b8df8f0a am a0c13c17: am 41f7116b: am f844d519: Merge "Avoiding heads-up when accessibility is turned on" into lmp-dev 
* commit 'a0c13c17116a45f39b940e610079e5718e264568':
  Avoiding heads-up when accessibility is turned on
 2014-09-09 16:02:11 +00:00
Jorim Jaggi
ef646ea250 am bc6542cc: Merge "Remove a few unnecessary withLayer() calls" into lmp-dev 
* commit 'bc6542cca228440c6ca29fe038a2cf98e1b47fd5':
  Remove a few unnecessary withLayer() calls
 2014-09-09 15:57:27 +00:00
Jorim Jaggi
1dae3cf327 am 71d150d2: Merge "Fix padding between R and wifi icon" into lmp-dev 
* commit '71d150d2549277f664f69aada6cd08022e984a5e':
  Fix padding between R and wifi icon
 2014-09-09 15:57:22 +00:00