Craig Mautner
74ee938dcc
resolved conflicts for merge of ffb22827 to master
...
Change-Id: Ia01028203dfe87df91c828d681289e92b9371e3c
2014-04-01 15:20:16 -07:00
Craig Mautner
ffb22827d7
am 2b6fe299: am c70f15fe: am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev
...
* commit '2b6fe2990de78cfb64a27c19e5351cffe3ccb7d6':
Fix FLAG_DISMISS_KEYGUARD not working
2014-04-01 21:56:55 +00:00
John Reck
4126693be3
Merge "Disable RenderThread"
2014-04-01 21:51:40 +00:00
John Reck
9afe775ca9
Disable RenderThread
...
Now that there's a half dozen bugs to fix, switch back
to the stable renderer until the issues are addressed
Change-Id: I1513cf26717e8ab6b1a038e86ae9a40f5f1a3c50
2014-04-01 14:49:21 -07:00
Craig Mautner
2b6fe2990d
am c70f15fe: am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev
...
* commit 'c70f15fe298655de02c2e72023fafe6fc33d2a55':
Fix FLAG_DISMISS_KEYGUARD not working
2014-04-01 21:48:04 +00:00
Craig Mautner
c70f15fe29
am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev
...
* commit '2fc798a2270cda98366776af489d45c1043e831d':
Fix FLAG_DISMISS_KEYGUARD not working
2014-04-01 21:41:15 +00:00
Michael Kolb
4bb047fa5e
Fix build after bad merge resolution
...
Change-Id: I4af3aae1114d31847fc13d56ab03af8c7ef74577
2014-04-01 14:38:57 -07:00
Alan Viverette
9b3b78bdaf
Merge "Quantum style for RatingBar, alert dialog layouts"
2014-04-01 21:27:03 +00:00
Alan Viverette
2f472117d7
Quantum style for RatingBar, alert dialog layouts
...
Change-Id: I70cab4d32de44d41b08602bc11a09d451f267127
2014-04-01 14:24:49 -07:00
Fabrice Di Meglio
724a4f7aea
Merge "Update SearchIndexables contract for allowing summary ON and OFF indexing"
2014-04-01 21:17:03 +00:00
Michael Kolb
7fbde1e837
resolved conflict for merge of 2c73e08d to master
...
Change-Id: Iee2e1f773469db0ba26b153193945a6c246af151
2014-04-01 14:06:11 -07:00
Craig Mautner
2fc798a227
resolved conflicts for merge of 8c6e6e73 to klp-dev
...
Change-Id: I9fc9bc3d935e9e730ebca767d848b1c66203f3b4
2014-04-01 13:57:37 -07:00
Michael Kolb
2c73e08d36
am 17bbd976: Merge "Add outset to decor view measuring" into klp-modular-dev
...
* commit '17bbd976c0971f25447b2ce66117f08029dc2fa9':
Add outset to decor view measuring
2014-04-01 20:46:38 +00:00
John Spurlock
f96b6c427f
Merge "Zen Mode QS tweaks."
2014-04-01 20:41:08 +00:00
Michael Kolb
17bbd976c0
Merge "Add outset to decor view measuring" into klp-modular-dev
2014-04-01 20:40:35 +00:00
John Spurlock
1bdb48e31a
Zen Mode QS tweaks.
...
- Move settings button to the bottom.
- Align title left.
- Fix padding.
- Auto-activate on dialog launch.
Bug:13670014
Change-Id: I5a88e97a84b66bf6200473c147b71cc7ceeb0b95
2014-04-01 16:38:05 -04:00
Craig Mautner
8c6e6e7372
am 13b75939: am d4d2aa51: am efbe7cc0: am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
...
* commit '13b75939596eec63c096fe9e85643b8c42a40b12':
Fix FLAG_DISMISS_KEYGUARD not working
2014-04-01 20:01:32 +00:00
Craig Mautner
13b7593959
am d4d2aa51: am efbe7cc0: am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
...
* commit 'd4d2aa519fb1a9d54c14da858a4ab7ab0880f34d':
Fix FLAG_DISMISS_KEYGUARD not working
2014-04-01 19:54:59 +00:00
Craig Mautner
d4d2aa519f
am efbe7cc0: am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
...
* commit 'efbe7cc0ff5c85cc7956bb3099402c7ebbe20591':
Fix FLAG_DISMISS_KEYGUARD not working
2014-04-01 19:49:36 +00:00
Craig Mautner
efbe7cc0ff
am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
...
* commit 'd1c82f8fc22216e9b544e3a3b521bcad05bc113d':
Fix FLAG_DISMISS_KEYGUARD not working
2014-04-01 19:43:41 +00:00
quddusc
448b0c3544
am 913c9036: am f425e5ea: am c7f403f4: am 5321e9bd: Merge "docs: Fixed outdated link to Google Analytics docs. Bug: 13742301" into klp-docs
...
* commit '913c903612b63e97b340f84dc742875672923f84':
docs: Fixed outdated link to Google Analytics docs. Bug: 13742301
2014-04-01 19:38:31 +00:00
Scott Main
bacc4a7efb
am f80749c5: am c3796073: am c8b6feb2: am 35682006: Merge "laptop image with redacted" into klp-docs
...
* commit 'f80749c5c52de0609e27da216b7c6daf8e23a34a':
laptop image with redacted
2014-04-01 19:38:27 +00:00
Scott Main
d959a3d31c
am 402f2304: am 3bd0a44b: am a7afd38f: am 1afdbb93: Merge "dashbaord update for 4/1/14" into klp-docs
...
* commit '402f23046c4a624527937b61926d65a9935a9b60':
dashbaord update for 4/1/14
2014-04-01 19:38:23 +00:00
Ricardo Cervera
3358898cd8
am 3b7432d2: am bb755da9: am c192cdd3: am cf96f815: docs: Renamed the document on building with Android Studio
...
* commit '3b7432d2e4ddc9efda5cc38f9008d40d6b4ef951':
docs: Renamed the document on building with Android Studio
2014-04-01 19:38:16 +00:00
Craig Mautner
d1c82f8fc2
am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
...
* commit '1cb3c1d381c389c7ef903c1a871ff695cd406da4':
Fix FLAG_DISMISS_KEYGUARD not working
2014-04-01 19:36:48 +00:00
Craig Mautner
1cb3c1d381
am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
...
* commit 'fc80fbe3d5b287c19e3dab89fc93ca4b8a812bb1':
Fix FLAG_DISMISS_KEYGUARD not working
2014-04-01 19:30:41 +00:00
quddusc
913c903612
am f425e5ea: am c7f403f4: am 5321e9bd: Merge "docs: Fixed outdated link to Google Analytics docs. Bug: 13742301" into klp-docs
...
* commit 'f425e5ea05bf445ab97176fe4a79e54f976d22b8':
docs: Fixed outdated link to Google Analytics docs. Bug: 13742301
2014-04-01 19:29:52 +00:00
Scott Main
f80749c5c5
am c3796073: am c8b6feb2: am 35682006: Merge "laptop image with redacted" into klp-docs
...
* commit 'c37960733aebed4ef4d64d72f7658534f9fd5698':
laptop image with redacted
2014-04-01 19:29:45 +00:00
Scott Main
402f23046c
am 3bd0a44b: am a7afd38f: am 1afdbb93: Merge "dashbaord update for 4/1/14" into klp-docs
...
* commit '3bd0a44bbf8de4dc1d190fffe91a10b8f1e2243f':
dashbaord update for 4/1/14
2014-04-01 19:29:41 +00:00
Ricardo Cervera
3b7432d2e4
am bb755da9: am c192cdd3: am cf96f815: docs: Renamed the document on building with Android Studio
...
* commit 'bb755da9f7a2a4d3ea103afbc2140901d28e8f74':
docs: Renamed the document on building with Android Studio
2014-04-01 19:29:38 +00:00
Craig Mautner
fc80fbe3d5
am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
...
* commit '7bd0b65233d0ef34114ecb93d734dfe4351f470d':
Fix FLAG_DISMISS_KEYGUARD not working
2014-04-01 19:24:23 +00:00
Craig Mautner
7bd0b65233
am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
...
* commit '4bdab6bb4c55661d4915518b1190e30c4633c6a5':
Fix FLAG_DISMISS_KEYGUARD not working
2014-04-01 19:18:36 +00:00
Craig Mautner
4bdab6bb4c
Fix FLAG_DISMISS_KEYGUARD not working
...
Fixes bug 13672528.
Change-Id: I0292aee51d5d8755bbae926e5f0e6af1e22107dc
2014-04-01 12:10:54 -07:00
Lajos Molnar
9c3b2583b5
Merge "MediaCodec: avoid silent array overflow in queueSecureInputBuffer()"
2014-04-01 18:41:39 +00:00
quddusc
f425e5ea05
am c7f403f4: am 5321e9bd: Merge "docs: Fixed outdated link to Google Analytics docs. Bug: 13742301" into klp-docs
...
* commit 'c7f403f46d824c17f9bd1fb6447425eacc2cccfe':
docs: Fixed outdated link to Google Analytics docs. Bug: 13742301
2014-04-01 18:30:33 +00:00
quddusc
c7f403f46d
am 5321e9bd: Merge "docs: Fixed outdated link to Google Analytics docs. Bug: 13742301" into klp-docs
...
* commit '5321e9bd48db680c618a490fb38c060c3c05beba':
docs: Fixed outdated link to Google Analytics docs. Bug: 13742301
2014-04-01 18:24:38 +00:00
quddusc
5321e9bd48
Merge "docs: Fixed outdated link to Google Analytics docs. Bug: 13742301" into klp-docs
2014-04-01 18:12:06 +00:00
Scott Main
c37960733a
am c8b6feb2: am 35682006: Merge "laptop image with redacted" into klp-docs
...
* commit 'c8b6feb2007259cdc4053a9774e31847ee60d592':
laptop image with redacted
2014-04-01 17:59:12 +00:00
Scott Main
3bd0a44bbf
am a7afd38f: am 1afdbb93: Merge "dashbaord update for 4/1/14" into klp-docs
...
* commit 'a7afd38f3021a15e0bd22674409c2cd6d83095c3':
dashbaord update for 4/1/14
2014-04-01 17:59:08 +00:00
Christopher Tate
f74aa094b4
Handle bad package name arguments sensically
...
Don't blithly go ahead and assume package name arguments are non-null,
and don't continue to do a bunch of work after an early failure on
invalid non-null package names.
Bug 13745101
Change-Id: I12ccae343066b39162dedeb46dc58869f55be0ba
2014-04-01 10:54:39 -07:00
quddusc
f74a6cf388
docs: Fixed outdated link to Google Analytics docs.
...
Bug: 13742301
Change-Id: Idb439a38299be808cd1cd1d317d67efe78f785cc
2014-04-01 17:53:55 +00:00
Scott Main
c8b6feb200
am 35682006: Merge "laptop image with redacted" into klp-docs
...
* commit '356820063afa85c78dd7f7b9bce2b62169e490bc':
laptop image with redacted
2014-04-01 17:52:36 +00:00
Scott Main
a7afd38f30
am 1afdbb93: Merge "dashbaord update for 4/1/14" into klp-docs
...
* commit '1afdbb93446cdc9238bf327155646950ae80dbe4':
dashbaord update for 4/1/14
2014-04-01 17:52:33 +00:00
Deepanshu Gupta
1dbede1c79
Merge "Add stub getThemeAttributeId() to BridgeTypedArray"
2014-04-01 17:51:48 +00:00
Ricardo Cervera
bb755da9f7
am c192cdd3: am cf96f815: docs: Renamed the document on building with Android Studio
...
* commit 'c192cdd3c4ad8696d5d77949984cf7e06445e051':
docs: Renamed the document on building with Android Studio
2014-04-01 17:49:40 +00:00
Glenn Kasten
5c2f20394e
Merge "Don't ignore return value of setAuxEffectSendLevel()"
2014-04-01 17:49:39 +00:00
Scott Main
356820063a
Merge "laptop image with redacted" into klp-docs
2014-04-01 17:47:03 +00:00
Scott Main
1afdbb9344
Merge "dashbaord update for 4/1/14" into klp-docs
2014-04-01 17:46:37 +00:00
Ricardo Cervera
c192cdd3c4
am cf96f815: docs: Renamed the document on building with Android Studio
...
* commit 'cf96f815854b87f8a2304fbaf5030d574671e6e0':
docs: Renamed the document on building with Android Studio
2014-04-01 17:43:32 +00:00
Scott Main
b0b84487c1
dashbaord update for 4/1/14
...
Change-Id: Id38d8a448dc86afecc2e80dc6a5f4fdb26d7cc93
2014-04-01 10:39:42 -07:00